添加WMS操作人信息createBy

ZR.Service/mes/wms/WMentryWarehousing_productService.cs

@@ -300,12 +300,18 @@ namespace ZR.Service.mes.wms
                 }
 
 
-                // 2.判断是否已入库
+                // 2.1判断是否已入库
                 bool isExistedWarehouse = Context.Queryable<WmGoodsNowProduction>().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any();
                 if (isExistedWarehouse)
                 {
                     return "该箱号已入库！";
                 }
+                // 2.2判断是否有出库记录
+                bool isoutWarehouse = Context.Queryable<WmGoodsOutRecord>().Where(it => it.PackageCodeClient == resultionPackage.PatchCode).Any();
+                if (isoutWarehouse)
+                {
+                    return "该箱号已有出库记录，需要删除后再入库！";
+                }
                 // 提取库位信息
                 WmInfo wmInfo = Context.Queryable<WmInfo>().Where(it => it.Location == location).First();
                 if (wmInfo == null)

ZR.Service/mes/wms/WmGoodsOutProductionService.cs

@@ -153,7 +153,7 @@ namespace ZR.Service.mes.wms
                         EntryWarehouseTime = nowProduction.EntryWarehouseTime,
                         OutTime = time,
                         Remark = "批量出库",
-                        CreatedBy = "batch",
+                        CreatedBy = parm.CreatedBy ?? "batch",
                         CreatedTime = time,
                     };
                     Context.Insertable(outRecord).ExecuteCommand();
@@ -197,7 +197,7 @@ namespace ZR.Service.mes.wms
                         EntryWarehouseTime = nowProduction.EntryWarehouseTime,
                         OutTime = time,
                         Remark = "批量出库",
-                        CreatedBy = "batch",
+                        CreatedBy = parm.CreatedBy ?? "batch",
                         CreatedTime = time,
                     };
                     Context.Insertable(outRecord).ExecuteCommand();