diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs index 230a32f7..3d793d74 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs @@ -1,6 +1,8 @@ using JNPF; +using JNPF.ClayObject.Extensions; using JNPF.Common.Core.Manager; using JNPF.Common.Enums; +using JNPF.Common.Extension; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.Extras.CollectiveOAuth.Models; @@ -451,11 +453,20 @@ namespace Tnb.ProductionMgr }; insertHList.Add(prdMaterialReceiptH); - CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code}); - if (carryQueryOutput.wmsCarryCodes != null && carryQueryOutput.wmsCarryCodes.Count > 0) + //CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code}); + List memberCarryIds = await db.Queryable().Where(x=>x.carry_id==carry.id).Select(x=>x.membercarry_id).ToListAsync(); + if (memberCarryIds == null || memberCarryIds.IsEmpty()) { - Log.Information($"签收载具信息{JsonConvert.SerializeObject(carryQueryOutput)}"); - foreach (var item in carryQueryOutput.wmsCarryCodes) + throw Oops.Bah($"未找到载具编号{carry.carry_code}的子载具"); + } + + List memberCarrys = await db.Queryable().Where(x=>memberCarryIds.Contains(x.id)).ToListAsync(); + List carryCodes = await db.Queryable().Where(x=>memberCarryIds.Contains(x.carry_id)).ToListAsync(); + + if (carryCodes != null && carryCodes.Count > 0) + { + Log.Information($"签收载具信息{JsonConvert.SerializeObject(carryCodes)}"); + foreach (var item in carryCodes) { insertDList.Add(new PrdMaterialReceiptD @@ -468,12 +479,12 @@ namespace Tnb.ProductionMgr 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.carry_id, + member_carry_code = memberCarrys.Find(x=>x.id==item.carry_id).carry_code, feeding_num = 0, supplier_id = item.supplier_id, instock_time = item.instock_time, - check_conclusion = item.check_conclusion, + check_conclusion = item.check_conclusion+"", }); } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 97378bff..c4993e93 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -56,7 +56,7 @@ namespace Tnb.WarehouseMgr return data; } /// - /// 载具查询返回接口(没子载具不能使用此接口) + /// 载具查询返回接口(这接口不对) /// /// ///