仓库-出库单新增与批量出库添加限制，拆箱拼箱暂时回退功能为不入库

ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs

@@ -69,7 +69,10 @@ namespace ZR.Admin.WebApi.Controllers
             var modal = parm.ToCreate(HttpContext);
 
             var response = _WmOutOrderService.AddWmOutOrder(modal);
-
+            if(response == null)
+            {
+                return ToResponse(new ApiResult(500, "数据存在异常请检查", "数据存在异常请检查"));
+            }
             return SUCCESS(response);
         }
 

ZR.Service/mes/wms/WmGoodsActionService.cs

@@ -170,9 +170,9 @@ namespace ZR.Service.Business
             nowProduction.GoodsNumAction = quantityCount;
             nowProduction.Remark = "拼箱整箱";
             //TODO 20240422开会讨论结果：拼箱完需要重新扫码入库，原数据删除
-            Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == nowProduction.Id).ExecuteCommand();
+            //Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == nowProduction.Id).ExecuteCommand();
-            Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == secondId).ExecuteCommand();
+            //Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == secondId).ExecuteCommand();
-            return log;
+            //return log;
             // 修改主箱
             Context.Updateable(nowProduction).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
             // 次箱操作
@@ -302,8 +302,8 @@ namespace ZR.Service.Business
             };
             Context.Insertable(log).ExecuteReturnEntity();
             //TODO 20240422开会讨论结果：拆箱完需要重新扫码入库，原主箱数据删除
-            Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == mainNowProduction.Id).ExecuteCommand();
+            //Context.Deleteable<WmGoodsNowProduction>().Where(it => it.Id == mainNowProduction.Id).ExecuteCommand();
-            return log;
+            //return log;
             // 执行修改
             // 1.主箱修改为1号分箱参数
             WmGoodsNowProduction newPackage1 = mainNowProduction;

ZR.Service/mes/wms/WmGoodsOutProductionService.cs

@@ -39,7 +39,8 @@ namespace ZR.Service.mes.wms
                 .LeftJoin<WmMaterial>((wgo, wml) => wgo.Partnumber == wml.Partnumber)
                 .Where(predicate.ToExpression())
                 .Select((wgo, wml) => new WmGoodsOutProductionDto { Description = wml.Description }, true)
-                .OrderBy(wml=>wml.OutTime,OrderByType.Desc)
+                .MergeTable()
+                .OrderBy(wml => wml.OutTime,OrderByType.Desc)
                 .ToPageList(parm.PageNum, parm.PageSize,ref total);
             
             return (response,total);
@@ -167,6 +168,10 @@ namespace ZR.Service.mes.wms
                 }
                 // 短批次号
                 string shortPackageCode = parm.PackageCodeClient.Split('_')[0];
+                if (shortPackageCode.Length<8)
+                {
+                    return "请输入至少8位批次号编码，以保证正确批次出库！";
+                }
                 List<WmGoodsNowProduction> nowProductionList = Context.Queryable<WmGoodsNowProduction>()
                         .Where(it => it.PackageCodeClient.Contains(shortPackageCode)).ToList();
                 for (int i = 0; i < nowProductionList.Count; i++)

ZR.Service/mes/wms/WmOutOrderService.cs

@@ -102,6 +102,8 @@ namespace ZR.Service.mes.wms
         /// <param name="model"></param>
         /// <returns></returns>
         public WmOutOrder AddWmOutOrder(WmOutOrder_materialDto model)
+        {
+            try
             {
                 string today_id = "EG" + DateTime.Now.ToString("yyMMdd");
                 string last_outorder_ShipmentNum = Context.Queryable<WmOutOrder>().Where(it => it.ShipmentNum.StartsWith(today_id)).Max(it => it.ShipmentNum);
@@ -142,6 +144,12 @@ namespace ZR.Service.mes.wms
 
                 return Context.Insertable(wmOutOrder).ExecuteReturnEntity();
             }
+            catch (Exception ex)
+            {
+                return null;
+            }
+            
+        }
         /// <summary>
         /// 删除出货单关联的物料出货单
         /// </summary>