From c8a49842f50001bb92f520feda0e6c5bbcb6b492 Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 16:28:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E8=BD=BD=E5=85=B7=E7=A7=BB=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E8=BD=BD=E5=85=B7=E7=A7=BB=E5=85=A5PDA=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsCarryMoveOutStockService.cs | 146 ++++++++++++++++- .../WmsPDACarryMoveOutStockService.cs | 149 ++++++++++++++++++ 2 files changed, 293 insertions(+), 2 deletions(-) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs index 8c24fbf0..9f8a96cb 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs @@ -1,7 +1,149 @@ -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
{
 /// 
 /// 载具移入
 /// 
 [OverideVisualDev(ModuleId)]
 [ServiceModule(BizTypeId)]
 public class WmsCarryMoveOutStockService : BaseWareHouseService
 {
 private const string ModuleId = "26123262586661";
 private const string BizTypeId = "26122271183141";
 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 carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString());
 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 (carry != null)
 {
 sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.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_WMSMOOUTSTK_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;
 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);
 } +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 +{ + /// + /// 载具移入 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID)] + [ServiceModule(BizTypeId)] + public class WmsCarryMoveOutStockService : BaseWareHouseService + { + private const string BizTypeId = "26122271183141"; + 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(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); + await _runService.Create(templateEntity, input); + //入库取终点 + //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; + var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString()); + 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 (carry != null) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.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_WMSMOOUTSTK_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; + 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 WmsMoveOutstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); if (!isOk) throw Oops.Oh(ErrorCode.COM1001); - }
 } 
}
 \ No newline at end of file + } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs new file mode 100644 index 00000000..1ceb2fd6 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs @@ -0,0 +1,149 @@ +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 +{ + /// + /// 载具移入 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID)] + [ServiceModule(BizTypeId)] + public class WmsPDACarryMoveOutStockService : BaseWareHouseService + { + private const string BizTypeId = "26122271183141"; + 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 WmsPDACarryMoveOutStockService( + 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(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); + await _runService.Create(templateEntity, input); + //入库取终点 + //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; + var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString()); + 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 (carry != null) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.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_WMSMOOUTSTK_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; + 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 WmsMoveOutstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + // if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + //} + } +} From f66aa1ff49b9cc6521b490c7e41430c67d2bc65d Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 16:41:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E5=90=8D=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsCarryMoveOutStockService.cs | 4 +- .../WmsEmptyOutstockService .cs | 151 ++++++++++++++++++ .../WmsPDACarryMoveInStockService.cs | 4 +- .../WmsPDACarryMoveOutStockService.cs | 4 +- 4 files changed, 157 insertions(+), 6 deletions(-) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs index 9f8a96cb..002c0b6d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs @@ -53,10 +53,10 @@ namespace Tnb.WarehouseMgr _wareHouseService = wareHouseService; _userManager = userManager; _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryMoveIn; + OverideFuncs.CreateAsync = CarryMoveOut; } - private async Task CarryMoveIn(VisualDevModelDataCrInput input) + private async Task CarryMoveOut(VisualDevModelDataCrInput input) { try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs new file mode 100644 index 00000000..1c9dcf60 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs @@ -0,0 +1,151 @@ +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 + +{ + /// + /// 空载具入库 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYINSTOCK_ID)] + [ServiceModule(BizTypeId)] + + public class WmsEmptyOutstockService : BaseWareHouseService + { + private const string BizTypeId = "26121986416677"; + 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 WmsEmptyOutstockService( + 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 = WmsEmptyOut; + } + + private async Task WmsEmptyOut(VisualDevModelDataCrInput input) + { + + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYINSTOCK_ID, true); + await _runService.Create(templateEntity, input); + //入库取终点 + var inStockStrategyInput = new OutStockStrategyQuery { 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_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; + 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.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 async Task ModifyAsync(WareHouseUpInput input) + { + if (input == null) throw new ArgumentNullException(nameof(input)); + var isOk = await _db.Updateable().SetColumns(it => new WmsEmptyInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs index da54a0a9..c7340eaf 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs @@ -56,10 +56,10 @@ namespace Tnb.WarehouseMgr _wareHouseService = wareHouseService; _userManager = userManager; _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryMoveIn; + OverideFuncs.CreateAsync = PDACarryMoveIn; } - private async Task CarryMoveIn(VisualDevModelDataCrInput input) + private async Task PDACarryMoveIn(VisualDevModelDataCrInput input) { try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs index 1ceb2fd6..c5044282 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveOutStockService.cs @@ -53,10 +53,10 @@ namespace Tnb.WarehouseMgr _wareHouseService = wareHouseService; _userManager = userManager; _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryMoveIn; + OverideFuncs.CreateAsync = PDACarryMoveOut; } - private async Task CarryMoveIn(VisualDevModelDataCrInput input) + private async Task PDACarryMoveOut(VisualDevModelDataCrInput input) { try