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

更新

Browse Source
This commit is contained in:
陈文凯
2024-11-16 20:20:55 +08:00
parent bd57b95609
commit 543fd809fe
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -282,9 +282,9 @@ namespace Tnb.WarehouseMgr
Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode}"); Logger.Information($"【UnloadConfirm】 当前放货，任务编号:{input.taskCode}");
WmsDistaskH dis = null; WmsDistaskH dis = null;
dis = _db.Queryable<WmsDistaskH>().Where(P => P.bill_code == input.taskCode).First();
try try
{ {
dis = _db.Queryable<WmsDistaskH>().Where(P => P.bill_code == input.taskCode).First();
if (dis.area_code == "ZSCJ001") if (dis.area_code == "ZSCJ001")
{ {
var flag = await _wareHouseService.Check(dis.endlocation_code, "UNLOAD"); var flag = await _wareHouseService.Check(dis.endlocation_code, "UNLOAD");
@@ -406,7 +406,7 @@ namespace Tnb.WarehouseMgr
// 3 4号梯需要电梯是当前楼层开门状态就能进 // 3 4号梯需要电梯是当前楼层开门状态就能进
bool canEnter = false; bool canEnter = false;
if (devName == "Elevator3" || devName == "Elevator4") if ((devName == "Elevator3" || devName == "Elevator4") && dis.start_floor == 3)
{ {
string sno = devName.Match(@"\d+"); string sno = devName.Match(@"\d+");

4
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs
View File

@@ -167,6 +167,7 @@ namespace Tnb.WarehouseMgr
{ {
try try
{ {
await _db.Ado.BeginTranAsync();
WmsCarryH? carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carrycode); WmsCarryH? carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carrycode);
if (carry == null) if (carry == null)
{ {
@@ -325,15 +326,18 @@ namespace Tnb.WarehouseMgr
throw new Exception($"物料列表为空，不能提交绑定,可能的原因;1.需要检查扫码设置(新PDA) 2.未扫到有效的二维码 详细信息:接收到{input.details.Count}个条码 成功绑定的条码数量为0个！"); throw new Exception($"物料列表为空，不能提交绑定,可能的原因;1.需要检查扫码设置(新PDA) 2.未扫到有效的二维码 详细信息:接收到{input.details.Count}个条码 成功绑定的条码数量为0个！");
} }
await _db.Ado.CommitTranAsync();
} }
catch (PostgresException ex) catch (PostgresException ex)
{ {
await _db.Ado.RollbackTranAsync();
Logger.LogError(ex.Message); Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace); Logger.LogError(ex.StackTrace);
throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.系统中存在其他与此托盘编号相同的托盘 3.存在字段传了空值) {ex.Message}", 500); throw new AppFriendlyException($"绑定失败(1.可能是存在已被绑定的条码 2.系统中存在其他与此托盘编号相同的托盘 3.存在字段传了空值) {ex.Message}", 500);
} }
catch (Exception ex) catch (Exception ex)
{ {
await _db.Ado.RollbackTranAsync();
Logger.LogError(ex.Message); Logger.LogError(ex.Message);
Logger.LogError(ex.StackTrace); Logger.LogError(ex.StackTrace);
throw new AppFriendlyException($"绑定失败 {ex.Message}", 500); throw new AppFriendlyException($"绑定失败 {ex.Message}", 500);