1

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/WmsCarryMoveOutStockService.cs

@@ -67,17 +67,17 @@ 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 OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
-                var carrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput);
+                var carry = await _db.Queryable<WmsCarryH>().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<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
                 }
-                if (carrys?.Count > 0)
+                if (carry != null)
                 {
-                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carrys[0].location_id);
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == carry.location_id);
                 }
 
                 if (sPoint != null && ePoint != null)

WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutStockService.cs

@@ -1,144 +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
-{
-    /// <summary>
-    /// 载具移入
-    /// </summary>
-    [OverideVisualDev(ModuleId)]
-    [ServiceModule(BizTypeId)]
-    public class WmsEmptyMoveOutStockService : BaseWareHouseService
-    {
-        private const string ModuleId = "26122798979365";
-        private const string BizTypeId = "26122798979365";
-        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(
-            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_EMPTYOUT_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<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);
-        }
-    }
-}