diff --git a/ZR.Admin.WebApi/Controllers/BaseController.cs b/ZR.Admin.WebApi/Controllers/BaseController.cs index 544dff05..a2cdc0d5 100644 --- a/ZR.Admin.WebApi/Controllers/BaseController.cs +++ b/ZR.Admin.WebApi/Controllers/BaseController.cs @@ -68,6 +68,7 @@ namespace ZR.Admin.WebApi.Controllers // return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",fileName); } + #region 方法 /// diff --git a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs index f9b81e25..3676c8c2 100644 --- a/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs +++ b/ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderV2Controller.cs @@ -121,15 +121,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro item.ProductDescription = ""; if (item.Colour == null) item.Colour = ""; - if (item.Specifications == null) item.Specifications = ""; if (item.CylinderNumber == null) - item.CylinderNumber = ""; - if (item.PQualifiedNum == null) - item.PQualifiedNum = 0; - if (item.PQualifiedRate == null) - item.PQualifiedRate = 0; + item.CylinderNumber = ""; if (item.Remark1 == null) item.Remark1 = ""; if (item.Remark2 == null) @@ -144,6 +139,19 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro item.Year = year; item.Week = week; item.Date = date; + //PreviousNumber + if (item.PQualifiedNum == null) + item.PQualifiedNum = 0; + if (item.PreviousNumber != null && item.PreviousNumber > 0 && item.PQualifiedNum != null && item.PQualifiedNum > 0) + { + decimal rate = (decimal)item.PQualifiedNum / (decimal)item.PreviousNumber; + item.PQualifiedRate = Math.Round(rate, 2); + } + else + { + item.PQualifiedRate = 0; + } + } var final_list = list.Where(it => !it.BlankNumber.Contains("圈数")) .Where(it => !(it.BlankNumber == "" && it.FinishedPartNumber == "" && it.ProductDescription == "" && it.Specifications == "" && it.CylinderNumber == "" && it.Remark1 == "" && it.Remark2 == "" && it.Remark3 == "" && it.Remark4 == "" && it.ClientWorkorder == "")) diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251218111240上海干巷车镜涂装工单导入模板.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251218111240上海干巷车镜涂装工单导入模板.xlsx new file mode 100644 index 00000000..3635662e Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251218111240上海干巷车镜涂装工单导入模板.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251218111611上海干巷车镜涂装工单导入模板.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251218111611上海干巷车镜涂装工单导入模板.xlsx new file mode 100644 index 00000000..3d4e0c2c Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251218111611上海干巷车镜涂装工单导入模板.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251218114403上海干巷车镜涂装工单导入模板.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251218114403上海干巷车镜涂装工单导入模板.xlsx new file mode 100644 index 00000000..96adffb6 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251218114403上海干巷车镜涂装工单导入模板.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251218114518上海干巷车镜涂装工单导入模板.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251218114518上海干巷车镜涂装工单导入模板.xlsx new file mode 100644 index 00000000..96adffb6 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251218114518上海干巷车镜涂装工单导入模板.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20251218114956上海干巷车镜涂装工单导入模板.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20251218114956上海干巷车镜涂装工单导入模板.xlsx new file mode 100644 index 00000000..14a39302 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/workorder/20251218114956上海干巷车镜涂装工单导入模板.xlsx differ