diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs
index 988f8a0b..538cacff 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CarryQueryOutput.cs
@@ -177,8 +177,10 @@
/// 供应商
///
public string supplier_id { get; set; }
-
-
+ ///
+ /// 物料名称
+ ///
+ public string material_name { get; set; }
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 55aecb17..8599165f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -741,10 +741,10 @@ namespace Tnb.WarehouseMgr
_ = await _db.Updateable().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
//更新电梯任务数量
- /* var eles = await _db.Queryable().Where(it => disTasks.Select(x => x.area_code).Contains(it.area_code)).ToListAsync();
- if (eles?.Count > 0)
- await _db.Updateable(eles).ReSetValue(it => it.task_nums--).ExecuteCommandAsync();
- */
+ var eles = await _db.Queryable().Where(it => disTasks.Select(x => x.area_code).Contains(it.area_code)).ToListAsync();
+ if (eles?.Count > 0)
+ await _db.Updateable(eles).ReSetValue(it => it.task_nums--).ExecuteCommandAsync();
+
//更新载具,锁定状态为未锁定,更新载具的库位当前任务的目标库位
Logger.Information("更新载具及库位准备中.....");
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
index 3deb0ac0..f92985fd 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
@@ -3,7 +3,9 @@ using JNPF.Common.Extension;
using JNPF.FriendlyException;
using Mapster;
using Microsoft.AspNetCore.Mvc;
+using Senparc.Weixin.MP.AdvancedAPIs.Semantic;
using SqlSugar;
+using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto.Inputs;
@@ -15,6 +17,7 @@ namespace Tnb.WarehouseMgr
public class WmsCarryQueryService : BaseWareHouseService, IWmsCarryQueryService
{
private readonly ISqlSugarClient _db;
+ private static Dictionary s_materialMap = new();
public WmsCarryQueryService(ISqlSugarRepository repository)
{
_db = repository.AsSugarClient();
@@ -65,6 +68,11 @@ namespace Tnb.WarehouseMgr
throw new ArgumentNullException("input");
}
+ if (s_materialMap.Count < 1)
+ {
+ s_materialMap = await _db.Queryable().ToDictionaryAsync(x => x.id, x => x.name);
+ }
+
CarryQueryOutput data = new();
try
{
@@ -96,9 +104,14 @@ namespace Tnb.WarehouseMgr
}
int i = 0;
- foreach ((string _, object v) in mCarryIdDic)
+ foreach ((string mCarryId, object v) in mCarryIdDic)
{
carryCodes[i].member_carrycode = v?.ToString() ?? string.Empty;
+ var carryCode = carryCodes.Find(x => x.carry_id == mCarryId);
+ if (carryCode != null)
+ {
+ carryCodes[i].material_name = s_materialMap.ContainsKey(carryCode.material_id) ? s_materialMap[carryCode.material_id]?.ToString() ?? "" : "";
+ }
i++;
}
}