diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
index ea87929d..88261f3e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -19,6 +19,10 @@ namespace Tnb.WarehouseMgr.Entities.Consts
///
public const string WMS_PRETASK_H_ENCODE = "PreTaskGen";
///
+ /// 任务执行ENCODE
+ ///
+ public const string WMS_TASK_EXECUTE_ENCODE = "WmsTaskRequest";
+ ///
/// 预任务单据状态-待下发Id
///
public const string PRETASK_BILL_STATUS_DXF_ID = "26126822610469";
@@ -38,6 +42,12 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// 预任务单据状态-已完成Id
///
public const string PRETASK_BILL_STATUS_CANCEL_ID = "26126842129701";
+
+ //
+ ///
+ /// 任务单据状态-待执行Id
+ ///
+ public const string TASK_BILL_STATUS_DZX_ID = "26126851525157";
//
///
/// 任务单据状态-已下达Id
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 484e4f31..71270b75 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -47,10 +47,12 @@ namespace Tnb.WarehouseMgr
{
private readonly ISqlSugarClient _db;
private readonly IDictionaryDataService _dictionaryDataService;
- public WareHouseService(ISqlSugarRepository repository, IDictionaryDataService dictionaryDataService)
+ private readonly IBillRullService _billRullService;
+ public WareHouseService(ISqlSugarRepository repository, IDictionaryDataService dictionaryDataService, IBillRullService billRullService)
{
_db = repository.AsSugarClient();
_dictionaryDataService = dictionaryDataService;
+ _billRullService= billRullService;
}
///
/// 根据载具Id带出库位、仓库信息
@@ -231,6 +233,7 @@ namespace Tnb.WarehouseMgr
items.ForEach(x =>
{
x.is_chain = 0;
+ x.bill_code= _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
x.chain_type = "0";
});
}
@@ -266,6 +269,12 @@ namespace Tnb.WarehouseMgr
{
var moveNum = itGroup.First().move_num;
var items = itGroup.Adapt>();
+ items.ForEach(x =>
+ {
+ x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
+ x.bill_code = $"";
+ x.is_sign = 1;
+ });
var areaPreTasks = itGroup.ToList();
if (moveNum == 1)
{