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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs

@@ -5,123 +5,123 @@ public class ModuleConsts
     public const string Tag = "WarehouseMgr";
     public const string Area = "wms";
     /// <summary>
-    ///   任务操作-PDA异常取消
+    ///   模块标识-PDA异常取消
     /// </summary>
     public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605";
     /// <summary>
-    ///   任务操作-PDA异常重新执行
+    ///   模块标识-PDA异常重新执行
     /// </summary>
     public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813";
     /// <summary>
-    ///   任务操作-PDA异常完成
+    ///   模块标识-PDA异常完成
     /// </summary>
     public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869";
     /// <summary>
-    ///   任务操作-PDA投料操作
+    ///   模块标识-PDA投料操作
     /// </summary>
     public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981";
     /// <summary>
-    ///   任务操作-PDA绑定操作
+    ///   模块标识-PDA绑定操作
     /// </summary>
     public const string MODULE_WMSBINDINGPDA_ID = "26496560237333";
     /// <summary>
-    ///   任务操作-PDA载具解绑
+    ///   模块标识-PDA载具解绑
     /// </summary>
     public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613";
     /// <summary>
-    ///   任务操作-PDA载具绑定
+    ///   模块标识-PDA载具绑定
     /// </summary>
     public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837";
     /// <summary>
-    ///   任务操作-PDA载具移出
+    ///   模块标识-PDA载具移出
     /// </summary>
     public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677";
     /// <summary>
-    ///   任务操作-PDA载具移入
+    ///   模块标识-PDA载具移入
     /// </summary>
     public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469";
     /// <summary>
-    ///   任务操作-PDA载具更换
+    ///   模块标识-PDA载具更换
     /// </summary>
     public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157";
     /// <summary>
-    ///   任务操作-PDA配送申请
+    ///   模块标识-PDA配送申请
     /// </summary>
     public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973";
     /// <summary>
-    ///   任务操作-PDA库内转移
+    ///   模块标识-PDA库内转移
     /// </summary>
     public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317";
     /// <summary>
-    ///   任务操作-PDA寄存捆包
+    ///   模块标识-PDA寄存捆包
     /// </summary>
     public const string MODULE_WMSINBALEINPDA_ID = "26475412782629";
     /// <summary>
-    ///   任务操作-PDA寄存入库
+    ///   模块标识-PDA寄存入库
     /// </summary>
     public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989";
     /// <summary>
-    ///   任务操作-PDA齐套入库
+    ///   模块标识-PDA齐套入库
     /// </summary>
     public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781";
     /// <summary>
-    ///   任务操作-PDA一般入库
+    ///   模块标识-PDA一般入库
     /// </summary>
     public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445";
     /// <summary>
-    ///   任务操作-寄存出库
+    ///   模块标识-寄存出库
     /// </summary>
     public const string MODULE_WMSOUTBALE_ID = "26192638001445";
     /// <summary>
-    ///   任务操作-寄存捆包
+    ///   模块标识-寄存捆包
     /// </summary>
     public const string MODULE_WMSINBALE_ID = "26192480520485";
     /// <summary>
-    ///   任务操作-出库申请
+    ///   模块标识-出库申请
     /// </summary>
     public const string MODULE_WMSOUTSTOCK_ID = "26191983650597";
     /// <summary>
-    ///   任务操作-入库申请
+    ///   模块标识-入库申请
     /// </summary>
     public const string MODULE_WMSINSTOCK_ID = "26191326300453";
     /// <summary>
-    ///   任务操作-载具更换
+    ///   模块标识-载具更换
     /// </summary>
     public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
     /// <summary>
-    ///   任务操作-齐套分拣
+    ///   模块标识-齐套分拣
     /// </summary>
     public const string MODULE_WMSSETSORTING_ID = "26172520979237";
     /// <summary>
-    ///   任务操作-齐套出库
+    ///   模块标识-齐套出库
     /// </summary>
     public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741";
     /// <summary>
-    ///   任务操作-齐套入库
+    ///   模块标识-齐套入库
     /// </summary>
     public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909";
     /// <summary>
-    ///   任务操作-配送申请
+    ///   模块标识-配送申请
     /// </summary>
     public const string MODULE_WMSDELIVERY_ID = "26126388337189";
     /// <summary>
-    ///   任务操作-库内转移
+    ///   模块标识-库内转移
     /// </summary>
     public const string MODULE_WMSTRANSFER_ID = "26125750270757";
     /// <summary>
-    ///   任务操作-载具移出
+    ///   模块标识-载具移出
     /// </summary>
     public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661";
     /// <summary>
-    ///   任务操作-空载具出库
+    ///   模块标识-空载具出库
     /// </summary>
     public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365";
     /// <summary>
