wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-07-04 10:54:05 +08:00
parent cbe419274e 02edc26ffe
commit 077b08efbe
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
View File

@@ -56,7 +56,7 @@ namespace Tnb.WarehouseMgr
return data; return data;
} }
/// <summary> /// <summary>
/// 载具查询返回接口 /// 载具查询返回接口(没子载具不能使用此接口)
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>

14
WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
View File

@@ -1196,11 +1196,11 @@ namespace Tnb.WarehouseMgr
}; };
insertHList.Add(prdMaterialReceiptH); insertHList.Add(prdMaterialReceiptH);
CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code}); List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(x=>x.carry_id==carry.id).ToListAsync();
if (carryQueryOutput.wmsCarryCodes != null && carryQueryOutput.wmsCarryCodes.Count > 0) if (wmsCarryCodes != null && wmsCarryCodes.Count > 0)
{ {
JNPF.Logging.Log.Information($"签收载具信息{JsonConvert.SerializeObject(carryQueryOutput)}"); JNPF.Logging.Log.Information($"签收载具信息{JsonConvert.SerializeObject(wmsCarryCodes)}");
foreach (var item in carryQueryOutput.wmsCarryCodes) foreach (var item in wmsCarryCodes)
{ {
insertDList.Add(new PrdMaterialReceiptD insertDList.Add(new PrdMaterialReceiptD
@@ -1213,12 +1213,12 @@ namespace Tnb.WarehouseMgr
carry_id = carry.id, carry_id = carry.id,
barcode = item.barcode, barcode = item.barcode,
is_all_feeding = 0, is_all_feeding = 0,
member_carry_id = item.member_carryid, // member_carry_id = item.member_carryid,
member_carry_code = item.member_carrycode, // member_carry_code = item.member_carrycode,
feeding_num = 0, feeding_num = 0,
supplier_id = item.supplier_id, supplier_id = item.supplier_id,
instock_time = item.instock_time, instock_time = item.instock_time,
check_conclusion = item.check_conclusion, // check_conclusion = item.check_conclusion,
}); });
} }
} }