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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
贺立波
2023-06-16 09:15:37 +08:00
parent e2d35901cf 7ef4f0475a
commit 42b7956c08
12 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/GenPreTaskUpInput.cs
View File

@@ -14,7 +14,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto
/// <summary> /// <summary>
/// 预任务Id /// 预任务Id
/// </summary> /// </summary>
public string PreTaskId { get; set; } public string RquireId { get; set; }
/// <summary> /// <summary>
/// 载具Id /// 载具Id
/// </summary> /// </summary>

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCompleUpInput.cs
View File

@@ -11,6 +11,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
/// </summary> /// </summary>
public class TaskCompleUpInput public class TaskCompleUpInput
{ {
/// <summary>
/// 区分pda与pc端调用，默认pc端，忽略大小写
/// </summary>
public string prefix { get; set; }
/// <summary> /// <summary>
/// 任务执行Ids /// 任务执行Ids
/// </summary> /// </summary>

4
WarehouseMgr/Tnb.WarehouseMgr/BaseWareHouseService.cs
View File

@@ -20,7 +20,7 @@ namespace Tnb.WarehouseMgr
[Route("api/[area]/[controller]/[action]")] [Route("api/[area]/[controller]/[action]")]
public class BaseWareHouseService : IOverideVisualDevService, IDynamicApiController, ITransient public class BaseWareHouseService : IOverideVisualDevService, IDynamicApiController, ITransient
{ {
private static Dictionary<string, BaseWareHouseService> _serviceMap = new Dictionary<string, BaseWareHouseService>(); private static Dictionary<string, BaseWareHouseService> _serviceMap = new Dictionary<string, BaseWareHouseService>(StringComparer.OrdinalIgnoreCase);
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
static BaseWareHouseService() static BaseWareHouseService()
@@ -41,7 +41,7 @@ namespace Tnb.WarehouseMgr
if (_serviceMap.ContainsKey(input.bizTypeId)) if (_serviceMap.ContainsKey(input.bizTypeId))
{ {
await _serviceMap[input.bizTypeId].ModifyAsync(input); await _serviceMap[input.bizTypeId].ModifyAsync(input);
} }
} }
public virtual Task ModifyAsync(WareHouseUpInput input) public virtual Task ModifyAsync(WareHouseUpInput input)

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

@@ -52,7 +52,7 @@ namespace Tnb.WarehouseMgr
{ {
_db = repository.AsSugarClient(); _db = repository.AsSugarClient();
_dictionaryDataService = dictionaryDataService; _dictionaryDataService = dictionaryDataService;
_billRullService= billRullService; _billRullService = billRullService;
} }
/// <summary> /// <summary>
/// 根据载具Id带出库位、仓库信息 /// 根据载具Id带出库位、仓库信息
@@ -233,7 +233,7 @@ namespace Tnb.WarehouseMgr
items.ForEach(x => items.ForEach(x =>
{ {
x.is_chain = 0; x.is_chain = 0;
x.chain_type = "0"; x.chain_type = "0";
}); });
} }
@@ -433,6 +433,10 @@ namespace Tnb.WarehouseMgr
{ {
foreach (var dt in disTasks) 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 }; var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id };
if (dt.is_chain == 0) if (dt.is_chain == 0)
{ {

4
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs
View File

@@ -119,7 +119,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
@@ -139,7 +139,7 @@ namespace Tnb.WarehouseMgr
handleH.create_time = DateTime.Now; handleH.create_time = DateTime.Now;
preTaskUpInput.PreTaskRecord = handleH; preTaskUpInput.PreTaskRecord = handleH;
//根据载具移入Id，回更单据状态 //根据载具移入Id，回更单据状态
await _db.Updateable<WmsMoveInstock>().SetColumns(it => new WmsMoveInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.PreTaskId).ExecuteCommandAsync(); await _db.Updateable<WmsMoveInstock>().SetColumns(it => new WmsMoveInstock { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == preTaskUpInput.RquireId).ExecuteCommandAsync();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput); await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput);
} }

2
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs
View File

@@ -117,7 +117,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;

2
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
View File

@@ -118,7 +118,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;

2
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
View File

@@ -142,7 +142,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs
View File

@@ -120,7 +120,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs
View File

@@ -117,7 +117,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs
View File

@@ -118,7 +118,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;

4
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
View File

@@ -34,7 +34,7 @@ namespace Tnb.WarehouseMgr
[ServiceModule(BizTypeId)] [ServiceModule(BizTypeId)]
public class WmsPDAInStockService : BaseWareHouseService public class WmsPDAInStockService : BaseWareHouseService
{ {
private const string BizTypeId = "26121988909861"; private const string BizTypeId = "pda26121988909861";
private readonly ISqlSugarClient _db; private readonly ISqlSugarClient _db;
private readonly IRunService _runService; private readonly IRunService _runService;
private readonly IVisualDevService _visualDevService; private readonly IVisualDevService _visualDevService;
@@ -121,7 +121,7 @@ namespace Tnb.WarehouseMgr
if (isOk) if (isOk)
{ {
var preTaskUpInput = new GenPreTaskUpInput(); 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.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;