From c6adc9e9304fb53cc295e9e6a05d583236e9a546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Tue, 14 May 2024 14:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E7=AE=B1=E6=8B=86=E7=AE=B1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4=EF=BC=8C=E6=AF=9B=E5=9D=AF=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E8=B0=83=E6=95=B4=EF=BC=8C=E5=87=BA=E5=BA=93=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/wms/WmBlankInventoryController.cs | 14 +++++++++++--- .../mes/wms/WmGoodsOutProductionController.cs | 14 +++++++++++--- ...051114234102ae279d-bb09-4390-90e0-490342e8ebb4.xlsx | Bin 4879 -> 0 bytes ZR.Model/MES/wms/WmPackageLcl.cs | 6 ++++++ ZR.Service/mes/wms/WmGoodsActionService.cs | 3 +++ .../mes/wms/WmGoodsOutProductionService.cs | 10 +++++++++- 6 files changed, 40 insertions(+), 7 deletions(-) delete mode 100644 ZR.Admin.WebApi/导出统计报表-2024051114234102ae279d-bb09-4390-90e0-490342e8ebb4.xlsx diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs index 32ba3c3c..4877863b 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs @@ -122,11 +122,19 @@ namespace ZR.Admin.WebApi.Controllers [Log(Title = "物料清单数据同步", BusinessType = BusinessType.INSERT)] public IActionResult SynchronousMaterial([FromBody] WmBlankInventorySynchronousDto parm) { - var modal = parm.Adapt().ToCreate(HttpContext); + try + { + var modal = parm.Adapt().ToCreate(HttpContext); - int successNum = _WmBlankInventoryService.SynchronousMaterial(modal); + int successNum = _WmBlankInventoryService.SynchronousMaterial(modal); + + return ToResponse(new ApiResult(200, "同步成功，已同步:" + successNum + "组毛坯记录！", "同步成功")); + } + catch(Exception ex) + { + return ToResponse(new ApiResult(200, ex.Message, "同步失败")); + } - return ToResponse(new ApiResult(200, "同步成功，已同步:"+ successNum + "组毛坯记录！", "同步成功")); } diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs index 27967ae5..cd8c3d37 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs @@ -65,11 +65,19 @@ namespace ZR.Admin.WebApi.Controllers [Log(Title = "出库货物记录表", BusinessType = BusinessType.INSERT)] public IActionResult AddWmGoodsOutProduction([FromBody] WmGoodsOutProductionDto parm) { - var modal = parm.Adapt().ToCreate(HttpContext); + try + { + var modal = parm.Adapt().ToCreate(HttpContext); - var response = _WmGoodsOutProductionService.AddWmGoodsOutProduction(modal); + var response = _WmGoodsOutProductionService.AddWmGoodsOutProduction(modal); - return SUCCESS(response); + return SUCCESS(response); + } + catch (Exception ex) + { + return ToResponse(new ApiResult(500, ex.Message, "error")); + } + } /// diff --git a/ZR.Admin.WebApi/导出统计报表-2024051114234102ae279d-bb09-4390-90e0-490342e8ebb4.xlsx b/ZR.Admin.WebApi/导出统计报表-2024051114234102ae279d-bb09-4390-90e0-490342e8ebb4.xlsx deleted file mode 100644 index 3871a89d5aabbd365081c222ac0d0db31acf4f3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4879 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 Nd*k}-@#}U0@PF+wP{jZM diff --git a/ZR.Model/MES/wms/WmPackageLcl.cs b/ZR.Model/MES/wms/WmPackageLcl.cs index 48e6d554..93b8e125 100644 --- a/ZR.Model/MES/wms/WmPackageLcl.cs +++ b/ZR.Model/MES/wms/WmPackageLcl.cs @@ -24,6 +24,12 @@ namespace ZR.Model.MES.wms [SugarColumn(ColumnName = "package_code")] public string PackageCode { get; set; } + /// + /// 工单号 + /// + [SugarColumn(ColumnName = "work_order_id")] + public string WorkOrderId { get; set; } + /// /// 流水号;外箱标签流水号 /// diff --git a/ZR.Service/mes/wms/WmGoodsActionService.cs b/ZR.Service/mes/wms/WmGoodsActionService.cs index cdeb41f7..bc6c4ec9 100644 --- a/ZR.Service/mes/wms/WmGoodsActionService.cs +++ b/ZR.Service/mes/wms/WmGoodsActionService.cs @@ -218,6 +218,7 @@ namespace ZR.Service.Business { Id = SnowFlakeSingle.instance.NextId().ToString(), Partnumber = list[1].PartNumner, + WorkOrderId = list[1].PatchCode.Substring(4, 12), PackageCode = list[1].PatchCode, SerialNumber = list[1].PatchCode.Split('_')[1], LocationCode = "LS", @@ -399,6 +400,7 @@ namespace ZR.Service.Business { Id = SnowFlakeSingle.instance.NextId().ToString(), Partnumber = mainNowProduction.Partnumber, + WorkOrderId = jsonObject.newPatchCode1.Substring(4, 12), PackageCode = jsonObject.newPatchCode1, SerialNumber = jsonObject.serialNumber1, LocationCode = mainNowProduction.LocationCode, @@ -415,6 +417,7 @@ namespace ZR.Service.Business { Id = SnowFlakeSingle.instance.NextId().ToString(), Partnumber = mainNowProduction.Partnumber, + WorkOrderId = jsonObject.newPatchCode2.Substring(4, 12), PackageCode = jsonObject.newPatchCode2, SerialNumber = jsonObject.serialNumber2, LocationCode = "LS", diff --git a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs index 898cbf32..8f8373cc 100644 --- a/ZR.Service/mes/wms/WmGoodsOutProductionService.cs +++ b/ZR.Service/mes/wms/WmGoodsOutProductionService.cs @@ -68,7 +68,14 @@ namespace ZR.Service.mes.wms /// public WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord model) { - if(string.IsNullOrEmpty(model.PackageCode)) + // 检查成品库数据是否存在 + bool hasRecord = Context.Queryable() + .Where(it => it.Id == model.FkNowProductionId).Any(); + if (!hasRecord) + { + throw new Exception("请检查该箱是否已完全出库,或已添加出库记录！"); + } + if (string.IsNullOrEmpty(model.PackageCode)) { model.PackageCode = "L" + DateTime.Now.ToString("yyMMddHHmmss"); } @@ -76,6 +83,7 @@ namespace ZR.Service.mes.wms { model.Id= SnowFlakeSingle.Instance.NextId().ToString();//也可以在程序中直接获取ID } + //2. 根据成品仓库id修改记录 WmGoodsNowProduction updateModel = new WmGoodsNowProduction(); updateModel.Id = model.FkNowProductionId;