diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
index f4decc33..83562d57 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
@@ -14,7 +14,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
///
/// 预任务Id
///
- public string PreTaskId { get; set; }
+ public string RquireId { get; set; }
///
/// 载具Id
///
diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCompleUpInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCompleUpInput.cs
index b312aaeb..f6d1ae3f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCompleUpInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCompleUpInput.cs
@@ -11,6 +11,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
///
public class TaskCompleUpInput
{
+ ///
+ /// 区分pda与pc端调用,默认pc端,忽略大小写
+ ///
+ public string prefix { get; set; }
///
/// 任务执行Ids
///
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
index 24a43668..256ce972 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
@@ -20,7 +20,7 @@ namespace Tnb.WarehouseMgr
[Route("api/[area]/[controller]/[action]")]
public class BaseWareHouseService : IOverideVisualDevService, IDynamicApiController, ITransient
{
- private static Dictionary _serviceMap = new Dictionary();
+ private static Dictionary _serviceMap = new Dictionary(StringComparer.OrdinalIgnoreCase);
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
static BaseWareHouseService()
@@ -41,7 +41,7 @@ namespace Tnb.WarehouseMgr
if (_serviceMap.ContainsKey(input.bizTypeId))
{
await _serviceMap[input.bizTypeId].ModifyAsync(input);
- }
+ }
}
public virtual Task ModifyAsync(WareHouseUpInput input)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
index 2e015270..2d93878e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
@@ -52,7 +52,7 @@ namespace Tnb.WarehouseMgr
{
_db = repository.AsSugarClient();
_dictionaryDataService = dictionaryDataService;
- _billRullService= billRullService;
+ _billRullService = billRullService;
}
///
/// 根据载具Id带出库位、仓库信息
@@ -233,7 +233,7 @@ namespace Tnb.WarehouseMgr
items.ForEach(x =>
{
x.is_chain = 0;
-
+
x.chain_type = "0";
});
}
@@ -433,6 +433,10 @@ namespace Tnb.WarehouseMgr
{
foreach (var dt in disTasks)
{
+ if (!input.prefix.IsNullOrWhiteSpace())
+ {
+ dt.biz_type = $"{input.prefix}{dt.biz_type}";
+ }
var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id };
if (dt.is_chain == 0)
{
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
index d1273e6c..6534877f 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
@@ -119,7 +119,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
@@ -139,7 +139,7 @@ namespace Tnb.WarehouseMgr
handleH.create_time = DateTime.Now;
preTaskUpInput.PreTaskRecord = handleH;
//根据载具移入Id,回更单据状态
- await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.PreTaskId).ExecuteCommandAsync();
+ await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
index 4e6ea11c..b4d18d79 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
@@ -117,7 +117,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
index 2b9b5057..f55c9a81 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
@@ -118,7 +118,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
index 10c4e57f..9b39bab4 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
@@ -142,7 +142,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs
index 9d9f3e51..012f2dac 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs
@@ -120,7 +120,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
index 0b12afc7..5de69a1a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
@@ -117,7 +117,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
index 64b433b9..a6cb6f83 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
@@ -118,7 +118,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
index 56c393ec..92218932 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
@@ -31,10 +31,10 @@ namespace Tnb.WarehouseMgr
/// 载具移入
///
[OverideVisualDev(ModuleConsts.MODULE_WMSINSTOCKPDA_ID)]
- [ServiceModule(BizTypeId)]
+ //[ServiceModule(BizTypeId)]
public class WmsPDAInStockService : BaseWareHouseService
{
- private const string BizTypeId = "26121988909861";
+ //private const string BizTypeId = "26121988909861";
private readonly ISqlSugarClient _db;
private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService;
@@ -121,7 +121,7 @@ namespace Tnb.WarehouseMgr
if (isOk)
{
var preTaskUpInput = new GenPreTaskUpInput();
- preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+ preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;