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-09-12 14:07:03 +08:00
parent df00f0b1e2
commit c1b4d60778
10 changed files with 406 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,6 @@ namespace Tnb.WarehouseMgr
{
queryJson = JObject.Parse(input.queryJson);
}
SqlSugarPagedList<WmsMaterialTransfer> result = await _db.Queryable<WmsMaterialTransfer>()
.InnerJoin<DictionaryDataEntity>((a, b) => a.status == b.Id)
@@ -117,7 +116,7 @@ namespace Tnb.WarehouseMgr
.InnerJoin<BasWarehouse>((a, b, c, d, e) => e.id == a.warehouse_instock)
.LeftJoin<DictionaryDataEntity>((a, b, c, d, e, f) => a.type == f.EnCode)
// 只显示未完成的单据
.Where(a => a.status != "25065149810453")
//.Where(a => a.status != "25065149810453")
.WhereIF(queryJson != null && queryJson["type"] != null, a => a.type == queryJson["type"].ToString())
.WhereIF(queryJson != null && queryJson["bill_code"] != null, a => a.bill_code.Contains(queryJson["bill_code"].ToString()))
.Select((a, b, c, d, e, f) => new WmsMaterialTransfer
@@ -195,7 +194,6 @@ namespace Tnb.WarehouseMgr
}
}
/// <summary>
/// 获取物料库存
/// </summary>
@@ -787,8 +785,10 @@ namespace Tnb.WarehouseMgr
{
semaphoreSlimOutStock = _wareHouseService.GetSemaphore("outstock", WmsWareHouseConst.WAREHOUSE_BCK_ID);
await semaphoreSlimOutStock.WaitAsync();
Logger.LogInformation($"开始执行下发到包材库1");
semaphoreSlimInStock = _wareHouseService.GetSemaphore("instock", WmsWareHouseConst.WAREHOUSE_F2BCQ_ID);
await semaphoreSlimInStock.WaitAsync();
Logger.LogInformation($"开始执行下发到包材库2");
if (string.IsNullOrEmpty(input.source_id))
{
throw new AppFriendlyException("来源单据id不可为空", 500);
@@ -1127,6 +1127,7 @@ namespace Tnb.WarehouseMgr
{
await _s_taskExecuteSemaphore_F1ZCCOutstock.WaitAsync();
Logger.LogInformation($"中储仓下发到二楼暂存仓");
try
{
WmsMaterialTransfer wmsMaterialTransfer = _db.Queryable<WmsMaterialTransfer>().Where(r => r.id == input.source_id).First();
@@ -1269,7 +1270,7 @@ namespace Tnb.WarehouseMgr
public async Task<Entities.Dto.Outputs.Result> DistributeZCCToYCL(MaterialTransferDistributeToZCCInput input)
{
await _s_taskExecuteSemaphore_F1ZCCOutstock.WaitAsync();
Logger.LogInformation($"开始执行中储仓退料到原材料仓");
try
{
WmsMaterialTransfer wmsMaterialTransfer = _db.Queryable<WmsMaterialTransfer>().Where(r => r.id == input.source_id).First();