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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2024-09-15 18:06:12 +08:00
parent 6c4cf4ccd4 d49d666cef
commit b400843b6a
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/MaterialTransferDistributeSCWToZCCInput.cs
View File

@@ -32,7 +32,7 @@
/// <summary> /// <summary>
/// 起点 /// 起点
/// </summary> /// </summary>
public string startlocation_code { get; set; } public string location_code { get; set; }
} }
} }

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

@@ -918,7 +918,6 @@ namespace Tnb.WarehouseMgr
try try
{ {
List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.carryIds[0]).ToListAsync();
//if (wmsCarryCodes.Count == 0) //if (wmsCarryCodes.Count == 0)
//{ //{
// Logger.LogWarning($"【WmsMaterialTransferService ModifyAsync】载具{input.carryIds[0]}没有绑定物料条码"); // Logger.LogWarning($"【WmsMaterialTransferService ModifyAsync】载具{input.carryIds[0]}没有绑定物料条码");
@@ -928,6 +927,10 @@ namespace Tnb.WarehouseMgr
WmsMaterialTransferD wmsMaterialTransferd = await _db.Queryable<WmsMaterialTransferD>().Where(r => r.id == input.source_id).SingleAsync(); WmsMaterialTransferD wmsMaterialTransferd = await _db.Queryable<WmsMaterialTransferD>().Where(r => r.id == input.source_id).SingleAsync();
WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id); WmsMaterialTransfer wmsMaterialTransfer = await _db.Queryable<WmsMaterialTransfer>().SingleAsync(x => x.id == wmsMaterialTransferd.bill_id);
Logger.LogInformation($"开始执行转库单业务 {input.carryIds[0]} 转库单 {wmsMaterialTransfer.bill_code}");
List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == input.carryIds[0]
&& r.material_id == wmsMaterialTransferd.material_id && r.code_batch == wmsMaterialTransferd.code_batch).ToListAsync();
bool isOk = false; bool isOk = false;
@@ -990,6 +993,13 @@ namespace Tnb.WarehouseMgr
} }
} }
// 跨层回写料架工位
if (wmsMaterialTransfer.warehouse_outstock == WmsWareHouseConst.WAREHOUSE_YCL_ID && wmsMaterialTransfer.warehouse_instock == WmsWareHouseConst.WAREHOUSE_ZCC_ID)
{
int _row = await _db.Updateable<WmsCarryH>().SetColumns(r => r.work_station == wmsMaterialTransferd.station_code).Where(r => r.id == input.carryIds[0]).ExecuteCommandAsync();
Logger.LogInformation($"跨层转库更新载具工位 载具id {input.carryIds[0]} 转库单 {wmsMaterialTransfer.bill_code} 成功行数 {_row}");
}
#endregion #endregion
@@ -2062,6 +2072,7 @@ namespace Tnb.WarehouseMgr
[HttpPost, NonUnify, AllowAnonymous] [HttpPost, NonUnify, AllowAnonymous]
public async Task<Entities.Dto.Outputs.Result> DistributeSCWToZCC(MaterialTransferDistributeSCWToZCCInput input) public async Task<Entities.Dto.Outputs.Result> DistributeSCWToZCC(MaterialTransferDistributeSCWToZCCInput input)
{ {
Logger.LogInformation($"开始执行三存位入库到暂存仓 {JsonConvert.SerializeObject(input)}");
try try
{ {
if (string.IsNullOrEmpty(input.source_id)) if (string.IsNullOrEmpty(input.source_id))
@@ -2103,7 +2114,7 @@ namespace Tnb.WarehouseMgr
{ {
throw new AppFriendlyException($"载具{input.carry_code}已锁定！", 500); throw new AppFriendlyException($"载具{input.carry_code}已锁定！", 500);
} }
if (string.IsNullOrEmpty(input.startlocation_code)) if (string.IsNullOrEmpty(input.location_code))
{ {
throw new AppFriendlyException($"起点库位为空！", 500); throw new AppFriendlyException($"起点库位为空！", 500);
} }
@@ -2140,7 +2151,7 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($@"没有可以入库的库位", 500); throw new AppFriendlyException($@"没有可以入库的库位", 500);
} }
BasLocation startLocation = await _db.Queryable<BasLocation>().Where(r => r.location_code == input.startlocation_code).FirstAsync(); BasLocation startLocation = await _db.Queryable<BasLocation>().Where(r => r.location_code == input.location_code).FirstAsync();
CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput(); CommonCreatePretaskInput commonCreatePretaskInput = new CommonCreatePretaskInput();
commonCreatePretaskInput.startlocation_id = startLocation.id; commonCreatePretaskInput.startlocation_id = startLocation.id;