-    ///   任务操作-载具移入
+    ///   模块标识-载具移入
     /// </summary>
     public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957";
     /// <summary>
-    ///   任务操作-空载具入库
+    ///   模块标识-空载具入库
     /// </summary>
     public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165";
 

WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs

@@ -1 +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
{
    /// <summary>
    /// 库房业务(出入库)接口
    /// </summary>
    public interface IWareHouseService
    {
        /// <summary>
        /// 入库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input);
        /// <summary>
        /// 出库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
        /// <summary>
        /// 路径算法
        /// </summary>
        /// <param name="pStartId"></param>
        /// <param name="pEndId"></param>
        /// <returns></returns>
        Task<List<WmsPointH>> PathAlgorithms(string pStartId, string pEndId);
        /// <summary>
        /// 生成预任务
        /// </summary>
        /// <param name="preTasks"></param>
        /// <returns></returns>
        Task<bool> GenPreTask(List<WmsPretaskH> preTasks);
        /// <summary>
        /// 生成预任务成功后操作
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        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
{
    /// <summary>
    /// 库房业务(出入库)接口
    /// </summary>
    public interface IWareHouseService
    {
        /// <summary>
        /// 入库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task<List<BasLocation>> InStockStrategy([FromQuery] InStockStrategyQuery input);
        /// <summary>
        /// 出库策略
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        //Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
        /// <summary>
        /// 路径算法
        /// </summary>
        /// <param name="pStartId"></param>
        /// <param name="pEndId"></param>
        /// <returns></returns>
        Task<List<WmsPointH>> PathAlgorithms(string pStartId, string pEndId);
        /// <summary>
        /// 生成预任务
        /// </summary>
        /// <param name="preTasks"></param>
        /// <returns></returns>
        Task<bool> GenPreTask(List<WmsPretaskH> preTasks);
        /// <summary>
        /// 生成预任务成功后操作
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        Task GenTaskHandleAfter(GenPreTaskUpInput input);
    }
}


WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs

@@ -0,0 +1,178 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Aspose.Cells.Drawing;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Extension;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.BasicData.Interfaces;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Attributes;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Enums;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 配送申请服务
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
+    [Route("api/[area]/[controller]/[action]")]
+    [OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERYPDA_ID)]
+    [ServiceModule(BizTypeId)]
+    public class PdaWmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient
+    {
+        private const string BizTypeId = "26125644258853";
+        private readonly ISqlSugarClient _db;
+        private readonly IRunService _runService;
+        private readonly IVisualDevService _visualDevService;
+        private readonly IBasLocationService _basLocationService;
+        private readonly IWareHouseService _wareHouseService;
+        private readonly IBillRullService _billRullService;
+        private readonly IUserManager _userManager;
+        public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
+        public PdaWmsDeliveryService(
+            ISqlSugarRepository<WmsDelivery> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IBasLocationService basLocationService
+            )
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            _basLocationService = basLocationService;
+            //OverideFuncs.CreateAsync = Create;
+        }
+        /// <summary>
+        /// 根据载具编号获取起始库位点
+        /// </summary>
+        /// <param name="carryId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<dynamic> GetUnStoreLocationListByCarryId([FromRoute] string carryId)
+        {
+            var items = await _db.Queryable<WmsCarryH>().LeftJoin<BasLocation>((a, b) => a.location_id == b.id)
+                                        .Where(a => a.id == carryId)
+                                        .Select((a, b) => new
+                                        {
+                                            carry_code = a.carry_code,
+                                            location_code = b.location_code,
+                                        })
+                                        .ToListAsync();
+            return items;
+        }
+
+        private async Task<dynamic> Create(VisualDevModelDataCrInput input)
+        {
+            try
+            {
+                //startlocation_id
+                //endlocation_id
+                string startLocationId = "", endLocationId = "";
+                if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)))
+                {
+                    startLocationId = input.data[nameof(WmsDelivery.startlocation_id)]?.ToString()!;
+                }
+                if (input.data.ContainsKey(nameof(WmsDelivery.endlocation_id)))
+                {
+                    endLocationId = input.data[nameof(WmsDelivery.endlocation_id)]?.ToString()!;
+                }
+                var locIds = new[] { startLocationId, endLocationId };
+                var locs = await _basLocationService.GetLocationInfobyIds(locIds);
+                if (locs?.Count > 0)
+                {
+                    var isStoreLoc = locs.Where(x => !x.IsNullOrEmpty()).Select(x => x.is_type.ParseToInt()).Any(x => x == (int)EnumLocationType.存储库位);
+                    if (isStoreLoc) throw new AppFriendlyException("起始库位不能为存储库位", 500);
+                }
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSDELIVERYPDA_ID, true);
+                await _runService.Create(templateEntity, input);
+
+                // 计算路径，插入预任务申请
+                WmsPointH sPoint = null;
+                WmsPointH ePoint = null;
+                if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)))
+                {
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
+                }
+                if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id)))
+                {
+                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString());
+                }
+
+                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_WMSDELIVERY_ID;
+                            preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_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)
+            {
+                return await Task.FromResult(false);
+            }
+            return await Task.FromResult(true);
+        }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.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 Microsoft.CodeAnalysis;
+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
+{
+
+    /// <summary>
+    /// 库内转移
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)]
+    [ServiceModule(BizTypeId)]
+    public class PdaWmsTransferService : BaseWareHouseService
+    {
+        private const string BizTypeId = "26585291847957";
+        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 PdaWmsTransferService(
+            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 = CarryTransfer;
+        }
+
+        private async Task<dynamic> CarryTransfer(VisualDevModelDataCrInput input)
+        {
+
+            try
+            {
+                await _db.Ado.BeginTranAsync();
+
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true);
+                await _runService.Create(templateEntity, input);
+                // 计算路径，插入预任务申请
+                WmsPointH sPoint = null;
+                WmsPointH ePoint = null;
+                if (input.data.ContainsKey(nameof(WmsTransfer.startlocation_id)))
+                {
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
+                }
+                if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id)))
+                {
+                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString());
+                }
+
+                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_WMSDELIVERY_ID;
+                            preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_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);
+        }
+    }
+
+}

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -212,10 +212,9 @@ namespace Tnb.WarehouseMgr
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input)
+        public async Task<dynamic> OutStockStrategy()
         {
-            var items = await _db.Queryable<WmsCarryH>().Where(it => it.id == input.carry_id).ToListAsync();
+            return Task.FromResult<dynamic>(true);
-            return items.Take(input.Size).ToList();
         }
         /// <summary>
         /// 生成任务执行

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs

@@ -28,12 +28,11 @@ namespace Tnb.WarehouseMgr
     /// <summary>
     /// 载具移入
     /// </summary>
-    [OverideVisualDev(ModuleId)]
+    [OverideVisualDev(ModuleConsts.MODULE_CARRYMOVEINSTOCK_ID)]
     [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;
@@ -66,7 +65,7 @@ namespace Tnb.WarehouseMgr
             {
                 await _db.Ado.BeginTranAsync();
 
-                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_CARRYMOVEINSTOCK_ID, true);
                 await _runService.Create(templateEntity, input);
                 //入库取终点 //出库起点
                 var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };

WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs

@@ -4,11 +4,14 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Aspose.Cells.Drawing;
+using JNPF.Common.Core.Manager;
 using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
 using JNPF.Common.Extension;
 using JNPF.DependencyInjection;
 using JNPF.DynamicApiController;
 using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
 using JNPF.VisualDev;
 using JNPF.VisualDev.Entitys;
 using JNPF.VisualDev.Interfaces;
@@ -17,6 +20,9 @@ using SqlSugar;
 using Tnb.BasicData.Entities;
 using Tnb.BasicData.Interfaces;
 using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Attributes;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Enums;
 using Tnb.WarehouseMgr.Interfaces;
 
@@ -27,13 +33,18 @@ namespace Tnb.WarehouseMgr
     /// </summary>
     [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
     [Route("api/[area]/[controller]/[action]")]
-    public class WmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient
+    [OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERY_ID)]
+    [ServiceModule(BizTypeId)]
+    public class WmsDeliveryService : BaseWareHouseService,IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient
     {
-        private const string ModuleId = "26126388337189";
+        private const string BizTypeId = "26125644258853";
         private readonly ISqlSugarClient _db;
         private readonly IRunService _runService;
         private readonly IVisualDevService _visualDevService;
         private readonly IBasLocationService _basLocationService;
+        private readonly IWareHouseService _wareHouseService;
+        private readonly IBillRullService _billRullService;
+        private readonly IUserManager _userManager;
         public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
         public WmsDeliveryService(
             ISqlSugarRepository<WmsDelivery> repository,
@@ -89,8 +100,74 @@ namespace Tnb.WarehouseMgr
                     var isStoreLoc = locs.Where(x => !x.IsNullOrEmpty()).Select(x => x.is_type.ParseToInt()).Any(x => x == (int)EnumLocationType.存储库位);
                     if (isStoreLoc) throw new AppFriendlyException("起始库位不能为存储库位", 500);
                 }
-                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSDELIVERY_ID, true);
                 await _runService.Create(templateEntity, input);
+
+                // 计算路径，插入预任务申请
+                WmsPointH sPoint = null;
+                WmsPointH ePoint = null;
+                if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id)))
+                {
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
+                }
+                if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id)))
+                {
+                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString());
+                }
+
+                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_WMSDELIVERY_ID;
+                            preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_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)
             {
@@ -98,5 +175,11 @@ namespace Tnb.WarehouseMgr
             }
             return await Task.FromResult(true);
         }
+        public override async Task ModifyAsync(WareHouseUpInput input)
+        {
+            if (input == null) throw new ArgumentNullException(nameof(input));
+            var isOk = await _db.Updateable<WmsDelivery>().SetColumns(it => new WmsDelivery { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+            if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+        }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs

@@ -30,17 +30,19 @@ namespace Tnb.WarehouseMgr
     /// </summary>
     [OverideVisualDev(ModuleId)]
     [ServiceModule(BizTypeId)]
-    public class WmsEmptyMoveOutStockService : BaseWareHouseService
+    public class WmsPDACarryMoveInStockService : BaseWareHouseService
     {
-        private const string ModuleId = "26122798979365";
+        private const string BizTypeId = "26121988909861";
-        private const string BizTypeId = "26122798979365";
+        private const string ModuleId = "26476127634469";
         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 WmsEmptyMoveOutStockService(
+
+
+        public WmsPDACarryMoveInStockService(
             ISqlSugarRepository<WmsCarryH> repository,
             IRunService runService,
             IVisualDevService visualDevService,
@@ -66,18 +68,18 @@ namespace Tnb.WarehouseMgr
 
                 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 inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
-                var carrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
+                var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
                 WmsPointH sPoint = null;
                 WmsPointH ePoint = null;
                 if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
                 {
-                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
                 }
-                if (carrys?.Count > 0)
+                if (endLocations?.Count > 0)
                 {
-                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carrys[0].location_id);
+                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == endLocations[0].id);
                 }
 
                 if (sPoint != null && ePoint != null)
@@ -102,8 +104,8 @@ namespace Tnb.WarehouseMgr
                             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_EMPTYOUT_ID;
+                            preTask.biz_type = WmsWareHouseConst.BIZTYPE_CARRYMOVEINSTOCK_ID;
-                            //preTask.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_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;
@@ -140,5 +142,12 @@ namespace Tnb.WarehouseMgr
             }
             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);
+        //}
     }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.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
+
+{
+    /// <summary>
+    /// 空载具入库
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYINSTOCK_ID)]
+    [ServiceModule(BizTypeId)]
+
+    public class WmsPDAEmptyInstockService : 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 WmsPDAEmptyInstockService(
+            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 = WmsEmptyIn;
+        }
+
+        private async Task<dynamic> WmsEmptyIn(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 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_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<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 async Task ModifyAsync(WareHouseUpInput input)
+        //{
+        //    if (input == null) throw new ArgumentNullException(nameof(input));
+        //    var isOk = await _db.Updateable<WmsEmptyInstock>().SetColumns(it => new WmsEmptyInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+        //    if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+        //}
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs

@@ -1,153 +0,0 @@
-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 WmsTransferService : BaseWareHouseService
-        {
-            private const string BizTypeId = "26125644258853";
-            private const string ModuleId = "26125750270757";
-            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 WmsTransferService(
-                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 = CarryTransfer;
-            }
-
-            private async Task<dynamic> CarryTransfer(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_WMSTRANSFER_ID;
-                                preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_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);
-            }
-        }
-    }
-}

WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.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 Microsoft.CodeAnalysis;
+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
+{
+
+    /// <summary>
+    /// 库内转移
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)]
+    [ServiceModule(BizTypeId)]
+    public class WmsTransferService : BaseWareHouseService
+    {
+        private const string BizTypeId = "26585291847957";
+        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 WmsTransferService(
+            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 = CarryTransfer;
+        }
+
+        private async Task<dynamic> CarryTransfer(VisualDevModelDataCrInput input)
+        {
+
+            try
+            {
+                await _db.Ado.BeginTranAsync();
+
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true);
+                await _runService.Create(templateEntity, input);
+                // 计算路径，插入预任务申请
+                WmsPointH sPoint = null;
+                WmsPointH ePoint = null;
+                if (input.data.ContainsKey(nameof(WmsTransfer.startlocation_id)))
+                {
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString());
+                }
+                if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id)))
+                {
+                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString());
+                }
+
+                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_WMSDELIVERY_ID;
+                            preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_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<WmsTransfer>().SetColumns(it => new WmsTransfer { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync();
+            if (!isOk) throw Oops.Oh(ErrorCode.COM1001);
+        }
+    }
+
+}