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

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/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/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);
+        //}
+    }
+}