From 0de782eaa9bb8f6a367609febb530e3d9054d6fd Mon Sep 17 00:00:00 2001 From: Carl Date: Thu, 8 Jan 2026 10:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMaterial/MmMaterialController.cs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs index 519b47e..cbdadd3 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/Material/productionMaterial/MmMaterialController.cs @@ -132,7 +132,7 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM [ActionPermissionFilter(Permission = "mmmaterial:import")] public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile) { - //List material = new(); + List materialList = new(); DateTime dateValue = DateTime.MinValue; using (var stream = formFile.OpenReadStream()) { @@ -266,16 +266,6 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM { continue; } - - //10指示日期 - NPOI.SS.UserModel.ICell cell17 = currentRow.GetCell(10); - - // 将单元格的数字值转换为DateTime - material.CreatedTime = cell17.DateCellValue.Value; - - //装箱容积 - /*NPOI.SS.UserModel.ICell currentCell_0811 = currentRow.GetCell(6); - workorder.PackageCapacity = (int)currentCell_0811?.NumericCellValue;*/ } } @@ -283,9 +273,10 @@ namespace DOAN.Admin.WebApi.Controllers.BZFM } catch (Exception ex) { - return -1; + //return -1; } - //material = stream.Query(startCell: "A2").ToList(); + material = stream.Query(startCell: "A2").ToList(); + } return SUCCESS(_MmMaterialService.Importmaterial(material));