From a5ff6f019b4d4d1948e5027f4f69c089acddb7e7 Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Sun, 28 Apr 2024 23:12:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93-=E7=89=A9=E6=96=99Excel?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/mes/wms/WmMaterialController.cs | 11 ++++++++--- ZR.Service/mes/wms/WmMaterialService.cs | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs index 9e305815..59e71546 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.IdentityModel.Tokens; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; +using SqlSugar; using System.Collections.Generic; using System.Linq.Expressions; using ZR.Admin.WebApi.Extensions; @@ -169,7 +170,7 @@ namespace ZR.Admin.WebApi.Controllers - + var time = DateTime.Now.ToLocalTime(); for (int i = 2; i <= sheet.LastRowNum; i++) { IRow row = sheet.GetRow(i); @@ -177,8 +178,10 @@ namespace ZR.Admin.WebApi.Controllers { if (row.GetCell(0) != null && row.GetCell(0).ToString() != "") { + WmMaterial material = new WmMaterial(); - + // SnowFlakeSingle.Instance.NextId().ToString(); + material.Id = SnowFlakeSingle.Instance.NextId().ToString(); material.Partnumber = row.GetCell(0)?.ToString(); material.U8InventoryCode = row.GetCell(1)?.ToString(); material.BlankNum = row.GetCell(2)?.ToString(); @@ -193,7 +196,9 @@ namespace ZR.Admin.WebApi.Controllers material.Search2 = row.GetCell(11)?.ToString(); material.Status = 1; material.Sort = i; - material.ToCreate(HttpContext); + material.CreatedBy = "Excel导入"; + material.CreatedTime = time; + //material.ToCreate(HttpContext); materials.Add(material); } diff --git a/ZR.Service/mes/wms/WmMaterialService.cs b/ZR.Service/mes/wms/WmMaterialService.cs index e99afe65..c089294b 100644 --- a/ZR.Service/mes/wms/WmMaterialService.cs +++ b/ZR.Service/mes/wms/WmMaterialService.cs @@ -128,7 +128,8 @@ namespace ZR.Service.mes.wms return (-1,-1); } var x=Context.Storageable(materials) - .WhereColumns(it => it.BlankNum).ToStorage(); + .WhereColumns(it => it.Id) + .ToStorage(); int insert= x.AsInsertable.ExecuteCommand(); //执行插入 int update= x.AsUpdateable.ExecuteCommand(); //执行更新