From 67b7631ad1f426812f9bbcf0a790587f59528e2d Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 11:11:07 +0800 Subject: [PATCH 1/3] cssaasdadsad --- .../Consts/WmsWareHouseConst.cs | 2 +- .../Dto/Queries/OutStockStrategyQuery.cs | 21 ++- .../IWareHouseService.cs | 6 + .../Tnb.WarehouseMgr/WareHouseService.cs | 6 +- .../WmsCarryMoveInStockService.cs | 2 +- .../WmsCarryMoveOutStockService.cs | 141 ++++++++++++++++++ 6 files changed, 173 insertions(+), 5 deletions(-) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs index 85c065c8..c45ee6e7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs @@ -60,7 +60,7 @@ namespace Tnb.WarehouseMgr.Entities.Consts /// public const string WMS_PRETASK_INSTOCK_TYPE_ID = "26126748597797"; /// - /// 预任务生成业务类型-载具移入Id + /// 预任务生成业务类型-空载具移入Id /// public const string BIZTYPE_EMPTYIN_ID = "26120915344165"; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs index e4d9fae2..fdd959d3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs @@ -6,7 +6,26 @@ using System.Threading.Tasks; namespace Tnb.WarehouseMgr.Entities.Dto { - internal class OutStockStrategyQuery + public class OutStockStrategyQuery { + + /// + /// 载具Id + /// + public string carry_id { get; set; } + /// + /// 物料Id + /// + public string material_id { get; set; } + /// + /// 批次 + /// + public string code_batch { get; set; } + /// + /// 业务类型s + /// + public int BllType { get; set; } + + public int Size { get; set; } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs index b422285f..d5c2c21a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs @@ -22,6 +22,12 @@ namespace Tnb.WarehouseMgr.Interfaces /// Task> InStockStrategy([FromQuery] InStockStrategyQuery input); /// + /// 出库策略 + /// + /// + /// + Task> OutStockStrategy([FromQuery] OutStockStrategyQuery input); + /// /// 路径算法 /// /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 2ebf940f..375cf165 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -25,6 +25,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.CodeAnalysis; using NPOI.OpenXmlFormats.Wordprocessing; using Polly.Timeout; +using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen; using Spire.Pdf.Widget; using SqlSugar; using Tnb.BasicData.Entities; @@ -211,9 +212,10 @@ namespace Tnb.WarehouseMgr /// /// [HttpGet] - public async Task OutStockStrategy() + public async Task> OutStockStrategy([FromQuery] OutStockStrategyQuery input) { - return Task.FromResult(true); + var items = await _db.Queryable().Where(it => it.id == input.carry_id ).ToListAsync(); + return items.Take(input.Size).ToList(); } /// /// 生成任务执行 diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs index 105a102e..264cfd19 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs @@ -63,7 +63,7 @@ namespace Tnb.WarehouseMgr 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; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs new file mode 100644 index 00000000..c5e52fa5 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs @@ -0,0 +1,141 @@ +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.Consts; +using Tnb.WarehouseMgr.Entities.Dto; +using Tnb.WarehouseMgr.Interfaces; + +namespace Tnb.WarehouseMgr +{ + /// + /// 载具移入 + /// + [OverideVisualDev(ModuleId)] + public class WmsCarryMoveOutStockService : BaseWareHouseService + { + 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 WmsCarryMoveOutStockService( + ISqlSugarRepository 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 CarryMoveIn(VisualDevModelDataCrInput input) + { + + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); + await _runService.Create(templateEntity, input); + //入库取终点 + var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; + var carrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput); + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsPointH.location_id))) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); + } + if (carrys?.Count > 0) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carrys[0].location_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>(); + 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); + } + } +} From 1322912c256c982bd099761049aa23334c12c746 Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 11:16:33 +0800 Subject: [PATCH 2/3] 1 --- .../IWareHouseService.cs | 51 +------------------ 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs index d5c2c21a..99e3794b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs @@ -1,50 +1 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Tnb.BasicData.Entities; -using Tnb.WarehouseMgr.Entities; -using Tnb.WarehouseMgr.Entities.Dto; - -namespace Tnb.WarehouseMgr.Interfaces -{ - /// - /// 库房业务(出入库)接口 - /// - public interface IWareHouseService - { - /// - /// 入库策略 - /// - /// - /// - Task> InStockStrategy([FromQuery] InStockStrategyQuery input); - /// - /// 出库策略 - /// - /// - /// - Task> OutStockStrategy([FromQuery] OutStockStrategyQuery input); - /// - /// 路径算法 - /// - /// - /// - /// - Task> PathAlgorithms(string pStartId, string pEndId); - /// - /// 生成预任务 - /// - /// - /// - Task GenPreTask(List preTasks); - /// - /// 生成预任务成功后操作 - /// - /// - /// - Task GenTaskHandleAfter(GenPreTaskUpInput input); - } -} +using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;

