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 3871a89d..00000000 Binary files a/ZR.Admin.WebApi/导出统计报表-2024051114234102ae279d-bb09-4390-90e0-490342e8ebb4.xlsx and /dev/null differ 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;