From b38d6b647c9e66c10bfab5869f26cc8a0f892f24 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 6 Nov 2024 11:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MES/product/ProWorkorderController.cs | 2 +- DOAN.Service/MES/product/ProWorkorderService.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs index 70feb03..f255c0b 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs @@ -48,7 +48,7 @@ namespace DOAN.Admin.WebApi.Controllers { parm.WorkorderDate[0] = ConvertDateTime.ConvertLocalDate(parm.WorkorderDate[0]); parm.WorkorderDate[1]=ConvertDateTime.ConvertLocalDate(parm.WorkorderDate[1]); - parm.GroupCode = parm.GroupCode.TrimEnd(); + var response = _ProWorkorderService.GetList(parm); return SUCCESS(response); } diff --git a/DOAN.Service/MES/product/ProWorkorderService.cs b/DOAN.Service/MES/product/ProWorkorderService.cs index f94060f..1b942a5 100644 --- a/DOAN.Service/MES/product/ProWorkorderService.cs +++ b/DOAN.Service/MES/product/ProWorkorderService.cs @@ -956,10 +956,12 @@ namespace DOAN.Service.MES.product } } + NPOI.SS.UserModel.ICell currentCell_12 = currentRow.GetCell(10); + workorder.Beat = (int)currentCell_12?.NumericCellValue; - NPOI.SS.UserModel.ICell currentCell_010 = currentRow.GetCell(10); + NPOI.SS.UserModel.ICell currentCell_010 = currentRow.GetCell(11); workorder.Remark = currentCell_010.StringCellValue; workorder.Id = XueHua;