修改问题

chengsc

2025-02-28 f9a9a948cd138ad0877c54319857c327c0c0c402

 Wms/WMS.BLL/Logic/AllotLocation.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Model.ModelDto.SysDto;
using SqlSugar;
@@ -7,6 +8,7 @@
using WMS.Entity.BllAsnEntity;
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
using WMS.Entity.LogEntity;
using WMS.Entity.SysEntity;

namespace WMS.BLL.Logic
@@ -16,6 +18,178 @@
    /// </summary>
    public class AllotLocation
    {


        /// <summary>
        /// 获取密集库合适的巷道（适用项目：JC34）
        /// </summary>
        /// <param name="roadways">巷道集合</param>
        /// <param name="areaList">区域集合</param>
        /// <param name="lotNo">批次号</param>
        /// <returns></returns>
        public string GetMiJiSuiTableRoad(string house, List<string> roadways, List<string> areaList, string sku, string lotNo = "")
        {

            var db = DataContext.Db;

            var dataStock = db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.WareHouseNo == house && m.SkuNo == sku);
            if (!string.IsNullOrWhiteSpace(lotNo))
            {
                dataStock = dataStock.Where(m => m.LotNo == lotNo);
            }
            //库存查找相同物料/批次的巷道
            var yiYouRoad = dataStock.GroupBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).OrderBy(m => m).ToList();
            foreach (var l in yiYouRoad)
            {
                // 判断当前巷道(组)是否有空余储位
                 
                var locateCount = db.Queryable<SysStorageLocat>().Count(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l);
                
                var bindNum = db.Queryable<LogTask>().Where(m => m.IsDel == "0" && (m.Status == "0" || m.Status == "1") && m.EndRoadway == l)
                            .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
                if (locateCount - bindNum > 0)
                {
                    return l;
                }
                
            }
            //获取库存内已有物料的巷道
            var dataStockRoad = db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.WareHouseNo == house).GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
            //排除掉已有物料的巷道
            
            roadways = roadways.Where(m => !dataStockRoad.Contains(m)).ToList();
            foreach (var l in roadways)
            {
                var bl = true;
                //判断当前巷道(组)是否有任务
                var taskList = db.Queryable<LogTask>().Where(m => m.IsDel == "0" && m.EndRoadway == l && (m.Status == "0" || m.Status == "1")).ToList();
                if (taskList.Count > 0) 
                {
                    //判断物料批次是否和当前一致
                    foreach (var item in taskList)
                    {
                        var palletBind = db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.TaskNo == item.TaskNo);
                        if (palletBind != null)
                        {
                            if (palletBind.SkuNo !=sku || palletBind.LotNo != lotNo)
                            {
                                bl = false;
                                continue;
                            }
                            
                        }
                    }
                    if (bl)
                    {
                        // 判断当前巷道(组)是否有空余储位

                        var locateCount = db.Queryable<SysStorageLocat>().Count(m => m.Status == "0" && m.Flag == "0" && areaList.Contains(m.AreaNo) && m.RoadwayNo == l);

                        var bindNum = db.Queryable<LogTask>().Where(m => m.IsDel == "0" && (m.Status == "0" || m.Status == "1") && m.EndRoadway == l)
                                    .GroupBy(m => m.PalletNo).Select(m => m.PalletNo).Count();
                        if (locateCount - bindNum > 0)
                        {
                            return l;
                        }
                    }
                }
            }
            return "";

        }

        /// <summary>
        /// 获取密集库合适的储位（适用项目：JC34）
        /// </summary>
        /// <param name="roadways">巷道集合</param>
        /// <param name="areaList">区域集合</param>
        /// <param name="lotNo">批次号</param>
        /// <returns></returns>
        public SysStorageLocat GetMiJiSuiTableLocate(SysStorageRoadway roadway, List<string> areaList, string sku, string lotNo = "")
        {

            var db = DataContext.Db;
            
            // 判断当前巷道(组)是否有空余储位
            var locateList = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == roadway.RoadwayNo && areaList.Contains(m.AreaNo)).ToList();
            if (locateList.Count(m => m.Status == "0") > 0)
            {
                var bl = GetLocateASCOrDesc(roadway.RoadwayNo);

                var locate = locateList.OrderBy(m => m.LocatNo).First();

                if (bl)
                {
                    locate = locateList.OrderByDescending(m => m.LocatNo).First();
                }
                var bl2 = MiJiLocateIsOk(locate, bl); //验证储位是否可入库方法
                if (bl2)
                {
                    return locate;
                }
            }

            
            return null;

        }

        /// <summary>
        /// 获取储位的排列顺序
        /// </summary>
        /// <param name="roadStr"></param>
        /// <returns>true：desc倒序 false：asc正序</returns>
        public bool GetLocateASCOrDesc(string roadStr)
        {
            var db = DataContext.Db;

            var locate = db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.RoadwayNo == roadStr);
            var a = locate.LocatNo.Substring(2,2);//储位列
            var b = locate.AisleOne.Substring(2, 2);//通道口列
            return int.Parse(a) < int.Parse(b);  
        }

        /// <summary>
        /// 验证储位是否可入库
        /// </summary>
        /// <param name="locate"></param>
        /// <returns></returns>
        private bool MiJiLocateIsOk(SysStorageLocat locate,bool bl)
        {
             
            var db = DataContext.Db;
            var a = int.Parse(locate.LocatNo.Substring(2, 2));//储位列
            var b = int.Parse(locate.AisleOne.Substring(2, 2));//通道口列
            var str1 = new List<string>() { "0", "3", "5" };
            var str2 = new List<string>() { "1", "2", "4" };
            var locatList1 = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == locate.RoadwayNo && m.Column < a).ToList();
            var locatList2 = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == locate.RoadwayNo && m.Column > a).ToList();
            if (bl)
            {
                if (locatList1.Count(m => str1.Contains(m.Status)) > 0)
                {
                    return false;
                }
                if (locatList2.Count(m => str2.Contains(m.Status)) > 0)
                {
                    return false;
                }
            }
            else
            {
                if (locatList1.Count(m => str2.Contains(m.Status)) > 0)
                {
                    return false;
                }
                if (locatList2.Count(m => str1.Contains(m.Status)) > 0)
                {
                    return false;
                } 
            }
            return true;
                
        }

        /// <summary>
        /// 获取合适的库位
        /// </summary>
