销售出库与拣货接口以及部分问题修复

WarehouseMgr/Tnb.WarehouseMgr/TaskManagerDelBase.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Tnb.BasicData.Entities;
+using Tnb.ProductionMgr.Entities;
 using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Entities.Entity;
@@ -41,6 +42,8 @@ namespace Tnb.WarehouseMgr
                     }
                     _ = await _db.Deleteable(preTask).ExecuteCommandAsync();
                     _ = await _db.Updateable<WmsElevatorH>().SetColumns(it => it.task_nums == it.task_nums - 1).Where(it => it.area_code == preTask.area_code).ExecuteCommandAsync();
+                    _ = await _db.Updateable<BasLocation>().SetColumns(it => it.task_nums == it.task_nums + 1).Where(it => preTask.endlocation_id == it.id).ExecuteCommandAsync();
+
                 }
                 await _db.Ado.CommitTranAsync();
             }

WarehouseMgr/Tnb.WarehouseMgr/TransferInstockHService.cs

@@ -0,0 +1,113 @@
+using System.Dynamic;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.Common.Extension;
+using JNPF.Common.Filter;
+using JNPF.Common.Security;
+using JNPF.FriendlyException;
+using JNPF.Systems.Entitys.Permission;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
+using JNPF.VisualDev.Interfaces;
+using Mapster;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
+using Senparc.Weixin.MP.AdvancedAPIs.Card;
+using SqlSugar;
+using Tnb.EquipMgr;
+using Tnb.EquipMgr.Entities;
+using Tnb.WarehouseMgr.Entities;
+using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Dto.Inputs;
+using Tnb.WarehouseMgr.Entities.Entity;
+using Tnb.WarehouseMgr.Entities.Enums;
+using Tnb.WarehouseMgr.Interfaces;
+using Top.Api;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 载具绑定
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERINSTOCKH_ID)]
+    public class TransferInstockHService : BaseWareHouseService
+    {
+
+        private readonly ISqlSugarClient _db;
+        private readonly IRunService _runService;
+        private readonly IVisualDevService _visualDevService;
+        private readonly IUserManager _userManager;
+        private readonly IBillRullService _billRullService;
+        public TransferInstockHService(
+            ISqlSugarRepository<WmsCarryH> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IUserManager userManager,
+            IBillRullService billRullService)
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            _userManager = userManager;
+            _billRullService = billRullService;
+            //OverideFuncs.GetListAsync = GetList;
+
+
+        }
+
+        [NonAction]
+        private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
+        {
+            try
+            {
+                SqlSugarPagedList<WmsTransferInstockH> result = await _db.Queryable<WmsTransferInstockH>()
+               .ToPagedListAsync(input.currentPage, input.pageSize);
+
+                var _data = PageResult<WmsTransferInstockH>.SqlSugarPageResult(result);
+                var json = JsonConvert.SerializeObject(_data);
+                var data = JsonConvert.DeserializeObject<dynamic>(json);
+                JArray mainTable = data.list;
+
+                ISugarQueryable<WmsTransferInstockD> wmsTransferInstockDs = _db.Queryable<WmsTransferInstockD>().Where(r => mainTable.Select(r => r["id"].ToString()).ToList().Contains(r.bill_id));
+
+                foreach (JObject wmsTransferInstockH in mainTable)
+                {
+                    wmsTransferInstockH["tablefield105"] = JArray.Parse(JsonConvert.SerializeObject(wmsTransferInstockDs.Where(r => r.bill_id == wmsTransferInstockH["id"].ToString()).ToList()));
+                }
+                return data;
+            }
+            catch(Exception ex)
+            {
+                return Task.FromResult(ex);
+            }
+        }
+
+        
+        [HttpPost, NonUnify, AllowAnonymous]
+        public async Task<dynamic> List(TransferInstockHListInput input)
+        {
+            try
+            {
+                JObject jobject = new JObject();
+                jobject["code"] = "200";
+
+                List<WmsTransferInstockD> wmsTransferInstockDs =  _db.Queryable<WmsTransferInstockD>().Where(r => r.bill_id == input.id && r.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).ToList();
+
+
+                jobject["data"] = JArray.Parse(JsonConvert.SerializeObject(wmsTransferInstockDs));
+                return await Task.FromResult(jobject);
+            }
+            catch (Exception ex)
+            {
+                return Task.FromResult(ex);
+            }
+        }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.Dynamic;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Net;
 using System.Security.Policy;
@@ -26,6 +27,7 @@ using NetTaste;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NPOI.OpenXmlFormats.Dml;
+using NPOI.SS.Formula.Functions;
 using Org.BouncyCastle.Crypto;
 using SqlSugar;
 using Tnb.BasicData.Entities;
@@ -57,6 +59,7 @@ namespace Tnb.WarehouseMgr
         private readonly IUserManager _userManager;
         private readonly ICacheManager _cacheManager;
         private readonly IElevatorControlService _elevatorControlService;
