diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 3b564be8..e3dc4c9e 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1698,7 +1698,6 @@ namespace Tnb.ProductionMgr report.reported_qty = input.reported_qty; report.weight = input.weight; report.material_box_code = input.material_box_code; - Log.Information($"任务单数据:{JsonConvert.SerializeObject(prdMoTask)}"); if (prdMoTask.schedule_type == 2) { // if (dic.TryGetValue(prdMoTask.workline_id, out string value)) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 7cf94af3..8fe5a3ed 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -95,6 +95,7 @@ namespace Tnb.WarehouseMgr }, true) .ToListAsync(); + if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID && mCarryIdDic?.Count > 0) { if (carryCodes.Count < mCarryIdDic.Keys?.Count) @@ -118,6 +119,10 @@ namespace Tnb.WarehouseMgr data.wmsCarryCodes = carryCodes.Adapt>(); foreach (CarryCodeQueryOutput carryCodeQueryOutput in data.wmsCarryCodes) { + if (carryCodeQueryOutput.member_carrycode == null) + { + throw new AppFriendlyException("载具与条码数量可能不匹配", 500); + } carryCodeQueryOutput.member_carryid = mCarryIdDic2.GetOrDefault(carryCodeQueryOutput.member_carrycode).ToString(); } return data;