diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 742f8f72..97378bff 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -56,7 +56,7 @@ namespace Tnb.WarehouseMgr return data; } /// - /// 载具查询返回接口 + /// 载具查询返回接口(没子载具不能使用此接口) /// /// /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 795b37cf..d0bffb3d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -1196,11 +1196,11 @@ namespace Tnb.WarehouseMgr }; insertHList.Add(prdMaterialReceiptH); - CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code}); - if (carryQueryOutput.wmsCarryCodes != null && carryQueryOutput.wmsCarryCodes.Count > 0) + List wmsCarryCodes = await _db.Queryable().Where(x=>x.carry_id==carry.id).ToListAsync(); + if (wmsCarryCodes != null && wmsCarryCodes.Count > 0) { - JNPF.Logging.Log.Information($"签收载具信息{JsonConvert.SerializeObject(carryQueryOutput)}"); - foreach (var item in carryQueryOutput.wmsCarryCodes) + JNPF.Logging.Log.Information($"签收载具信息{JsonConvert.SerializeObject(wmsCarryCodes)}"); + foreach (var item in wmsCarryCodes) { insertDList.Add(new PrdMaterialReceiptD @@ -1213,12 +1213,12 @@ namespace Tnb.WarehouseMgr carry_id = carry.id, barcode = item.barcode, is_all_feeding = 0, - member_carry_id = item.member_carryid, - member_carry_code = item.member_carrycode, + // member_carry_id = item.member_carryid, + // member_carry_code = item.member_carrycode, feeding_num = 0, supplier_id = item.supplier_id, instock_time = item.instock_time, - check_conclusion = item.check_conclusion, + // check_conclusion = item.check_conclusion, }); } }