+        private readonly IWmsCarryBindService _wmsCarryBindService;
         private static readonly Dictionary<string, int> _elevatorAgvCtlStatusMap = new(StringComparer.OrdinalIgnoreCase);
         private readonly ElevatorControlConfiguration _eleCtlCfg = App.Configuration.Build<ElevatorControlConfiguration>();
         private static Dictionary<string, object> locMap = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
@@ -67,7 +70,8 @@ namespace Tnb.WarehouseMgr
 
 
         public WareHouseService(ISqlSugarRepository<WmsInstockH> repository, IDictionaryDataService dictionaryDataService, RedisData redisData,
-            IBillRullService billRullService, IUserManager userManager, ICacheManager cacheManager, IElevatorControlService elevatorControlService
+            IBillRullService billRullService, IUserManager userManager, ICacheManager cacheManager, IElevatorControlService elevatorControlService,
+            IWmsCarryBindService wmsCarryBindService
             //IConfiguration configuration
             ) : base(repository.AsSugarClient())
         {
@@ -78,6 +82,7 @@ namespace Tnb.WarehouseMgr
             _cacheManager = cacheManager;
             _elevatorControlService = elevatorControlService;
             _redisData = redisData;
+            _wmsCarryBindService = wmsCarryBindService;
             //_configuration = configuration;
 
         }
@@ -205,11 +210,76 @@ namespace Tnb.WarehouseMgr
             }
             return items.Take(input.Size).ToList();
         }
+
         /// <summary>
-        /// 出库策略
+        /// 是否为一楼出库工位
+        /// </summary>
+        /// <param name="location_id"></param>
+        /// <returns></returns>
+        public string[] GetFloor1OutstockLocation()
+        {
+            return new string[3] { WmsWareHouseConst.FinishproductOutstockStation1 , WmsWareHouseConst.FinishproductOutstockStation2
+                    , WmsWareHouseConst.FinishproductOutstockStation3 };
+        }
+
+        /// <summary>
+        /// 出库策略-销售出库下发
         /// </summary>
         /// <returns></returns>
         [HttpGet]
+        public async Task<List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>>> OutStockStrategy_saleRelease([FromQuery] OutStockStrategyQuery input)
+        {
+            Expressionable<WmsCarryH, WmsCarryCode, BasLocation> whereExprable = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
+                                             .And((a, b, c) => a.is_lock == 0 && c.is_lock == 0)
+                                             .And((a, b, c) => !string.IsNullOrEmpty(a.location_id))
+                                             .And((a, b, c) => c.is_type == ((int)EnumLocationType.存储库位).ToString())
+                                             .And((a, b, c) => a.out_status == "0")
+                                             .And((a, b, c) => c.wh_id == input.warehouse_id)
+                                             .AndIF(!string.IsNullOrEmpty(input.material_id), (a, b, c) => b.material_id == input.material_id)
+                                             .AndIF(!string.IsNullOrEmpty(input.code_batch), (a, b, c) => b.code_batch == input.code_batch)
+                                             .AndIF(!string.IsNullOrEmpty(input.material_specification), (a, b, c) => b.material_specification == input.material_specification)
+                                             .AndIF(!string.IsNullOrEmpty(input.container_no), (a, b, c) => b.container_no == input.container_no)
+                                             .AndIF(!string.IsNullOrEmpty(input.carrystd_id), (a, b, c) => a.carrystd_id == input.carrystd_id);
+            Expression<Func<WmsCarryH, WmsCarryCode, BasLocation, bool>> carryStatusFilterExp = !input.material_id.IsNullOrWhiteSpace()
+                                                                                                ? (a, b, c) => a.carry_status == ((int)EnumCarryStatus.占用).ToString()
+                                                                                                : (a, b, c) => a.carry_status == ((int)EnumCarryStatus.空闲).ToString();
+            _ = whereExprable.And(carryStatusFilterExp);
+            Expression<Func<WmsCarryH, WmsCarryCode, BasLocation, bool>> whereExpr = whereExprable.ToExpression();
+
+            SqlSugarClient cyDb = _db.CopyNew();
+
+
+
+            List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>> items = cyDb.Queryable<WmsCarryH>().LeftJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
+                                       .LeftJoin<BasLocation>((a, b, c) => a.location_id == c.id)
+                                       .Where(whereExpr)
+                                       //.OrderByIF((a,b,c)=>SqlFunc.IsNullOrEmpty())
+                                       .OrderBy("a.location_code,layers,loc_line,loc_column")
+                                       .Select((a, b, c) => new
+                                       {
+                                           WmsCarryH = a,
+                                           WmsCarryCode = b,
+                                           BasLocation = c,
+                                           codeqty = b.codeqty
+                                       }).ToList().Select(r =>
+                                       {
+                                           input.qty = input.qty - r.codeqty;
+                                           
+                                           // 出库数量与托盘上的数量不一致需要进行分拣
+                                           if (input.qty < 0)
+                                           {
+                                               r.WmsCarryCode.codeqty = input.qty + r.codeqty;
+                                               return new Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>("分拣任务", r.WmsCarryH, r.WmsCarryCode, r.BasLocation);
+                                           }
+                                           else
+                                           {
+                                               // 正常预任务出库
+                                               return new Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>("预任务", r.WmsCarryH, r.WmsCarryCode, r.BasLocation);
+                                           }
+                                       }).ToList();
+            return items;
+        }
+
         public async Task<List<WmsCarryH>> OutStockStrategy([FromQuery] OutStockStrategyQuery input)
         {
             Expressionable<WmsCarryH, WmsCarryCode, BasLocation> whereExprable = Expressionable.Create<WmsCarryH, WmsCarryCode, BasLocation>()
@@ -565,7 +635,7 @@ namespace Tnb.WarehouseMgr
                 ["Value"] = value,
             };
             string result = await HttpClientHelper.GetRequestAsync(_eleCtlCfg.WriteTagUrl, dicCommand);
