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

1

Browse Source
This commit is contained in:
贺立波
2023-06-15 19:52:22 +08:00
parent 1a2f3aa8ea
commit 04f2d5c551
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -19,6 +19,10 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// </summary> /// </summary>
public const string WMS_PRETASK_H_ENCODE = "PreTaskGen"; public const string WMS_PRETASK_H_ENCODE = "PreTaskGen";
/// <summary> /// <summary>
/// 任务执行ENCODE
/// </summary>
public const string WMS_TASK_EXECUTE_ENCODE = "WmsTaskRequest";
/// <summary>
/// 预任务单据状态-待下发Id /// 预任务单据状态-待下发Id
/// </summary> /// </summary>
public const string PRETASK_BILL_STATUS_DXF_ID = "26126822610469"; public const string PRETASK_BILL_STATUS_DXF_ID = "26126822610469";
@@ -38,6 +42,12 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// 预任务单据状态-已完成Id /// 预任务单据状态-已完成Id
/// </summary> /// </summary>
public const string PRETASK_BILL_STATUS_CANCEL_ID = "26126842129701"; public const string PRETASK_BILL_STATUS_CANCEL_ID = "26126842129701";
//
/// <summary>
/// 任务单据状态-待执行Id
/// </summary>
public const string TASK_BILL_STATUS_DZX_ID = "26126851525157";
// //
/// <summary> /// <summary>
/// 任务单据状态-已下达Id /// 任务单据状态-已下达Id

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

@@ -47,10 +47,12 @@ namespace Tnb.WarehouseMgr
{ {
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IDictionaryDataService _dictionaryDataService; private readonly IDictionaryDataService _dictionaryDataService;
public WareHouseService(ISqlSugarRepository<WmsInstockH> repository, IDictionaryDataService dictionaryDataService) private readonly IBillRullService _billRullService;
public WareHouseService(ISqlSugarRepository<WmsInstockH> repository, IDictionaryDataService dictionaryDataService, IBillRullService billRullService)
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_dictionaryDataService = dictionaryDataService; _dictionaryDataService = dictionaryDataService;
_billRullService= billRullService;
} }
/// <summary> /// <summary>
/// 根据载具Id带出库位、仓库信息 /// 根据载具Id带出库位、仓库信息
@@ -231,6 +233,7 @@ namespace Tnb.WarehouseMgr
items.ForEach(x => items.ForEach(x =>
{ {
x.is_chain = 0; x.is_chain = 0;
x.bill_code= _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE).GetAwaiter().GetResult();
x.chain_type = "0"; x.chain_type = "0";
}); });
} }
@@ -266,6 +269,12 @@ namespace Tnb.WarehouseMgr
{ {
var moveNum = itGroup.First().move_num; var moveNum = itGroup.First().move_num;
var items = itGroup.Adapt<List<WmsDistaskH>>(); var items = itGroup.Adapt<List<WmsDistaskH>>();
items.ForEach(x =>
{
x.status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
x.bill_code = $"";
x.is_sign = 1;
});
var areaPreTasks = itGroup.ToList(); var areaPreTasks = itGroup.ToList();
if (moveNum == 1) if (moveNum == 1)
{ {