Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
This commit is contained in:
FanLian
@@ -4,5 +4,125 @@ public class ModuleConsts
|
|||||||
{
|
{
|
||||||
public const string Tag = "PerMgr";
|
public const string Tag = "PerMgr";
|
||||||
public const string Area = "per";
|
public const string Area = "per";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣ȡ<ECB3A3><C8A1>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAͶ<41>ϲ<EFBFBD><CFB2><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><EFBFBD><F3B6A8B2><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSBINDINGPDA_ID = "26496560237333";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߽<D8BE><DFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߰<D8BE><DFB0><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߸<D8BE><DFB8><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSINBALEINPDA_ID = "26475412782629";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAһ<41><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSOUTBALE_ID = "26192638001445";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSINBALE_ID = "26192480520485";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSOUTSTOCK_ID = "26191983650597";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSINSTOCK_ID = "26191326300453";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ߸<D8BE><DFB8><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ּ<D7B7>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSSETSORTING_ID = "26172520979237";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>׳<EFBFBD><D7B3><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSDELIVERY_ID = "26126388337189";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSTRANSFER_ID = "26125750270757";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ߳<D8BE><DFB3><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957";
|
||||||
|
/// <summary>
|
||||||
|
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
|
||||||
|
/// </summary>
|
||||||
|
public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165";
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -392,42 +392,56 @@ namespace Tnb.WarehouseMgr
|
|||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task TaskComplate(TaskCompleUpInput input)
|
public async Task TaskComplate(TaskCompleUpInput input)
|
||||||
{
|
{
|
||||||
//更新任务执行表，单据状态为 完成
|
try
|
||||||
await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
|
|
||||||
//更新预任务申请表，单据状态为 已完成
|
|
||||||
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).ToListAsync();
|
|
||||||
if (disTasks?.Count > 0)
|
|
||||||
{
|
{
|
||||||
var preTaskIds = disTasks.Select(x => x.pretask_id).ToList();
|
await _db.Ado.BeginTranAsync();
|
||||||
await _db.Updateable<WmsPretaskH>().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
|
|
||||||
}
|
//更新任务执行表，单据状态为 完成
|
||||||
//更新载具，锁定状态为未锁定，更新载具的库位当前任务的目标库位
|
await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
|
||||||
if (disTasks?.Count > 0)
|
//更新预任务申请表，单据状态为 已完成
|
||||||
{
|
var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).ToListAsync();
|
||||||
var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList();
|
if (disTasks?.Count > 0)
|
||||||
for (int i = 0; i < multiList.Count; i++)
|
|
||||||
{
|
{
|
||||||
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync();
|
var preTaskIds = disTasks.Select(x => x.pretask_id).ToList();
|
||||||
|
await _db.Updateable<WmsPretaskH>().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync();
|
||||||
}
|
}
|
||||||
}
|
//更新载具，锁定状态为未锁定，更新载具的库位当前任务的目标库位
|
||||||
//更新库位信息，使用状态为 使用，锁定状态为未锁定
|
if (disTasks?.Count > 0)
|
||||||
if (disTasks?.Count > 0)
|
|
||||||
{
|
|
||||||
var destLocIds = disTasks.Select(it => it.endlocation_id).ToList();
|
|
||||||
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = "1", is_lock = 0 }).Where(it => destLocIds.Contains(it.id)).ExecuteCommandAsync();
|
|
||||||
}
|
|
||||||
//更新业务主表的单据状态
|
|
||||||
if (disTasks?.Count > 0)
|
|
||||||
{
|
|
||||||
foreach (var dt in disTasks)
|
|
||||||
{
|
{
|
||||||
if (dt.is_chain == 0)
|
var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList();
|
||||||
|
for (int i = 0; i < multiList.Count; i++)
|
||||||
|
{
|
||||||
|
await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//更新库位信息，使用状态为 使用，锁定状态为未锁定
|
||||||
|
if (disTasks?.Count > 0)
|
||||||
|
{
|
||||||
|
var destLocIds = disTasks.Select(it => it.endlocation_id).ToList();
|
||||||
|
await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = "1", is_lock = 0 }).Where(it => destLocIds.Contains(it.id)).ExecuteCommandAsync();
|
||||||
|
}
|
||||||
|
//更新业务主表的单据状态
|
||||||
|
if (disTasks?.Count > 0)
|
||||||
|
{
|
||||||
|
foreach (var dt in disTasks)
|
||||||
{
|
{
|
||||||
var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id };
|
var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id };
|
||||||
await base[upInput];
|
if (dt.is_chain == 0)
|
||||||
|
{
|
||||||
|
await base[upInput];
|
||||||
|
}
|
||||||
|
else if (dt.is_chain == 1 && dt.chain_type == "3")
|
||||||
|
{
|
||||||
|
await base[upInput];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await _db.Ado.CommitTranAsync();
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
await _db.Ado.RollbackTranAsync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
153
WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs
Normal file
153
WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs
Normal file
@@ -0,0 +1,153 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using JNPF.Common.Core.Manager;
|
||||||
|
using JNPF.Common.Dtos.VisualDev;
|
||||||
|
using JNPF.Common.Enums;
|
||||||
|
using JNPF.Common.Extension;
|
||||||
|
using JNPF.Common.Security;
|
||||||
|
using JNPF.FriendlyException;
|
||||||
|
using JNPF.Systems.Interfaces.System;
|
||||||
|
using JNPF.VisualDev;
|
||||||
|
using JNPF.VisualDev.Entitys;
|
||||||
|
using JNPF.VisualDev.Interfaces;
|
||||||
|
using Mapster;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using SqlSugar;
|
||||||
|
using Tnb.BasicData.Entities;
|
||||||
|
using Tnb.WarehouseMgr.Entities;
|
||||||
|
using Tnb.WarehouseMgr.Entities.Attributes;
|
||||||
|
using Tnb.WarehouseMgr.Entities.Consts;
|
||||||
|
using Tnb.WarehouseMgr.Entities.Dto;
|
||||||
|
using Tnb.WarehouseMgr.Interfaces;
|
||||||
|
namespace Tnb.WarehouseMgr
|
||||||
|
{
|
||||||
|
internal class WmsTransfer
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 库内转移
|
||||||
|
/// </summary>
|
||||||
|
[OverideVisualDev(ModuleId)]
|
||||||
|
[ServiceModule(BizTypeId)]
|
||||||
|
public class WmsCarryMoveInStockService : BaseWareHouseService
|
||||||
|
{
|
||||||
|
private const string BizTypeId = "26121988909861";
|
||||||
|
private const string ModuleId = "26122102481957";
|
||||||
|
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(
|
||||||
|
ISqlSugarRepository<WmsCarryH> repository,
|
||||||
|
IRunService runService,
|
||||||
|
IVisualDevService visualDevService,
|
||||||
|
IWareHouseService wareHouseService,
|
||||||
|
IUserManager userManager,
|
||||||
|
IBillRullService billRullService)
|
||||||
|
{
|
||||||
|
_db = repository.AsSugarClient();
|
||||||
|
_runService = runService;
|
||||||
|
_visualDevService = visualDevService;
|
||||||
|
_wareHouseService = wareHouseService;
|
||||||
|
_userManager = userManager;
|
||||||
|
_billRullService = billRullService;
|
||||||
|
OverideFuncs.CreateAsync = CarryMoveIn;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<dynamic> CarryMoveIn(VisualDevModelDataCrInput input)
|
||||||
|
{
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _db.Ado.BeginTranAsync();
|
||||||
|
|
||||||
|
VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
|
||||||
|
await _runService.Create(templateEntity, input);
|
||||||
|
//入库取终点
|
||||||
|
var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
|
||||||
|
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
|
||||||
|
WmsPointH sPoint = null;
|
||||||
|
WmsPointH ePoint = null;
|
||||||
|
if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
|
||||||
|
{
|
||||||
|
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
|
||||||
|
}
|
||||||
|
if (endLocations?.Count > 0)
|
||||||
|
{
|
||||||
|
ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == endLocations[0].id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sPoint != null && ePoint != null)
|
||||||
|
{
|
||||||
|
var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
|
||||||
|
//根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
|
||||||
|
if (points?.Count > 0)
|
||||||
|
{
|
||||||
|
if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
|
||||||
|
var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
|
||||||
|
{
|
||||||
|
var sPoint = it.FirstOrDefault();
|
||||||
|
var ePoint = it.LastOrDefault();
|
||||||
|
|
||||||
|
WmsPretaskH preTask = new();
|
||||||
|
preTask.org_id = _userManager.User.OrganizeId;
|
||||||
|
preTask.startlocation_id = sPoint?.location_id;
|
||||||
|
preTask.startlocation_code = sPoint?.location_code;
|
||||||
|
preTask.endlocation_id = ePoint?.location_id;
|
||||||
|
preTask.endlocation_code = ePoint?.location_code;
|
||||||
|
preTask.start_floor = sPoint?.floor.ToString();
|
||||||
|
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.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;
|
||||||
|
preTask.area_code = it.Key;
|
||||||
|
preTask.require_id = input.data["ReturnIdentity"].ToString();
|
||||||
|
preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!;
|
||||||
|
preTask.create_id = _userManager.UserId;
|
||||||
|
preTask.create_time = DateTime.Now;
|
||||||
|
return preTask;
|
||||||
|
}).ToList();
|
||||||
|
var isOk = await _wareHouseService.GenPreTask(preTasks);
|
||||||
|
if (isOk)
|
||||||
|
{
|
||||||
|
var preTaskUpInput = new GenPreTaskUpInput();
|
||||||
|
preTaskUpInput.PreTaskId = 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;
|
||||||
|
preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
|
||||||
|
preTaskUpInput.PreTaskRecords = preTasks.Adapt<List<WmsHandleH>>();
|
||||||
|
preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
|
||||||
|
await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
await _db.Ado.CommitTranAsync();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
await _db.Ado.RollbackTranAsync();
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
return Task.FromResult(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task ModifyAsync(WareHouseUpInput input)
|
||||||
|
{
|
||||||
|
if (input == null) throw new ArgumentNullException(nameof(input));
|
||||||
|
var isOk = await _db.Updateable<WmsMoveInstock>().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
|
||||||
|
if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user