-            // TODO 测试
+            // 测试
 
             //JObject valueJson = new JObject();
             //valueJson["Value"] = value;
@@ -1610,6 +1680,30 @@ namespace Tnb.WarehouseMgr
                     */                    //更新业务主表的单据状态
                     foreach (WmsDistaskH? dt in disTasks)
                     {
+                        // 销售出库
+                        if (dt.biz_type == WmsWareHouseConst.BIZTYPE_WMSSALERELEASE_ID)
+                        {
+                            // TODO 一楼工位放货完成后更新出库明细的实际出库数量
+                            if (dt.start_floor == 1 && dt.end_floor == 1)
+                            {
+                                WmsCarryCode wmsCarryCode = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == dt.carry_id).FirstAsync();
+                                await _db.Updateable<WmsSaleD>().SetColumns(r => r.purchase_prqty == r.purchase_prqty + wmsCarryCode.codeqty).Where(r => r.id == dt.require_id).ExecuteCommandAsync();
+
+                                CarryCodeUnbindInput carryCodeUnbindInput = new CarryCodeUnbindInput();
+                                carryCodeUnbindInput.carry_id = dt.carry_id;
+                                await _wmsCarryBindService.CarryCodeUnbind(carryCodeUnbindInput);
+                            }
+                        }
+                        else if (dt.biz_type == WmsWareHouseConst.BIZTYPE_WMSTRANSFERINSTOCK_ID)
+                        {
+                            if (dt.start_floor == 3 && dt.end_floor == 3)
+                            {
+                                WmsCarryCode wmsCarryCode = await _db.Queryable<WmsCarryCode>().Where(r => r.carry_id == dt.carry_id).FirstAsync();
+                                await _db.Updateable<WmsTransferInstockD>().SetColumns(r => r.qty == r.qty + wmsCarryCode.codeqty).Where(r => r.id == dt.require_id).ExecuteCommandAsync();
+                            }
+                        }
+
+
                         List<WmsDistaskCode> disTaskCodes = await _db.Queryable<WmsDistaskCode>().Where(it => it.bill_id == dt.id).ToListAsync();
                         WareHouseUpInput upInput = new() { bizTypeId = dt.biz_type, requireId = dt.require_id!, distaskCodes = disTaskCodes, carryIds = disTasks.Select(x => x.carry_id).ToList() };
 
@@ -1712,6 +1806,10 @@ namespace Tnb.WarehouseMgr
                 row = await _db.Updateable<WmsElevatorH>().SetColumns(it => it.task_nums == it.task_nums + 1).Where(it => it.area_code == eleP.area_code).ExecuteCommandAsync();
             }
 
+            // 累加终点库位任务数
+            row = await _db.Updateable<BasLocation>().SetColumns(it => it.task_nums == it.task_nums + 1)
+                .Where(it => preTasks.Select(r => r.endlocation_id).Contains(it.id)).ExecuteCommandAsync();
+
             return row > 0;
         }
         /// <summary>

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs

@@ -47,8 +47,10 @@ namespace Tnb.WarehouseMgr
             _userManager = userManager;
             _billRullService = billRullService;
             OverideFuncs.CreateAsync = CarryBind;
-             
+
+
         }
+
         [NonAction]
         public async Task<dynamic> CarryBind(VisualDevModelDataCrInput input)
         {
@@ -264,7 +266,49 @@ namespace Tnb.WarehouseMgr
             }
             return Task.FromResult(true);
         }