@@ -44,7 +218,7 @@
                var dic = db.Queryable<SysDictionary>().First(m => m.Id.ToString() == house.Type);
                switch (dic.DictName)
                {
                    //是否指定巷道
                    //指定巷道
                    case "立体库" when !string.IsNullOrWhiteSpace(roadwayNo):
                        {
                            var roadwayList = new List<SysStorageRoadway>();
@@ -81,6 +255,34 @@
                            if (locate == null)
                            {
                                throw new Exception($"{houseNo}仓库已启用的巷道中没有合适的空储位");
                            }
                            return locate;
                        }
                    //指定巷道
                    case "密集库" when !string.IsNullOrWhiteSpace(roadwayNo):
                        {
                            var roadwayList = new List<SysStorageRoadway>();
                            var roadway = db.Queryable<SysStorageRoadway>().First(m => m.RoadwayNo == roadwayNo);
                            if (roadway == null)
                            {
                                throw new Exception($"未查询到{roadwayNo}巷道信息");
                            }

                            if (!roadList.Contains(roadwayNo))
                            {
                                throw new Exception("当前物料存放区域未在指定巷道中");
                            }
                            if (roadway.Status == "1")
                            {
                                throw new Exception($"{roadwayNo}巷道已停用");
                            }

                            //查询该巷道并且标志为正常的的储位
                            roadwayList.Add(roadway);
                            var locate = GetLocateByRoadways(roadwayList, areaList, true);
                            if (locate == null)
                            {
                                throw new Exception($"{roadwayNo}巷道没有合适的空储位");
                            }
                            return locate;
                        }
@@ -340,6 +542,11 @@

        }

        /// <summary>
        /// 验证储位是否可入库
        /// </summary>
        /// <param name="locate"></param>
        /// <returns></returns>
        private bool LocateIsOk(SysStorageLocat locate)
        {
            try