拼箱拆箱功能调整，毛坯仓库调整，出库功能调整

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<WmBlankInventory>().ToCreate(HttpContext);
+            try
+            {
+                var modal = parm.Adapt<WmBlankInventory>().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 + "组毛坯记录！", "同步成功"));
 
         }
 

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<WmGoodsOutRecord>().ToCreate(HttpContext);
+            try
+            {
+                var modal = parm.Adapt<WmGoodsOutRecord>().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"));
+            }
+            
         }
 
         /// <summary>

ZR.Model/MES/wms/WmPackageLcl.cs

@@ -24,6 +24,12 @@ namespace ZR.Model.MES.wms
         [SugarColumn(ColumnName = "package_code")]
         public string PackageCode { get; set; }
 
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        [SugarColumn(ColumnName = "work_order_id")]
+        public string WorkOrderId { get; set; }
+
         /// <summary>
         /// 流水号;外箱标签流水号 
         /// </summary>

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",

ZR.Service/mes/wms/WmGoodsOutProductionService.cs

@@ -68,7 +68,14 @@ namespace ZR.Service.mes.wms
         /// <returns></returns>
         public WmGoodsOutRecord AddWmGoodsOutProduction(WmGoodsOutRecord model)
         {
-            if(string.IsNullOrEmpty(model.PackageCode))
+            // 检查成品库数据是否存在
+            bool hasRecord = Context.Queryable<WmGoodsNowProduction>()
+                        .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;