-        
+
+        /// <summary>
+        /// 二楼机械手解绑定
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException"></exception>
+        /// <exception cref="AppFriendlyException"></exception>
+        [NonAction]
+        public async Task<dynamic> CarryCodeUnbind(CarryCodeUnbindInput input)
+        {
+            bool isOk = false;
+            try
+            {
+                if (input == null)
+                {
+                    throw new ArgumentNullException(nameof(input));
+                }
+
+                WmsCarryH? carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carry_id);
+                if (carry != null)
+                {
+                    int row = await _db.Deleteable<WmsCarryCode>().Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
+                    isOk = row > 0;
+
+                    if (!isOk)
+                    {
+                        throw Oops.Oh(ErrorCode.COM1001);
+                    }
+                }
+                else
+                {
+                    if (carry == null)
+                    {
+                        throw new AppFriendlyException("没有可用的主载具", 500);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+            return Task.FromResult(true);
+        }
         /*   public override async Task ModifyAsync(WareHouseUpInput input)
            {
                if (input == null) throw new ArgumentNullException(nameof(input));

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs

@@ -15,6 +15,7 @@ using Tnb.BasicData.Entities;
 using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Consts;
 using Tnb.WarehouseMgr.Entities.Dto;
+using Tnb.WarehouseMgr.Entities.Entity;
 using Tnb.WarehouseMgr.Entities.Enums;
 using Tnb.WarehouseMgr.Interfaces;
 
@@ -151,35 +152,56 @@ namespace Tnb.WarehouseMgr
         {
             try
             {
-                if (string.IsNullOrEmpty(input.carry_id))
+                if (string.IsNullOrEmpty(input.carry_code))
                 {
-                    throw new AppFriendlyException("载具id不可为空", 500);
+                    throw new AppFriendlyException("载具编号不可为空", 500);
                 }
                 if (string.IsNullOrEmpty(input.material_id))
                 {
-                    throw new AppFriendlyException("物料不可为空", 500);
+                    throw new AppFriendlyException("物料id不可为空", 500);
                 }
                 if (input.qty <= 0)
                 {
                     throw new AppFriendlyException("数量必须大于0", 500);
                 }
+                if (string.IsNullOrEmpty(input.source_id))
+                {
+                    throw new AppFriendlyException("成品调拨明细id不可为空", 500);
+                }
                 if (string.IsNullOrEmpty(input.startlocation_id))
                 {
                     throw new AppFriendlyException("起点不可为空", 500);
                 }
 
+                WmsTransferInstockD wmsTransferInstockD = await _db.Queryable<WmsTransferInstockD>().Where(r => r.id == input.source_id).FirstAsync();
+                if (wmsTransferInstockD.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID)
+                {
+                    throw new AppFriendlyException("此成品调拨任务已完成，不允许重复提交", 500);
+                }
                 await s_taskExecuteSemaphore.WaitAsync();
                 await _db.Ado.BeginTranAsync();
                 //入库取终点 //出库起点
                 InStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID, Size = 1 };
                 List<BasLocation> endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
+                if (endLocations.Count == 0)
+                {
+                    throw new AppFriendlyException("没有可用的入库库位", 500);
+                }
                 WmsPointH sPoint = null!;
                 WmsPointH ePoint = null!;
              
                 sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.startlocation_id);
                 if (endLocations?.Count > 0)
                 {
-                    WmsCarryH carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == input.carry_id);
+                    WmsCarryH carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code);
+                    if (carry.carry_status == "1")
+                    {
+                        throw new AppFriendlyException("载具已占用！", 500);
+                    }
+                    if (carry.is_lock == 1)
+                    {
+                        throw new AppFriendlyException("载具已锁定！", 500);
+                    }
                     BasLocation loc = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == endLocations[0].id);
                     bool isMatch = await IsCarryAndLocationMatchByCarryStd(carry, loc);
                     if (!isMatch)
@@ -220,7 +242,7 @@ namespace Tnb.WarehouseMgr
                         points.Add(ePoint);
                     }
 
-                    WmsCarryH wmsCarryH = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.id == input.carry_id);
+                    WmsCarryH wmsCarryH = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.carry_code == input.carry_code);
                     //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
                     if (points?.Count > 0)
                     {
@@ -244,14 +266,14 @@ namespace Tnb.WarehouseMgr
                                 endpoint_code = ePoint?.point_code!,
                                 bill_code = _billRullService!.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
                                 status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
-                                biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID,
+                                biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFERINSTOCK_ID,
                                 task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID
                             };
-                            preTask.carry_id = input.carry_id;
+                            preTask.carry_id = wmsCarryH.id;
                             preTask.carry_code = wmsCarryH.carry_code;
                             preTask.area_id = sPoint?.area_id!;
                             preTask.area_code = it.Key;
-                            preTask.require_id = "";
+                            preTask.require_id = input.source_id;
                             preTask.require_code = "";
                             preTask.create_id = _userManager.UserId;
                             preTask.create_time = DateTime.Now;
@@ -272,7 +294,7 @@ namespace Tnb.WarehouseMgr
                                         is_lock = 1,
                                         location_id = input.startlocation_id,
                                         location_code = location.location_code
-                                    }).Where(it => it.id == input.carry_id).ExecuteCommandAsync();
+                                    }).Where(it => it.id == wmsCarryH.id).ExecuteCommandAsync();
                                 }
 
                                 //所有库位加锁
@@ -281,7 +303,7 @@ namespace Tnb.WarehouseMgr
 
                                 BasMaterial basMaterial = await _db.Queryable<BasMaterial>().FirstAsync(it => it.id == input.material_id);
                                 WmsCarryCode wmsCarryCode = new WmsCarryCode();
-                                wmsCarryCode.carry_id = input.carry_id;
+                                wmsCarryCode.carry_id = wmsCarryH.id;
                                 wmsCarryCode.barcode = wmsCarryH.carry_code;
                                 wmsCarryCode.codeqty = input.qty;
                                 wmsCarryCode.material_id = input.material_id;
@@ -289,16 +311,34 @@ namespace Tnb.WarehouseMgr
                                 wmsCarryCode.material_name = basMaterial.name;
                                 wmsCarryCode.location_id = endLocations[0].id;
                                 wmsCarryCode.location_code = endLocations[0].location_code;
+                                wmsCarryCode.code_batch = wmsTransferInstockD.pi_code;
                                 _ = await _db.Insertable<WmsCarryCode>(wmsCarryCode).ExecuteCommandAsync();
                             }
                         }
                     }
 
                 }
+                // 更新成品调拨入库单子表已下发数量
+                await _db.Updateable<WmsTransferInstockD>().SetColumns(r => r.xf_qty == r.xf_qty + input.qty).Where(r => r.id == input.source_id).ExecuteCommandAsync();
+
+                // 已下发数量达到需求数量回写已完成
+                wmsTransferInstockD = await _db.Queryable<WmsTransferInstockD>().Where(r => r.id == input.source_id).FirstAsync();
+                if (wmsTransferInstockD.xf_qty == wmsTransferInstockD.pr_qty)
+                {
+                    await _db.Updateable<WmsTransferInstockD>().SetColumns(r => r.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).Where(r => r.id == input.source_id).ExecuteCommandAsync();
+                }
+
+                // 入库明细都完成 回写主表完成状态
+                List<WmsTransferInstockD> wmsTransferInstockDs =_db.Queryable<WmsTransferInstockD>().InnerJoin<WmsTransferInstockD>((a, b) => a.bill_id == b.bill_id).Where((a, b) => a.id == input.source_id)
+                    .Where((a, b) => b.status != WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).ToList();
+                if (wmsTransferInstockDs.Count == 0)
+                {
+                    await _db.Updateable<WmsTransferInstockH>().SetColumns(r =>r.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID).Where(r => r.id == wmsTransferInstockD.bill_id).ExecuteCommandAsync();
+                }
 
                 await _db.Ado.CommitTranAsync();
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 await _db.Ado.RollbackTranAsync();
                 throw;
@@ -325,8 +365,7 @@ namespace Tnb.WarehouseMgr
                 throw new AppFriendlyException("起点id不可为空", 500);
             }
 
-            if (input.location_id != WmsWareHouseConst.FinishproductOutstockStation1 && input.location_id != WmsWareHouseConst.FinishproductOutstockStation2 
-                && input.location_id != WmsWareHouseConst.FinishproductOutstockStation3)
+            if (!_wareHouseService.GetFloor1OutstockLocation().Contains(input.location_id))
             {
                 throw new AppFriendlyException("非一楼出库库位不允许通过此功能解锁", 500);
             }
@@ -356,40 +395,6 @@ namespace Tnb.WarehouseMgr
             return await ToApiResult(HttpStatusCode.OK, "成功");
         }
 
-        /// <summary>
-        /// 3楼到1楼出库 盘点签收 解锁一楼库位
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        [HttpPost, NonUnify, AllowAnonymous]
-        public async Task<Tnb.WarehouseMgr.Entities.Dto.Outputs.Result> FinishproductOutstockSort(FinishproductOutstockSortInput input)
-        {
-            if (string.IsNullOrEmpty(input.carry_id))
-            {
-                throw new AppFriendlyException("载具id不可为空", 500);
-            }
-            if (input.qty <= 0)
-            {
-                throw new AppFriendlyException("数量必须大于0", 500);
-            }
-
-            await _db.Ado.BeginTranAsync();
-            try
-            {
-                await _db.Updateable<WmsCarryCode>().SetColumns(r => new WmsCarryCode
-                {
-                    codeqty = input.qty,
-                }).Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
-
-                await _db.Ado.CommitTranAsync();
-            }
-            catch (Exception ex)
-            {
-                await _db.Ado.RollbackTranAsync();
-                throw;
-            }
-
-            return await ToApiResult(HttpStatusCode.OK, "成功");
-        }
+        
     }
 }

WarehouseMgr/Tnb.WarehouseMgr/WmsSaleReleaseService.cs

@@ -0,0 +1,388 @@
+using System.Security.Cryptography.X509Certificates;
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.Common.Extension;
+using JNPF.Common.Security;
+using JNPF.EventBus;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis;
+using NPOI.HSSF.Record;
+using NPOI.SS.Formula;
+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.Dto.Inputs;
+using Tnb.WarehouseMgr.Entities.Entity;
+using Tnb.WarehouseMgr.Entities.Enums;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 销售出库服务
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSSALERELEASE_ID)]
+    [ServiceModule(BizTypeId)]
+    public class WmsSaleReleaseService : BaseWareHouseService, IPdaStroage
+    {
+        private const string BizTypeId = "25104446664213";
+        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;
+        private readonly IWmsCarryBindService _wmsCarryBindService;
+        public WmsSaleReleaseService(
+            ISqlSugarRepository<WmsDelivery> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IBasLocationService basLocationService,
+            IBillRullService billRullService,
+            IWareHouseService wareHouseService,
+            IUserManager userManager,
+            IEventPublisher eventPublisher,
+            IWmsCarryBindService wmsCarryBindService
+            )
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            _basLocationService = basLocationService;
+            _billRullService = billRullService;
+            _wareHouseService = wareHouseService;
+            _userManager = userManager;
+            _wmsCarryBindService = wmsCarryBindService;
+
+            OverideFuncs.GetDetailsAsync = GetDetailsAsync;
+            //OverideFuncs.CreateAsync = Create;
+        }
+
+
+
+        [NonAction]
+        private async Task<dynamic> GetDetailsAsync(string id)
+        {
+            try
+            {
+                return await Task.FromResult(_db.Queryable<WmsSaleD>().Where(r => r.bill_id == id).ToList());
+            }
+            catch (Exception ex)
+            {
+                return Task.FromResult(ex);
+            }
+        }
+
+
+        /// <summary>
+        /// 根据载具编号获取起始库位点
+        /// </summary>
+        /// <param name="carryId"></param>
+        /// <returns></returns>
+        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
+                                        {
+                                            a.carry_code,
+                                            b.location_code,
+                                        })
+                                        .ToListAsync();
+            return items;
+        }
+
+        private async Task<dynamic> Create(VisualDevModelDataCrInput input)
+        {
+            return await Task.FromResult(true);
+        }
+        public override async Task ModifyAsync(WareHouseUpInput input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            int row = await _db.Updateable<WmsDelivery>().SetColumns(it => new WmsDelivery { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
+            if (row < 1)
+            {
+                throw Oops.Oh(ErrorCode.COM1001);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 下发
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        /// <exception cref="AppFriendlyException"></exception>
+        [HttpPost, NonUnify, AllowAnonymous]
+        public async Task<Tnb.WarehouseMgr.Entities.Dto.Outputs.Result> Distribute(SaleReleaseDistributeInput input)
+        {
+            try
+            {
+                if (input.qty <= 0)
+                {
+                    throw new AppFriendlyException("数量必须大于0", 500);
+                }
+                if (string.IsNullOrEmpty(input.source_id))
+                {
+                    throw new AppFriendlyException("来源单据id不可为空", 500);
+                }
+
+                WmsSaleD wmsOutstockD = await _db.Queryable<WmsSaleD>().FirstAsync(it => it.id == input.source_id);
+                await s_taskExecuteSemaphore.WaitAsync();
+                await _db.Ado.BeginTranAsync();
+                //入库取终点 //出库起点
+                OutStockStrategyQuery inStockStrategyInput = new() { warehouse_id = WmsWareHouseConst.WAREHOUSE_CP_ID, material_id = wmsOutstockD.material_id, qty = input.qty, code_batch = wmsOutstockD.code_batch }; 
+                List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>> items = await _wareHouseService.OutStockStrategy_saleRelease(inStockStrategyInput);
+
+                decimal canOutstockQty = items.Sum(r => r.Item3.codeqty).ParseToDecimal();
+                if (canOutstockQty < input.qty)
+                {
+                    throw new AppFriendlyException($@"当前可出库数量只有 {canOutstockQty}", 500);
+                }
+
+                List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>> items_sorttask = items.Where(r => r.Item1 == "分拣任务").ToList();
+                List<Tuple<string, WmsCarryH, WmsCarryCode, BasLocation>> items_pretask = items.Where(r => r.Item1 == "预任务").ToList();
+
+                // 预任务逻辑
+                foreach (Tuple<string, WmsCarryH, WmsCarryCode, BasLocation> item in items_pretask)
+                {
+                    WmsCarryH carry = item.Item2;
+                    WmsCarryCode carryCode = item.Item3;
+                    BasLocation startLocation = item.Item4;
+                    // 根据一楼工位任务数平均分配任务 确定一楼工位
+                    BasLocation endLocation = await _db.Queryable<BasLocation>().Where(r => _wareHouseService.GetFloor1OutstockLocation().Contains(r.id)).OrderBy("is_lock, task_nums, location_code").FirstAsync();
+
+                    WmsPointH sPoint = null!;
+                    WmsPointH ePoint = null!;
+
+                    sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == startLocation.id);
+
+                    bool isMatch = await IsCarryAndLocationMatchByCarryStd(carry, endLocation);
+                    if (!isMatch)
+                    {
+                        throw new AppFriendlyException("库位与载具规格不匹配", 500);
+                    }
+
+                    ePoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == endLocation.id);
+
+                    if (ePoint != null)
+                    {
+                    }
+                    else
+                    {
+                        throw new AppFriendlyException($"库位{endLocation.location_code}未在点位表中维护对应点位", 500);
+                    }
+
+
+                    string endLocationId = endLocation.id;
+
+                    // 在线开发
+                    //VisualDevEntity? templateEntity = await _visualDevService?.GetInfoById(ModuleConsts.MODULE_WMSDELIVERYPDA_ID, true)!;
+                    //await _runService.Create(templateEntity, input);
+
+                    // 计算路径，插入预任务申请
+
+                    if (sPoint != null && ePoint != null)
+                    {
+                        List<WmsPointH> points = new List<WmsPointH>();
+                        if (sPoint.area_code != ePoint.area_code)
+                        {
+                            points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
+                            if (points.Count <= 2)
+                            {
+                                throw new AppFriendlyException("该路径不存在", 500);
+                            }
+                        }
+                        else
+                        {
+                            points.Add(sPoint);
+                            points.Add(ePoint);
+                        }
+
+                        //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
+                        if (points?.Count > 0)
+                        {
+                            List<WmsPretaskH> preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
+                            {
+                                WmsPointH? sPoint = it.FirstOrDefault();
+                                WmsPointH? ePoint = it.LastOrDefault();
+
+                                WmsPretaskH preTask = new()
+                                {
+                                    org_id = _userManager!.User.OrganizeId,
+                                    startlocation_id = sPoint?.location_id!,
+                                    startlocation_code = sPoint?.location_code!,
+                                    endlocation_id = ePoint?.location_id!,
+                                    endlocation_code = ePoint?.location_code!,
+                                    start_floor = sPoint?.floor.ToString(),
+                                    end_floor = ePoint?.floor.ToString(),
+                                    startpoint_id = sPoint?.id!,
+                                    startpoint_code = sPoint?.point_code!,
+                                    endpoint_id = ePoint?.id!,
+                                    endpoint_code = ePoint?.point_code!,
+                                    bill_code = _billRullService!.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(),
+                                    status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID,
+                                    biz_type = WmsWareHouseConst.BIZTYPE_WMSSALERELEASE_ID,
+                                    task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID
+                                };
+                                preTask.carry_id = carry.id;
+                                preTask.carry_code = carry.carry_code;
+                                preTask.area_id = sPoint?.area_id!;
+                                preTask.area_code = it.Key;
+                                preTask.require_id = input.source_id;
+                                preTask.require_code = "";
+                                preTask.create_id = _userManager.UserId;
+                                preTask.create_time = DateTime.Now;
+                                return preTask;
+                            }).ToList();
+                            bool isOk = await _wareHouseService.GenPreTask(preTasks, null!);
+                            if (isOk)
+                            {
+                                if (endLocationId != null)
+                                {
+                                    //查询库位表
+                                    BasLocation location = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == startLocation.id);
+                                    {
+                                        //载具加锁，增加库位信息
+                                        _ = await _db.Updateable<WmsCarryH>().SetColumns(it => new WmsCarryH
+                                        {
+                                            carry_status = ((int)EnumCarryStatus.占用).ToString(),
+                                            is_lock = 1,
+                                            location_id = startLocation.id,
+                                            location_code = location.location_code
+                                        }).Where(it => it.id == carry.id).ExecuteCommandAsync();
+                                    }
+
+                                    //所有库位加锁
+                                    string?[] ids = new[] { startLocation.id, endLocationId };
+                                    _ = await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_lock = 1 }).Where(it => ids.Contains(it.id)).ExecuteCommandAsync();
+
+                                }
+                            }
+                        }
+
+                    }
+                }
+
+                // 分拣任务逻辑
+                foreach (Tuple<string, WmsCarryH, WmsCarryCode, BasLocation> item in items_sorttask)
+                {
+                    WmsCarryH carry = item.Item2;
+                    WmsCarryCode carryCode = item.Item3;
+                    BasLocation startLocation = item.Item4;
+
+                    // 锁定分拣载具
+                    await _db.Updateable<WmsCarryH>().SetColumns(r => r.is_lock == 1).Where(r => r.id == carry.id).ExecuteCommandAsync();
+
+                    Dictionary<string, object> dic = new()
+                    {
+                        [nameof(WmsSortingtask.id)] = SnowflakeIdHelper.NextId(),
+                        [nameof(WmsSortingtask.bill_code)] = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_SORTINGTASK_ENCODE),
+                        [nameof(WmsSortingtask.org_id)] = input.org_id ?? _userManager.User.OrganizeId,
+                        [nameof(WmsSortingtask.qty)] = carryCode.codeqty,
+                        [nameof(WmsSortingtask.carry_id)] = carry.id,
+                        [nameof(WmsSortingtask.carry_code)] = carry.carry_code,
+                        [nameof(WmsSortingtask.status)] = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID,
+                        [nameof(WmsSortingtask.location_id)] = startLocation.id,
+                        [nameof(WmsSortingtask.location_code)] = startLocation.location_code,
+                        [nameof(WmsSortingtask.create_id)] = input.create_id ?? _userManager.UserId,
+                        [nameof(WmsSortingtask.create_time)] = DateTime.Now,
+                        [nameof(WmsSortingtask.source_id)] = input.source_id
+                    };
+
+                    VisualDevModelDataCrInput visualDevModelDataCrInput = new()
+                    {
+                        data = dic
+                    };
+
+                    //在线开发
+                    VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSSORTINGTASK_ID, false);
+                    await _runService.Create(templateEntity, visualDevModelDataCrInput);
+                }
+
+                // 更新销售出库单子表已下发数量
+                await _db.Updateable<WmsSaleD>().SetColumns(r => r.purchase_arriveqty == r.purchase_arriveqty + input.qty).Where(r => r.id == input.source_id).ExecuteCommandAsync();
+
+                await _db.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {
+                await _db.Ado.RollbackTranAsync();
+                throw;
+            }
+            finally
+            {
+                _ = s_taskExecuteSemaphore.Release();
+                await InvokeGenPretaskExcute();
+            }
+
+            return await ToApiResult(HttpStatusCode.OK, "成功");
+        }
+
+        /// <summary>
+        /// 分拣
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost, NonUnify, AllowAnonymous]
+        public async Task<Tnb.WarehouseMgr.Entities.Dto.Outputs.Result> Sort(FinishproductOutstockSortInput input)
+        {
+            if (string.IsNullOrEmpty(input.source_id))
+            {
+                throw new AppFriendlyException("分拣任务id不能为空", 500);
+            }
+
+            await _db.Ado.BeginTranAsync();
+            try
+            {
+                WmsSortingtask wmsSortingtask = await _db.Queryable<WmsSortingtask>().Where(r => r.id == input.source_id).FirstAsync();
+                if (wmsSortingtask.status == WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID)
+                {
+                    throw new AppFriendlyException("此分拣任务已完成，不允许重复提交", 500);
+                }
+                // 解锁分拣载具
+                await _db.Updateable<WmsCarryH>().SetColumns(r => r.is_lock == 0).Where(r => r.id == wmsSortingtask.carry_id).ExecuteCommandAsync();
+                // 扣减载具物料库存
+                await _db.Updateable<WmsCarryCode>().SetColumns(r => r.codeqty == r.codeqty - wmsSortingtask.qty).Where(r => r.carry_id == wmsSortingtask.carry_id).ExecuteCommandAsync();
+
+                await _db.Updateable<WmsSortingtask>().SetColumns(r => new WmsSortingtask
+                {
+                    status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID,
+                    complete_time = DateTime.Now
+                }).Where(r => r.id == wmsSortingtask.id).ExecuteCommandAsync();
+                // 改为销售出库单
+                await _db.Updateable<WmsSaleD>().SetColumns(r => r.purchase_prqty == r.purchase_prqty + wmsSortingtask.qty).Where(r => r.id == wmsSortingtask.source_id).ExecuteCommandAsync();
+                //await _db.Updateable<WmsCarryCode>().SetColumns(r => new WmsCarryCode
+                //{
+                //    codeqty = input.qty,
+                //}).Where(r => r.carry_id == input.carry_id).ExecuteCommandAsync();
+
+                await _db.Ado.CommitTranAsync();
+            }
+            catch (Exception ex)
+            {
+                await _db.Ado.RollbackTranAsync();
+                throw;
+            }
+
+            return await ToApiResult(HttpStatusCode.OK, "成功");
+        }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsSortingtaskService.cs

@@ -0,0 +1,93 @@
+using JNPF.Common.Core.Manager;
+using JNPF.Common.Dtos.VisualDev;
+using JNPF.Common.Enums;
+using JNPF.Common.Extension;
+using JNPF.EventBus;
+using JNPF.FriendlyException;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using JNPF.VisualDev.Entitys;
+using JNPF.VisualDev.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+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.Dto.Inputs;
+using Tnb.WarehouseMgr.Entities.Enums;
+using Tnb.WarehouseMgr.Interfaces;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 销售出库服务
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSSORTINGTASK_ID)]
+    [ServiceModule(BizTypeId)]
+    public class WmsSortingtaskService : BaseWareHouseService, IPdaStroage
+    {
+        private const string BizTypeId = "34088685351445";
+        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;
+        private readonly IWmsCarryBindService _wmsCarryBindService;
+        public WmsSortingtaskService(
+            ISqlSugarRepository<WmsDelivery> repository,
+            IRunService runService,
+            IVisualDevService visualDevService,
+            IBasLocationService basLocationService,
+            IBillRullService billRullService,
+            IWareHouseService wareHouseService,
+            IUserManager userManager,
+            IEventPublisher eventPublisher
+            )
+        {
+            _db = repository.AsSugarClient();
+            _runService = runService;
+            _visualDevService = visualDevService;
+            _basLocationService = basLocationService;
+            _billRullService = billRullService;
+            _wareHouseService = wareHouseService;
+            _userManager = userManager;
+
+            OverideFuncs.CreateAsync = Create;
+        }
+
+        private async Task<dynamic> Create(VisualDevModelDataCrInput input)
+        {   
+            //在线开发
+            try
+            {
+                VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSSORTINGTASK_ID, true);
+                await _runService.Create(templateEntity, input);
+            }
+            catch (Exception)
+            {
+                throw;
+            }
+            return Task.FromResult(1);
+        }
+        public override async Task ModifyAsync(WareHouseUpInput input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            int row = await _db.Updateable<WmsDelivery>().SetColumns(it => new WmsDelivery { status = WmsWareHouseConst.BILLSTATUS_COMPLETE_ID }).Where(it => it.id == input.requireId).ExecuteCommandAsync();
+            if (row < 1)
+            {
+                throw Oops.Oh(ErrorCode.COM1001);
+            }
+        }
+
+    }
+}