namespace Tnb.WarehouseMgr.Interfaces
{
 /// 
 /// 库房业务(出入库)接口
 /// 
 public interface IWareHouseService
 {
 /// 
 /// 入库策略
 /// 
 /// 
 /// 
 Task> InStockStrategy([FromQuery] InStockStrategyQuery input);
 /// 
 /// 出库策略
 /// 
 /// 
 /// 
 Task> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
 /// 
 /// 路径算法
 /// 
 /// 
 /// 
 /// 
 Task> PathAlgorithms(string pStartId, string pEndId);
 /// 
 /// 生成预任务
 /// 
 /// 
 /// 
 Task GenPreTask(List preTasks);
 /// 
 /// 生成预任务成功后操作
 /// 
 /// 
 /// 
 Task GenTaskHandleAfter(GenPreTaskUpInput input);
 }
}
 \ No newline at end of file From b8b1195a21d40ea33066fa55af50b6140dfaf866 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Thu, 15 Jun 2023 11:19:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=93=E5=86=85=E8=BD=AC=E7=A7=BB?= =?UTF-8?q?=E5=92=8Cmodule=E9=9D=99=E6=80=81=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/ModuleConsts.cs | 120 ++++++++++++++ WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs | 153 ++++++++++++++++++ 2 files changed, 273 insertions(+) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs diff --git a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs index 69c95f60..d2adc2f9 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs @@ -4,5 +4,125 @@ public class ModuleConsts { public const string Tag = "PerMgr"; public const string Area = "per"; + /// + /// -PDA쳣ȡ + /// + public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605"; + /// + /// -PDA쳣ִ + /// + public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813"; + /// + /// -PDA쳣 + /// + public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869"; + /// + /// -PDAͶϲ + /// + public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981"; + /// + /// -PDA󶨲 + /// + public const string MODULE_WMSBINDINGPDA_ID = "26496560237333"; + /// + /// -PDAؾ߽ + /// + public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613"; + /// + /// -PDAؾ߰ + /// + public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837"; + /// + /// -PDAؾƳ + /// + public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677"; + /// + /// -PDAؾ + /// + public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469"; + /// + /// -PDAؾ߸ + /// + public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157"; + /// + /// -PDA + /// + public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973"; + /// + /// -PDAת + /// + public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317"; + /// + /// -PDAĴ + /// + public const string MODULE_WMSINBALEINPDA_ID = "26475412782629"; + /// + /// -PDAĴ + /// + public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989"; + /// + /// -PDA + /// + public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781"; + /// + /// -PDAһ + /// + public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445"; + /// + /// -Ĵ + /// + public const string MODULE_WMSOUTBALE_ID = "26192638001445"; + /// + /// -Ĵ + /// + public const string MODULE_WMSINBALE_ID = "26192480520485"; + /// + /// - + /// + public const string MODULE_WMSOUTSTOCK_ID = "26191983650597"; + /// + /// - + /// + public const string MODULE_WMSINSTOCK_ID = "26191326300453"; + /// + /// -ؾ߸ + /// + public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557"; + /// + /// -׷ּ + /// + public const string MODULE_WMSSETSORTING_ID = "26172520979237"; + /// + /// -׳ + /// + public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741"; + /// + /// - + /// + public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909"; + /// + /// - + /// + public const string MODULE_WMSDELIVERY_ID = "26126388337189"; + /// + /// -ת + /// + public const string MODULE_WMSTRANSFER_ID = "26125750270757"; + /// + /// -ؾƳ + /// + public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661"; + /// + /// -ؾ߳ + /// + public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365"; + /// + /// -ؾ + /// + public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957"; + /// + /// -ؾ + /// + public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165"; } \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs new file mode 100644 index 00000000..a839ece1 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs @@ -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 + { + /// + /// 库内转移 + /// + [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 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 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().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); + } + if (endLocations?.Count > 0) + { + ePoint = await _db.Queryable().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>(); + 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().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + } + } +}