cssaasdadsad

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -60,7 +60,7 @@ namespace Tnb.WarehouseMgr.Entities.Consts
         /// </summary>
         public const string WMS_PRETASK_INSTOCK_TYPE_ID = "26126748597797";
         /// <summary>
-        /// 预任务生成业务类型-载具移入Id
+        /// 预任务生成业务类型-空载具移入Id
         /// </summary>
         public const string BIZTYPE_EMPTYIN_ID = "26120915344165";
     }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs

@@ -6,7 +6,26 @@ using System.Threading.Tasks;
 
 namespace Tnb.WarehouseMgr.Entities.Dto
 {
-    internal class OutStockStrategyQuery
+    public class OutStockStrategyQuery
     {
+
+        /// <summary>
+        /// 载具Id
+        /// </summary>
+        public string carry_id { get; set; }
+        /// <summary>
+        /// 物料Id
+        /// </summary>
+        public string material_id { get; set; }
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string code_batch { get; set; }
+        /// <summary>
+        /// 业务类型s
+        /// </summary>
+        public int BllType { get; set; }
+
+        public int Size { get; set; }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs

@@ -22,6 +22,12 @@ namespace Tnb.WarehouseMgr.Interfaces
         /// <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>

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -25,6 +25,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis;
 using NPOI.OpenXmlFormats.Wordprocessing;
 using Polly.Timeout;
+using Senparc.Weixin.Work.AdvancedAPIs.OaDataOpen;
 using Spire.Pdf.Widget;
 using SqlSugar;
 using Tnb.BasicData.Entities;
@@ -211,9 +212,10 @@ namespace Tnb.WarehouseMgr
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        public async Task<dynamic> OutStockStrategy()
+        public async Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input)
         {
-            return Task.FromResult<dynamic>(true);
+            var items = await _db.Queryable<WmsCarryH>().Where(it => it.id == input.carry_id ).ToListAsync();
+            return items.Take(input.Size).ToList();
         }
         /// <summary>
         /// 生成任务执行

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs

@@ -63,7 +63,7 @@ namespace Tnb.WarehouseMgr
 
                 VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
                 await _runService.Create(templateEntity, input);
-                //入库取终点
+                //入库取终点 //出库起点
                 var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 };
                 var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
                 WmsPointH sPoint = null;

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs

@@ -0,0 +1,141 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.Common.Extension;
+using JNPF.Common.Security;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 载具移入
+    /// </summary>
+    [OverideVisualDev(ModuleId)]
+    public class WmsCarryMoveOutStockService : BaseWareHouseService
+    {
+        private const string ModuleId = "26122102481957";
+        private readonly ISqlSugarClient _db;
+        private readonly IRunService _runService;
+        private readonly IVisualDevService _visualDevService;
+        private readonly IWareHouseService _wareHouseService;
+        private readonly IBillRullService _billRullService;
+        private readonly IUserManager _userManager;
+        public WmsCarryMoveOutStockService(
+            ISqlSugarRepository<WmsCarryH> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IWareHouseService wareHouseService,
+            IUserManager userManager,
+            IBillRullService billRullService)
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            _wareHouseService = wareHouseService;
+            _userManager = userManager;
+            _billRullService = billRullService;
+            OverideFuncs.CreateAsync = CarryMoveIn;
+        }
+
+        private async Task<dynamic> CarryMoveIn(VisualDevModelDataCrInput input)
+        {
+
+            try
+            {
+                await _db.Ado.BeginTranAsync();
+
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
+                await _runService.Create(templateEntity, input);
+                //入库取终点
+                var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
+                var carrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
+                WmsPointH sPoint = null;
+                WmsPointH ePoint = null;
+                if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
+                {
+                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
+                }
+                if (carrys?.Count > 0)
+                {
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carrys[0].location_id);
+                }
+
+                if (sPoint != null && ePoint != null)
+                {
+                    var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
+                    //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
+                    if (points?.Count > 0)
+                    {
+                        if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
+                        var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
+                        {
+                            var sPoint = it.FirstOrDefault();
+                            var ePoint = it.LastOrDefault();
+
+                            WmsPretaskH preTask = new();
+                            preTask.org_id = _userManager.User.OrganizeId;
+                            preTask.startlocation_id = sPoint?.location_id;
+                            preTask.startlocation_code = sPoint?.location_code;
+                            preTask.endlocation_id = ePoint?.location_id;
+                            preTask.endlocation_code = ePoint?.location_code;
+                            preTask.start_floor = sPoint?.floor.ToString();
+                            preTask.end_floor = ePoint?.floor.ToString();
+                            preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
+                            preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
+                            preTask.biz_type = WmsWareHouseConst.BIZTYPE_MOVEIN_ID;
+                            preTask.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID;
+                            preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
+                            preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
+                            preTask.area_id = sPoint?.area_id;
+                            preTask.area_code = it.Key;
+                            preTask.require_id = input.data["ReturnIdentity"].ToString();
+                            preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!;
+                            preTask.create_id = _userManager.UserId;
+                            preTask.create_time = DateTime.Now;
+                            return preTask;
+                        }).ToList();
+                        var isOk = await _wareHouseService.GenPreTask(preTasks);
+                        if (isOk)
+                        {
+                            var preTaskUpInput = new GenPreTaskUpInput();
+                            preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
+                            preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
+                            preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
+                            preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
+                            preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
+                            preTaskUpInput.PreTaskRecords = preTasks.Adapt<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);
+        }
+    }
+}