From 0801e5e9efbff3de2c551c2aa25a665c0835bcd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Thu, 22 Aug 2024 10:43:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=9B=E5=9D=AF=EF=BC=8C=E6=8A=9B=E5=85=89?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E6=AC=A1=E5=90=88=E6=A0=BC=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=BB=E9=9B=B6=E4=BB=B6=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E5=8D=95=E6=8E=92=E7=A8=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=EF=BC=8C?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=9C=8B=E6=9D=BF=E7=BB=9F=E8=AE=A1=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=BA=A7=E7=BA=BF=E6=95=B0=E9=87=8F=E9=99=A4?= =?UTF-8?q?3=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/wms/WmBlankInventoryController.cs | 11 +++++++++++ .../mes/wms/WmOneTimeInventoryController.cs | 12 ++++++++++++ .../mes/wms/WmPolishInventoryController.cs | 13 +++++++++++++ ZR.Model/MES/pro/DTO/ProWorkOrder.cs | 2 +- ZR.Model/MES/pro/ProWorkorder_v2.cs | 2 +- ZR.Service/mes/qc/CommonFQCService.cs | 8 ++++++++ .../mes/wms/IService/IWmBlankInventoryService.cs | 6 ++++++ .../mes/wms/IService/IWmOneTimeInventoryService.cs | 6 ++++++ .../mes/wms/IService/IWmPolishInventoryService.cs | 6 ++++++ ZR.Service/mes/wms/WmBlankInventoryService.cs | 9 +++++++++ ZR.Service/mes/wms/WmOneTimeInventoryService.cs | 9 +++++++++ ZR.Service/mes/wms/WmPolishInventoryService.cs | 9 +++++++++ 12 files changed, 91 insertions(+), 2 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs index b0e426f4..764390ea 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs @@ -136,6 +136,17 @@ namespace ZR.Admin.WebApi.Controllers } + /// + /// 查询毛坯库存零件数 + /// + /// + /// + [HttpGet("getPartNumber")] + public IActionResult GetPartNumber() + { + var response = _WmBlankInventoryService.GetPartNumber(); + return SUCCESS(response); + } } diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs index 00802339..5f91866f 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs @@ -163,5 +163,17 @@ namespace ZR.Admin.WebApi.Controllers return ToResponse(new ApiResult(500, "盘点异常:" + e.Message, e.Message)); } } + + /// + /// 查询毛坯库存零件数 + /// + /// + /// + [HttpGet("getPartNumber")] + public IActionResult GetPartNumber() + { + var response = _WmOneTimeInventoryService.GetPartNumber(); + return SUCCESS(response); + } } } diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs index b6492818..7e2358fe 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs @@ -3,6 +3,7 @@ using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Filters; using ZR.Model.MES.wms; using ZR.Model.MES.wms.Dto; +using ZR.Service.mes.wms; using ZR.Service.mes.wms.IService; //创建时间：2024-07-25 @@ -184,5 +185,17 @@ namespace ZR.Admin.WebApi.Controllers return ToResponse(new ApiResult(500, "盘点异常:" + e.Message, e.Message)); } } + + /// + /// 查询毛坯库存零件数 + /// + /// + /// + [HttpGet("getPartNumber")] + public IActionResult GetPartNumber() + { + var response = _WmPolishInventoryService.GetPartNumber(); + return SUCCESS(response); + } } } diff --git a/ZR.Model/MES/pro/DTO/ProWorkOrder.cs b/ZR.Model/MES/pro/DTO/ProWorkOrder.cs index 39a5ffa8..ef52d67c 100644 --- a/ZR.Model/MES/pro/DTO/ProWorkOrder.cs +++ b/ZR.Model/MES/pro/DTO/ProWorkOrder.cs @@ -35,7 +35,7 @@ /// /// 编码号 /// - public int CodeNumber { get; set; } + public string CodeNumber { get; set; } /// /// 车数 diff --git a/ZR.Model/MES/pro/ProWorkorder_v2.cs b/ZR.Model/MES/pro/ProWorkorder_v2.cs index bf157005..2e87e74b 100644 --- a/ZR.Model/MES/pro/ProWorkorder_v2.cs +++ b/ZR.Model/MES/pro/ProWorkorder_v2.cs @@ -55,7 +55,7 @@ namespace ZR.Model.MES.pro /// [SugarColumn(ColumnName = "code_number")] [ExcelColumn(Name = "编码号", IndexName = "F")] - public int CodeNumber { get; set; } + public string CodeNumber { get; set; } /// /// 车数 diff --git a/ZR.Service/mes/qc/CommonFQCService.cs b/ZR.Service/mes/qc/CommonFQCService.cs index e0ca00db..203155c2 100644 --- a/ZR.Service/mes/qc/CommonFQCService.cs +++ b/ZR.Service/mes/qc/CommonFQCService.cs @@ -614,6 +614,14 @@ namespace ZR.Service.mes.qc .Queryable() .Where(predicate1) .Sum(it => it.BaofeiTotal) ?? 0; + + // 除三优化 + boardData.ProductRequireTotal = boardData.ProductRequireTotal / 3; + boardData.ProductQualifiedTotal = boardData.ProductQualifiedTotal / 3; + boardData.ProductQualifiedNotDoorknobTotal = boardData.ProductQualifiedNotDoorknobTotal / 3; + boardData.ProductPolishTotal = boardData.ProductPolishTotal / 3; + boardData.ProductSandingTotal = boardData.ProductSandingTotal / 3; + boardData.ProductDiscardTotal = boardData.ProductDiscardTotal / 3; return boardData; } diff --git a/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs b/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs index 233c3918..305f01e3 100644 --- a/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs +++ b/ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs @@ -23,5 +23,11 @@ namespace ZR.Service.mes.wms.IService /// /// int SynchronousMaterial(WmBlankInventory parm); + + /// + /// 获取仓库零件数 + /// + /// + public int GetPartNumber(); } } diff --git a/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs b/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs index a68096d7..ccb95e4a 100644 --- a/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs +++ b/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs @@ -38,5 +38,11 @@ namespace ZR.Service.mes.wms.IService /// int DoWmOneTimeStocktaking(WmOneTimeInventory parm); + /// + /// 获取仓库零件数 + /// + /// + public int GetPartNumber(); + } } diff --git a/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs b/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs index b1372864..30fc0caf 100644 --- a/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs +++ b/ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs @@ -43,5 +43,11 @@ namespace ZR.Service.mes.wms.IService /// /// int DoWmPolishStocktaking(WmPolishInventory parm); + + /// + /// 获取仓库零件数 + /// + /// + public int GetPartNumber(); } } diff --git a/ZR.Service/mes/wms/WmBlankInventoryService.cs b/ZR.Service/mes/wms/WmBlankInventoryService.cs index e535f1a9..141811e5 100644 --- a/ZR.Service/mes/wms/WmBlankInventoryService.cs +++ b/ZR.Service/mes/wms/WmBlankInventoryService.cs @@ -242,5 +242,14 @@ namespace ZR.Service.mes.wms return Context.Insertable(wmBlank).ExecuteCommand(); } + + // 获取毛坯仓库零件数量 + public int GetPartNumber() + { + return Context + .Queryable() + .Where(it => it.Status == 1) + .Sum(it => it.Quantity) ?? 0; + } } } diff --git a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs index aa31d7cd..9d83961b 100644 --- a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs +++ b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs @@ -397,5 +397,14 @@ namespace ZR.Service.mes.wms throw new Exception(e.Message); } } + + // 获取仓库零件数量 + public int GetPartNumber() + { + return Context + .Queryable() + .Where(it => it.Status == 1) + .Sum(it => it.Quantity) ?? 0; + } } } diff --git a/ZR.Service/mes/wms/WmPolishInventoryService.cs b/ZR.Service/mes/wms/WmPolishInventoryService.cs index 911feae4..06b50d58 100644 --- a/ZR.Service/mes/wms/WmPolishInventoryService.cs +++ b/ZR.Service/mes/wms/WmPolishInventoryService.cs @@ -463,5 +463,14 @@ namespace ZR.Service.mes.wms throw new Exception(e.Message); } } + + // 获取仓库零件数量 + public int GetPartNumber() + { + return Context + .Queryable() + .Where(it => it.Status == 1) + .Sum(it => it.Quantity) ?? 0; + } } }