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

成品调拨入库传erp调整，电梯到出货缓存区取消逻辑调整

Browse Source
This commit is contained in:
马健
2024-08-29 00:07:36 +08:00
parent 1fa757eefa
commit 3415354990
4 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -1810,7 +1810,30 @@ namespace Tnb.WarehouseMgr
whereExpable.AndIF(!SqlFunc.IsNullOrEmpty(input.startlocation_id), (a, b, c) => b.location_id == input.startlocation_id);
}
ISugarQueryable<WmsElevatorH> queryable = _db.CopyNew().Queryable<WmsElevatorH>().InnerJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
var db = _db.CopyNew();
#region 如果是出到三楼出库缓存区
List<WmsElevatorH> queryable_f3outstock = db.Queryable<WmsDistaskH>()
.InnerJoin<BasLocation>((a, b) => a.endlocation_id == b.id)
.InnerJoin<WmsPretaskH>((a, b, c) => a.endlocation_code == c.startlocation_code)
.InnerJoin<WmsElevatorD>((a, b, c, d) => c.endlocation_code == d.location_code)
.InnerJoin<WmsElevatorH>((a, b, c, d, e) => d.bill_id == e.id)
.Where((a, b, c, d, e) => a.endlocation_id == input.endlocation_id && a.bill_code == input.taskCode && b.region_id == WmsWareHouseConst.REGION_CPOutstockCache_ID)
.Select((a, b, c, d, e) => new WmsElevatorH
{
bill_code = a.bill_code,
device_id = e.elevator_id,
end_floor = a.end_floor
}).ToList();
if (queryable_f3outstock.Count() > 0)
{
var ele_f3outstock = queryable_f3outstock[0];
return ele_f3outstock;
}
#endregion
ISugarQueryable<WmsElevatorH> queryable = db.Queryable<WmsElevatorH>().InnerJoin<WmsElevatorD>((a, b) => a.id == b.bill_id)
.InnerJoin<WmsDistaskH>((a, b, c) => b.location_code == c.endlocation_code || b.location_code == c.startlocation_code)
.Where(whereExpable.ToExpression())
.WhereIF(!SqlFunc.IsNullOrEmpty(input.sourceName) && SqlFunc.StartsWith("DT-R", input.sourceName), (a, b, c) => c.startpoint_code == input.sourceName)
@@ -1824,6 +1847,8 @@ namespace Tnb.WarehouseMgr
var ele = await queryable.FirstAsync();
Logger.Information($"【FindElevatorFromPars】 " + queryable.ToSqlString());
return ele;
@@ -2296,7 +2321,7 @@ namespace Tnb.WarehouseMgr
if (doubleCarryRunElevators.Contains(devName) && disTasks[0].end_floor == 1)
{
AgvRequestConfig requestCfg = App.Configuration.Build<AgvRequestConfig>();
string url = requestCfg.AgvRequestUrls.CreateTaskChainUrl;
string url = requestCfg.AgvRequestUrls.thirdFloorUrl;
dynamic reqBody = new ExpandoObject();
reqBody.floor = devName == "Elevator3" ? "03" : "04";
reqBody.isDown = true;
@@ -2304,10 +2329,15 @@ namespace Tnb.WarehouseMgr
Logger.Information($"【ElevatorTaskExceptionHandle】 电梯{devName}下行 开始请求WCS lift/thirdFloor接口 请求地址:{url} 请求参数:{JsonConvert.SerializeObject(reqBody)} ");
dynamic respBody = await HttpClientHelper.PostStreamAsync(url, reqBody, Ctu.Token);
Logger.Information($"【ElevatorTaskExceptionHandle】 电梯{devName}下行 接收到WCS lift/thirdFloor接口信息:{respBody}");
if (respBody.code != "200")
JObject respBodyobj = JObject.Parse(respBody);
if (respBodyobj["code"].ToString() != "200")
{
throw new Exception($"通知WCS电梯{devName}下行接口调用错误");
}
else
{
throw new Exception($"通知WCS电梯{devName}下行接口调用成功");
}
}
}
@@ -2611,7 +2641,7 @@ namespace Tnb.WarehouseMgr
{
eleUpdateRow += await db.Updateable<WmsElevatorH>().SetColumns(it => new WmsElevatorH { task_nums = it.task_nums - 1 }).Where(it => disTask.area_code == it.area_code).ExecuteCommandAsync();
}
Logger.LogInformation($"【TaskComplate】更新前电梯{disTasks[0].area_code}任务行数{eleUpdateRow}");
Logger.LogInformation($"【TaskComplate】更新电梯{disTasks[0].area_code}任务行数{eleUpdateRow}");
}