diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
index 96cbd3af..c6fa8973 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
@@ -48,33 +48,83 @@ namespace Tnb.WarehouseMgr.Entities.Consts
///
public const string TASK_BILL_STATUS_COMPLE_ID = "26126860808229";
///
- /// 预任务生成业务类型-载具移入Id
- ///
- public const string BIZTYPE_MOVEIN_ID = "26121988909861";
- ///
/// 单据状态-作业中
///
public const string BILLSTATUS_ON_ID = "25065143245845";
///
- /// 预任务类型-入库TypeId
+ /// 任务类型-入库TypeId
///
public const string WMS_PRETASK_INSTOCK_TYPE_ID = "26126748597797";
///
- /// 预任务生成业务类型-载具移入Id
+ /// 任务类型-出库TypeId
///
- public const string BIZTYPE_EMPTYIN_ID = "26120915344165";
+ public const string WMS_PRETASK_OUTSTOCK_TYPE_ID = "26126751446821";
+ ///
+ /// 任务类型-转移TypeId
+ ///
+ public const string WMS_PRETASK_TRANSFER_TYPE_ID = "26126753796389";
+
///
/// 预任务生成业务类型-空载具出库ID
///
public const string BIZTYPE_EMPTYOUT_ID = "26122798979365";
///
- /// 预任务生成业务类型-PDA空载具入库ID
+ /// 预任务生成业务类型-空载具出库
///
- public const string BIZTYPE_EMPTYINPDA_ID = "26475795363877";
+ public const string BIZTYPE_WMSEPTYOUTSTK_ID = "26122265173285";
///
- /// 预任务生成业务类型-PDA空载具出库ID
+ /// 预任务生成业务类型-载具移出
///
- public const string BIZTYPE_EMPTYOUTPDA_ID = "26475845405733";
+ public const string BIZTYPE_WMSMOOUTSTK_ID = "26122271183141";
+ ///
+ /// 预任务生成业务类型-空载具入库
+ ///
+ public const string BIZTYPE_WMSEMPTYINSTOCK_ID = "26121986416677";
+ ///
+ /// 预任务生成业务类型-载具移入
+ ///
+ public const string BIZTYPE_CARRYMOVEINSTOCK_ID = "26121988909861";
+ ///
+ /// 预任务生成业务类型-库内转移
+ ///
+ public const string BIZTYPE_WMSTRANSFER_ID = "26125644258853";
+ ///
+ /// 预任务生成业务类型-齐套分拣
+ ///
+ public const string BIZTYPE_WMSSETSORTING_ID = "26186830379045";
+ ///
+ /// 预任务生成业务类型-寄存捆包
+ ///
+ public const string BIZTYPE_WMSINBALE_ID = "26191517767205";
+ ///
+ /// 预任务生成业务类型-一般入库
+ ///
+ public const string BIZTYPE_WMSINSTOCK_ID = "26191496816421";
+ ///
+ /// 预任务生成业务类型-一般出库
+ ///
+ public const string BIZTYPE_WMSOUTSTOCK_ID = "26191522660645";
+ ///
+ /// 预任务生成业务类型-齐套入库
+ ///
+ public const string BIZTYPE_WMSKITTINGINSTK_ID = "26165655816741";
+ ///
+ /// 预任务生成业务类型-齐套出库
+ ///
+ public const string BIZTYPE_WMSKITTINGOUTSTK_ID = "26169472620837";
+ ///
+ /// 预任务生成业务类型-寄存出库
+ ///
+ public const string BIZTYPE_WMSOUTBALE_ID = "26191525396517";
+ ///
+ /// 预任务生成业务类型-寄存入库
+ ///
+ public const string BIZTYPE_WMSINBALEINSTK_ID = "26501508971285";
+ ///
+ /// 预任务生成业务类型-配送申请
+ ///
+ public const string BIZTYPE_WMSDELIVERY_ID = "26585291847957";
+
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
index 453c6ebd..73224fdb 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
@@ -104,8 +104,8 @@ namespace Tnb.WarehouseMgr
preTask.end_floor = ePoint?.floor.ToString();
preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
- preTask.biz_type = WmsWareHouseConst.BIZTYPE_MOVEIN_ID;
- preTask.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
+ preTask.biz_type = WmsWareHouseConst.BIZTYPE_CARRYMOVEINSTOCK_ID;
+ preTask.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID;
preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
preTask.area_id = sPoint?.area_id;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
index 02ca1614..92d01072 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
@@ -99,7 +99,7 @@ namespace Tnb.WarehouseMgr
preTask.end_floor = ePoint?.floor.ToString();
preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
- preTask.biz_type = WmsWareHouseConst.BIZTYPE_MOVEIN_ID;
+ preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSMOOUTSTK_ID;
preTask.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
index ad86e417..05e5ca9f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
@@ -101,7 +101,7 @@ namespace Tnb.WarehouseMgr
preTask.end_floor = ePoint?.floor.ToString();
preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
- preTask.biz_type = WmsWareHouseConst.BIZTYPE_EMPTYIN_ID;
+ preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSEMPTYINSTOCK_ID;
preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
preTask.area_id = sPoint?.area_id;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs
index a839ece1..a89261b3 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs
@@ -31,17 +31,17 @@ namespace Tnb.WarehouseMgr
///
[OverideVisualDev(ModuleId)]
[ServiceModule(BizTypeId)]
- public class WmsCarryMoveInStockService : BaseWareHouseService
+ public class WmsTransferService : BaseWareHouseService
{
- private const string BizTypeId = "26121988909861";
- private const string ModuleId = "26122102481957";
+ private const string BizTypeId = "26125644258853";
+ private const string ModuleId = "26125750270757";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
private readonly IWareHouseService _wareHouseService;
private readonly IBillRullService _billRullService;
private readonly IUserManager _userManager;
- public WmsCarryMoveInStockService(
+ public WmsTransferService(
ISqlSugarRepository repository,
IRunService runService,
IVisualDevService visualDevService,
@@ -55,10 +55,10 @@ namespace Tnb.WarehouseMgr
_wareHouseService = wareHouseService;
_userManager = userManager;
_billRullService = billRullService;
- OverideFuncs.CreateAsync = CarryMoveIn;
+ OverideFuncs.CreateAsync = CarryTransfer;
}
- private async Task CarryMoveIn(VisualDevModelDataCrInput input)
+ private async Task CarryTransfer(VisualDevModelDataCrInput input)
{
try
@@ -104,7 +104,7 @@ namespace Tnb.WarehouseMgr
preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
preTask.biz_type = WmsWareHouseConst.BIZTYPE_MOVEIN_ID;
- preTask.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
+ preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID;
preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
preTask.area_id = sPoint?.area_id;