变更及代码优化

wangxinhui

2025-12-29 d0cc37c3c11859cc55f30624692dca55be2b8a32

 ÏîÄ¿´úÂë/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs

@@ -2,6 +2,7 @@
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.FormulaParsing.Excel.Operators;
using SqlSugar;
using System;
using System.Collections;
@@ -51,12 +52,7 @@
                    return WebResponseContent.Instance.OK($"该托盘已生成任务", _mapper.Map<WMSTaskDTO>(task));
                }

                if (Repository.QueryFirst(x => x.SourceAddress == stationCode && x.TaskStatus == TaskStatusEnum.New.ObjToInt()) != null)
                {
                    return WebResponseContent.Instance.Error($"该站点已有未执行的任务");
                }

                Dt_StockInfo stockInfo = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
                Dt_ProStockInfo stockInfo = _stockRepository.ProStockInfoRepository.QueryFirst(x => x.PalletCode == palletCode);
                if (stockInfo == null)
                {
                    return WebResponseContent.Instance.Error($"未找到组盘信息");
@@ -98,7 +94,7 @@
                _unitOfWorkManage.BeginTran();
                int taskId = BaseDal.AddData(newTask);
                newTask.TaskId = taskId;
                _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                _stockRepository.ProStockInfoRepository.UpdateData(stockInfo);
                _unitOfWorkManage.CommitTran();
                WMSTaskDTO wMSTaskDTO = _mapper.Map<WMSTaskDTO>(newTask);

@@ -216,8 +212,13 @@
                    else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.老厂.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.出库完成.ObjToInt() && stockInfoOld.IsPick==WhetherEnum.False.ObjToInt() && stationCode.IsNotEmptyOrNull())
                    {
                        decimal oldQty = stockInfoOld.StockLength;
                        //调用更新退料库存
                        stockInfoOld = ReturnStockUp(stockInfoOld, thickness);
                        //调用更新退料库存及上报重量
                        WebResponseContent returnContent = ReturnStockUp(stockInfoOld, thickness, weight);
                        if (!returnContent.Status)
                        {
                            throw new Exception(returnContent.Message);
                        }
                        stockInfoOld = returnContent.Data as Dt_StockInfo;
                        //更新数据
                        UpdateStock(stockInfoOld, weight, thickness, wide);
                        //记录库存变动
@@ -227,8 +228,13 @@
                    else if (stockInfoOld != null && stockInfoOld.MaterielInvOrgId == MaterielInvOrgEnum.老厂.ObjToInt() && stockInfoOld.StockStatus == StockStatusEmun.老厂退料暂存.ObjToInt() && stationCode.IsNotEmptyOrNull())
                    {
                        decimal oldQty = stockInfoOld.StockLength;
                        //调用更新退料库存
                        stockInfoOld = ReturnStockUp(stockInfoOld, thickness);
                        //调用更新退料库存及上报重量
                        WebResponseContent returnContent = ReturnStockUp(stockInfoOld, thickness, weight);
                        if (!returnContent.Status)
                        {
                            throw new Exception(returnContent.Message);
                        }
                        stockInfoOld = returnContent.Data as Dt_StockInfo;
                        //更新数据
                        UpdateStock(stockInfoOld, weight, thickness, wide);
                        //记录库存变动
@@ -349,32 +355,64 @@
        /// æ›´æ–°é€€æ–™åº“å­˜
        /// </summary>
        /// <returns></returns>
        public Dt_StockInfo ReturnStockUp(Dt_StockInfo stockInfoOld,decimal thickness)
        public WebResponseContent ReturnStockUp(Dt_StockInfo stockInfoOld,decimal thickness,decimal weight)
        {
            BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(stockInfoOld.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
            if (bSTResponse.Code == 500)
            WebResponseContent content = new WebResponseContent();
            try
            {
                throw new Exception($"未找到条码{stockInfoOld.PalletCode}一期ERP库存不存在");
            }
                BSTResponse<BSTStockInfoDTO> bSTResponse = _invokeERPService.BSTStockAsync(stockInfoOld.PalletCode).DeserializeObject<BSTResponse<BSTStockInfoDTO>>();
                if (bSTResponse.Code == 500)
                {
                    throw new Exception($"未找到条码{stockInfoOld.PalletCode}一期ERP库存不存在");
                }

            BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"一期ERP未返回{stockInfoOld.PalletCode}的库存信息");
            if (stockInfoOld.StockStatus == StockStatusEmun.老厂退料暂存.ObjToInt())
            {
                stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
                BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"一期ERP未返回{stockInfoOld.PalletCode}的库存信息");
                if (stockInfoOld.StockStatus == StockStatusEmun.老厂退料暂存.ObjToInt())
                {
                    stockInfoOld.IsPick = WhetherEnum.False.ObjToInt();
                }
                decimal stockLength = bSTStockInfoDTO.StockMeter;
                if (weight != bSTStockInfoDTO.Qty)
                {
                    Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterialSourceId == stockInfoOld.MaterielId);
                    int gramWeight = (int)(materielInfo.MaterielWeight * 1000);
                    BSTWeightUpDTO bSTWeightUpDTO = new BSTWeightUpDTO()
                    {
                        Paper_code = stockInfoOld.PalletCode,
                        Estimate_weight = bSTStockInfoDTO.Qty,
                        Actual_weight = weight,
                        Error_weight = Math.Abs(weight - bSTStockInfoDTO.Qty),
                        Weigh_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                        Operator = "LiKu",
                        Width = bSTStockInfoDTO.W,
                        Gram_weight = gramWeight
                    };
                    BSTResponse<object> Response = _invokeERPService.BSTWeightUp(bSTWeightUpDTO).DeserializeObject<BSTResponse<object>>();
                    if (Response.Code != 200)
                    {
                        throw new Exception($"上报称重失败");
                    }
                    stockLength = weight / bSTStockInfoDTO.W / gramWeight * 1000000;
                }
                stockInfoOld.StockStatus = StockStatusEmun.老厂退库.ObjToInt();
                stockInfoOld.MaterielThickness = bSTStockInfoDTO.Thick;
                stockInfoOld.MaterielWeight = weight;
                stockInfoOld.MaterielWide = bSTStockInfoDTO.W;
                stockInfoOld.StockLength = stockLength;
                stockInfoOld.IsFull = WhetherEnum.True.ObjToInt();
                stockInfoOld.StockOutLength = 0;
                stockInfoOld.WarehouseId = WarehouseEnum.LLDYL.ObjToInt();
                if (thickness < 400)
                {
                    throw new Exception($"RFID{stockInfoOld.RfidCode}条码{stockInfoOld.PalletCode}直径小于400mm");
                }
                content.OK("成功",data:stockInfoOld);
            }
            stockInfoOld.StockStatus = StockStatusEmun.老厂退库.ObjToInt();
            stockInfoOld.MaterielThickness = bSTStockInfoDTO.Thick;
            stockInfoOld.MaterielWeight = bSTStockInfoDTO.Qty;
            stockInfoOld.MaterielWide = bSTStockInfoDTO.W;
            stockInfoOld.StockLength = bSTStockInfoDTO.StockMeter;
            stockInfoOld.IsFull = WhetherEnum.True.ObjToInt();
            stockInfoOld.StockOutLength = 0;
            stockInfoOld.WarehouseId = WarehouseEnum.LLDYL.ObjToInt();
            if (thickness < 400)
            catch (Exception ex)
            {
                throw new Exception($"RFID{stockInfoOld.RfidCode}条码{stockInfoOld.PalletCode}直径小于400mm");
                content.Error(ex.Message);
            }
            return stockInfoOld;
            return content;
        }
        public void UpdateStock(Dt_StockInfo stockInfo, decimal weight = 0, decimal thickness = 0, decimal wide = 0)
        {
@@ -405,98 +443,200 @@
                }
                if (orderType>0) //新厂纸卷平台入库
                {
                    //获取主单
                    Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x=>x.OrderType==orderType).Includes(x=>x.Details).Where(x=>x.Details.Any(v=>v.BarCode==palletCode)).First();
                    if (inboundOrder==null)
                    InOrderTypeEnum inOrderTypeEnum = (InOrderTypeEnum)orderType;
                    if (inOrderTypeEnum== InOrderTypeEnum.PurchaseIn)
                    {
                        throw new Exception($"未找到条码{palletCode}入库单据信息");
                    }
                    Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x=>x.BarCode == palletCode);
                    if (inboundOrderDetail==null)
                    {
                        throw new Exception($"未找到入库单号为{inboundOrder.UpperOrderNo}条码{palletCode}单据信息");
                    }
                    if (inboundOrderDetail.MaterialWide < 690)
                    {
                        return content.Error("新厂物料幅宽限制为690-2700mm");
                    }
                    if (inboundOrderDetail.MaterialThick<=0)
                    {
                        return content.Error("物料直径需要大于0");
                    }
                    if (inboundOrderDetail.OrderDetailStatus != InOrderStatusEnum.未开始.ObjToInt())
                    {
                        throw new Exception($"条码{palletCode}信息已入库或入库中");
                    }
                    Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.新厂.ToString()).FirstOrDefault();
                    if (yLInboundCache == null)
                    {
                        throw new Exception("未找到原料条码缓存信息");
                    }
                    int Id = yLInboundCache.Id;
                    if (yLInboundCache.BarCode == palletCode)
                    {
                        throw new Exception($"条码{palletCode}已扫码");
                    }
                    else if (yLInboundCache.BarCode != palletCode && yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
                    {
                        yLInboundCache = _mapper.Map<Dt_YLInboundCache>(inboundOrderDetail);
                        yLInboundCache.Id = Id;
                        //获取主单
                        Dt_PurchaseOrder inboundOrder = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Includes(x => x.Details).Where(x => x.Details.Any(v => v.BarCode == palletCode)).First();

                        //获取物料
                        Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == inboundOrderDetail.MaterialCode);
                        //生成库存组盘信息
                        Dt_StockInfo stockInfo = new Dt_StockInfo()
                        if (inboundOrder == null)
                        {
                            MaterielInvOrgId = materielInfo.MaterielInvOrgId,
                            PalletCode = inboundOrderDetail.BarCode,
                            RfidCode = "",
                            LocationCode = "",
                            PalletType = 1,
                            WarehouseId = materielInfo.WarehouseId,
                            StockAttribute = materielInfo.MaterielSourceType,
                            StockStatus = StockStatusEmun.组盘暂存.ObjToInt(),
                            MaterielSpec = materielInfo.MaterielSpec,
                            Unit = materielInfo.MaterielUnit,
                            MaterielThickness = inboundOrderDetail.MaterialThick,
                            MaterielWide = inboundOrderDetail.MaterialWide,
                            MaterielWeight = inboundOrderDetail.MaterialWeight,
                            MaterielCode = materielInfo.MaterielCode,
                            MaterielName = materielInfo.MaterielName,
                            BatchNo=inboundOrderDetail.MaterialLot,
                            StockLength = inboundOrderDetail.OrderQuantity
                        };
                        if (inboundOrderDetail.MaterialWide > 1200)
                        {
                            stockInfo.PalletType = 2;
                            throw new Exception($"未找到条码{palletCode}采购入库单据信息");
                        }
                        inboundOrderDetail.OrderDetailStatus = InOrderStatusEnum.入库中.ObjToInt();
                        _unitOfWorkManage.BeginTran();
                        _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
                        //新增组盘信息
                        _stockRepository.StockInfoRepository.AddData(stockInfo);
                        if (inboundOrder.InboundOrderStatus == InOrderStatusEnum.未开始.ObjToInt())
                        Dt_PurchaseOrderDetail inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BarCode == palletCode);
                        
                        if (inboundOrderDetail == null)
                        {
                            inboundOrder.InboundOrderStatus = InOrderStatusEnum.入库中.ObjToInt();
                            _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
                            throw new Exception($"未找到入库单号为{inboundOrder.PurchaseOrderNo}条码{palletCode}单据信息");
                        }
                        _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetail);
                        //启动线体
                        WebResponseContent webResponse = YLPurchasePush();
                        if (!webResponse.Status)
                        if (inboundOrderDetail.PurchaseDetailWide < 690)
                        {
                            throw new Exception(webResponse.Message);
                            return content.Error("新厂物料幅宽限制为690-2700mm");
                        }
                        _unitOfWorkManage.CommitTran();
                        Dt_StockInfo stockInfoAdd = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
                        //记录库存变动
                        _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoAdd, 0, stockInfoAdd.StockLength, StockChangeTypeEnum.MaterielGroup);
                        return content.OK("成功", yLInboundCache);
                        if (inboundOrderDetail.PurchaseDetailThickness <= 0)
                        {
                            return content.Error("物料直径需要大于0");
                        }
                        if (inboundOrderDetail.PurchaseDetailStatus != InOrderStatusEnum.未开始.ObjToInt())
                        {
                            throw new Exception($"条码{palletCode}信息已入库或入库中");
                        }
                        Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.新厂.ToString()).FirstOrDefault();
                        if (yLInboundCache == null)
                        {
                            throw new Exception("未找到原料条码缓存信息");
                        }
                        int Id = yLInboundCache.Id;
                        if (yLInboundCache.BarCode == palletCode)
                        {
                            throw new Exception($"条码{palletCode}已扫码");
                        }
                        else if (yLInboundCache.BarCode != palletCode && yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
                        {
                            yLInboundCache = _mapper.Map<Dt_YLInboundCache>(inboundOrderDetail);
                            yLInboundCache.Id = Id;

                            //获取物料
                            Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == inboundOrderDetail.MaterialCode);
                            //生成库存组盘信息
                            Dt_StockInfo stockInfo = new Dt_StockInfo()
                            {
                                MaterielInvOrgId = materielInfo.MaterielInvOrgId,
                                PalletCode = inboundOrderDetail.BarCode,
                                RfidCode = "",
                                LocationCode = "",
                                PalletType = 1,
                                WarehouseId = materielInfo.WarehouseId,
                                StockAttribute = materielInfo.MaterielSourceType,
                                StockStatus = StockStatusEmun.组盘暂存.ObjToInt(),
                                MaterielSpec = materielInfo.MaterielSpec,
                                Unit = materielInfo.MaterielUnit,
                                MaterielThickness = inboundOrderDetail.PurchaseDetailThickness,
                                MaterielWide = inboundOrderDetail.PurchaseDetailWide,
                                MaterielWeight = inboundOrderDetail.PurchaseDetailWeight,
                                MaterielCode = materielInfo.MaterielCode,
                                MaterielName = materielInfo.MaterielName,
                                BatchNo = inboundOrderDetail.MaterialLot,
                                StockLength = inboundOrderDetail.PurchaseDetailQuantity
                            };
                            if (inboundOrderDetail.PurchaseDetailWide > 1200)
                            {
                                stockInfo.PalletType = 2;
                            }
                            inboundOrderDetail.PurchaseDetailStatus = InOrderStatusEnum.入库中.ObjToInt();
                            _unitOfWorkManage.BeginTran();
                            _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
                            //新增组盘信息
                            _stockRepository.StockInfoRepository.AddData(stockInfo);
                            if (inboundOrder.PurchaseOrderStatus == InOrderStatusEnum.未开始.ObjToInt())
                            {
                                inboundOrder.PurchaseOrderStatus = InOrderStatusEnum.入库中.ObjToInt();
                                _inboundRepository.PurchaseOrderRepository.UpdateData(inboundOrder);
                            }
                            _inboundRepository.PurchaseOrderDetailRepository.UpdateData(inboundOrderDetail);
                            //启动线体
                            WebResponseContent webResponse = YLPurchasePush();
                            if (!webResponse.Status)
                            {
                                throw new Exception(webResponse.Message);
                            }
                            _unitOfWorkManage.CommitTran();
                            Dt_StockInfo stockInfoAdd = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
                            //记录库存变动
                            _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoAdd, 0, stockInfoAdd.StockLength, StockChangeTypeEnum.MaterielGroup);
                            return content.OK("成功", yLInboundCache);
                        }
                        else
                        {
                            throw new Exception($"上卷条码{yLInboundCache.BarCode}还未进行绑定");
                        }
                    }
                    else
                    {
                        throw new Exception($"上卷条码{yLInboundCache.BarCode}还未进行绑定");
                        //获取主单
                        Dt_InboundOrder inboundOrder = BaseDal.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderType == orderType).Includes(x => x.Details).Where(x => x.Details.Any(v => v.BarCode == palletCode)).First();
                        if (inboundOrder == null)
                        {
                            throw new Exception($"未找到条码{palletCode}入库单据信息");
                        }
                        Dt_InboundOrderDetail inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BarCode == palletCode);
                        if (inboundOrderDetail == null)
                        {
                            throw new Exception($"未找到入库单号为{inboundOrder.UpperOrderNo}条码{palletCode}单据信息");
                        }
                        if (inboundOrderDetail.MaterialWide < 690)
                        {
                            return content.Error("新厂物料幅宽限制为690-2700mm");
                        }
                        if (inboundOrderDetail.MaterialThick <= 0)
                        {
                            return content.Error("物料直径需要大于0");
                        }
                        if (inboundOrderDetail.OrderDetailStatus != InOrderStatusEnum.未开始.ObjToInt())
                        {
                            throw new Exception($"条码{palletCode}信息已入库或入库中");
                        }
                        Dt_YLInboundCache? yLInboundCache = _inboundRepository.YLInboundCacheRepository.QueryData(x => x.InvOrg == MaterielInvOrgEnum.新厂.ToString()).FirstOrDefault();
                        if (yLInboundCache == null)
                        {
                            throw new Exception("未找到原料条码缓存信息");
                        }
                        int Id = yLInboundCache.Id;
                        if (yLInboundCache.BarCode == palletCode)
                        {
                            throw new Exception($"条码{palletCode}已扫码");
                        }
                        else if (yLInboundCache.BarCode != palletCode && yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
                        {
                            yLInboundCache = _mapper.Map<Dt_YLInboundCache>(inboundOrderDetail);
                            yLInboundCache.Id = Id;

                            //获取物料
                            Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterielCode == inboundOrderDetail.MaterialCode);
                            //生成库存组盘信息
                            Dt_StockInfo stockInfo = new Dt_StockInfo()
                            {
                                MaterielInvOrgId = materielInfo.MaterielInvOrgId,
                                PalletCode = inboundOrderDetail.BarCode,
                                RfidCode = "",
                                LocationCode = "",
                                PalletType = 1,
                                WarehouseId = materielInfo.WarehouseId,
                                StockAttribute = materielInfo.MaterielSourceType,
                                StockStatus = StockStatusEmun.组盘暂存.ObjToInt(),
                                MaterielSpec = materielInfo.MaterielSpec,
                                Unit = materielInfo.MaterielUnit,
                                MaterielThickness = inboundOrderDetail.MaterialThick,
                                MaterielWide = inboundOrderDetail.MaterialWide,
                                MaterielWeight = inboundOrderDetail.MaterialWeight,
                                MaterielCode = materielInfo.MaterielCode,
                                MaterielName = materielInfo.MaterielName,
                                BatchNo = inboundOrderDetail.MaterialLot,
                                StockLength = inboundOrderDetail.OrderQuantity
                            };
                            if (inboundOrderDetail.MaterialWide > 1200)
                            {
                                stockInfo.PalletType = 2;
                            }
                            inboundOrderDetail.OrderDetailStatus = InOrderStatusEnum.入库中.ObjToInt();
                            _unitOfWorkManage.BeginTran();
                            _inboundRepository.YLInboundCacheRepository.UpdateData(yLInboundCache);
                            //新增组盘信息
                            _stockRepository.StockInfoRepository.AddData(stockInfo);
                            if (inboundOrder.InboundOrderStatus == InOrderStatusEnum.未开始.ObjToInt())
                            {
                                inboundOrder.InboundOrderStatus = InOrderStatusEnum.入库中.ObjToInt();
                                _inboundRepository.InboundOrderRepository.UpdateData(inboundOrder);
                            }
                            _inboundRepository.InboundOrderDetailRepository.UpdateData(inboundOrderDetail);
                            //启动线体
                            WebResponseContent webResponse = YLPurchasePush();
                            if (!webResponse.Status)
                            {
                                throw new Exception(webResponse.Message);
                            }
                            _unitOfWorkManage.CommitTran();
                            Dt_StockInfo stockInfoAdd = _stockRepository.StockInfoRepository.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
                            //记录库存变动
                            _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfoAdd, 0, stockInfoAdd.StockLength, StockChangeTypeEnum.MaterielGroup);
                            return content.OK("成功", yLInboundCache);
                        }
                        else
                        {
                            throw new Exception($"上卷条码{yLInboundCache.BarCode}还未进行绑定");
                        }
                    }
                    
                }
                else //老厂纸卷平台入库
                {
@@ -686,7 +826,7 @@
        /// <param name="palletCode">条码号</param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public string AssignYLRoadwayNo(string palletCode)
        public string AssignYLRoadwayNo(string palletCode, int wide = 0, int thickness = 0, int weight = 0)
        {
            try
            {
@@ -704,14 +844,28 @@

                string roadwayNo = "";
                
                bool isReturn=false;

                if (stockInfo.MaterielInvOrgId==MaterielInvOrgEnum.新厂.ObjToInt())
                {
                    //限制直径
                    if (stockInfo.CheckThickness >= 300 && stockInfo.CheckThickness <= 1300 && stockInfo.MaterielWide >= 690 && stockInfo.MaterielWide <= 2700)
                    if (wide>0 && thickness>0 && weight>0)
                    {
                        stockInfo.CheckThickness = thickness;
                        stockInfo.CheckWeight = weight;
                        stockInfo.CheckWide = wide;
                        isReturn = true;
                    }
                    //限制直径
                    if (stockInfo.CheckThickness >= 300 && stockInfo.CheckThickness <= 1300 && stockInfo.MaterielWide >= 690 && stockInfo.MaterielWide <= 2500)
                    {
                        bool LayerLimit = stockInfo.CheckThickness >= 1200;
                        //获取分配
                        List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("YLDual") && (stockInfo.PalletType == LocationTypeEnum.MediumPallet.ObjToInt() ? x.LocationType == LocationTypeEnum.MediumPallet.ObjToInt(): x.LocationType == LocationTypeEnum.SmallPallet.ObjToInt())).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();

                        if (LayerLimit)
                        {
                            locationCounts = locationCounts.Where(x => x.RoadwayNo != "SC03_YLDual").ToList();
                        }
                        
                        roadwayNo = HandleRoadway(locationCounts, warehouse);
                    }
                }
@@ -720,17 +874,33 @@
                    //限制
                    if (stockInfo.CheckThickness >= 800 && stockInfo.CheckThickness <= 1500 && stockInfo.MaterielWide >= 700 && stockInfo.MaterielWide <= 2500)
                    {
                        bool LayerLimit = false;
                        if (stockInfo.CheckThickness > 1300)
                        bool LayerLimit = stockInfo.CheckThickness > 1300;
                        bool RoadwayLimit = stockInfo.MaterielWide > 2200;
                        var query = Db.Queryable<Dt_LocationInfo>()
                            .Where(x => x.WarehouseId == warehouse.WarehouseId
                                && x.LocationStatus == (int)LocationStatusEnum.Free
                                && x.EnableStatus == (int)EnableStatusEnum.Normal
                                && x.RoadwayNo.Contains("YL"))
                            .Select(x => new { x.RoadwayNo, x.Columns });

                        // æ ¹æ®æ¡ä»¶è¿‡æ»¤
                        if (LayerLimit)
                        {
                            LayerLimit = true;
                            query = query.Where(x => x.Columns >= 56 && !x.RoadwayNo.Contains("YLDual"));
                        }
                        //获取分配
                        List<LocationCount> locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() &&  x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo.Contains("YL") && !x.RoadwayNo.Contains("YLDual") && (LayerLimit ? x.Columns>=56 : x.Columns<=55)).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
                        if (stockInfo.MaterielWide > 2200)
                        if (RoadwayLimit)
                        {
                            locationCounts = Db.Queryable<Dt_LocationInfo>().Where(x => x.WarehouseId == warehouse.WarehouseId && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo == "SC02_YL" && (LayerLimit ? x.Columns >= 56 : x.Columns <= 55)).GroupBy(x => x.RoadwayNo).Select(x => new LocationCount { RoadwayNo = x.RoadwayNo, Count = SqlFunc.AggregateCount(x) }).OrderBy(x => x.RoadwayNo).ToList();
                            query = query.Where(x => !x.RoadwayNo.Contains("SC01_YL"));
                        }
                        List<LocationCount> locationCounts = query
                            .GroupBy(x => x.RoadwayNo)
                            .Select(x => new LocationCount
                            {
                                RoadwayNo = x.RoadwayNo,
                                Count = SqlFunc.AggregateCount(x)
                            })
                            .OrderBy(x => x.RoadwayNo)
                            .ToList();

                        roadwayNo = HandleRoadway(locationCounts, warehouse);
                    }
@@ -742,7 +912,12 @@
                        roadwayNo = HandleRoadway(locationCounts, warehouse);
                    }
                }
                

                if (isReturn && !string.IsNullOrEmpty(roadwayNo))
                {
                    _stockRepository.StockInfoRepository.UpdateData(stockInfo);
                }

                return !string.IsNullOrEmpty(roadwayNo) ? (roadwayNo) : throw new Exception("未找到可分配巷道");
            }
            catch (Exception ex)
@@ -784,7 +959,7 @@
                    {
                        return content.Error($"未找到对应的终点货位信息");
                    }
                    Dt_AGVStationInfo agvstation = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.AGVStationCode == task.SourceAddress && ( x.StationArea == nameof(StationAreaEnum.一楼月台码头) || x.StationArea == nameof(StationAreaEnum.一楼无纺织布) || x.StationArea == nameof(StationAreaEnum.一楼无纺淋膜) || x.StationArea == nameof(StationAreaEnum.一楼无纺淋膜)));
                    Dt_AGVStationInfo agvstation = _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.AGVStationCode == task.SourceAddress && ( x.StationArea == nameof(StationAreaEnum.一楼月台码头) || x.StationArea == nameof(StationAreaEnum.一楼无纺织布) || x.StationArea == nameof(StationAreaEnum.一楼无纺淋膜)));
                    if (agvstation != null)
                    {
                        agvstation.IsOccupied = WhetherEnum.False.ObjToInt();
@@ -841,7 +1016,7 @@
                    }
                    //获取货位信息
                    Dt_LocationInfo locationInfoEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
                    if (locationInfoEnd == null)
                    if (locationInfoEnd == null && task.TaskType!=TaskTypeEnum.WFBLMYLBackInbound.ObjToInt() && task.TaskType != TaskTypeEnum.WFBYLInbound.ObjToInt())
                    {
                        return content.Error($"未找到对应的终点货位信息");
                    }
@@ -853,14 +1028,25 @@
                        Dt_LocationInfo locationInfoStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);
                        _basicService.LocationInfoService.UpdateLocationStatus(locationInfoStart, stockInfo.PalletType, LocationStatusEnum.Free, stockInfo.WarehouseId);
                    }
                    stockInfo.LocationCode = locationInfoEnd.LocationCode;
                    if (task.TaskType != TaskTypeEnum.WFBLMYLBackInbound.ObjToInt() && task.TaskType != TaskTypeEnum.WFBYLInbound.ObjToInt())
                    {
                        stockInfo.LocationCode = locationInfoEnd.LocationCode;
                    }
                    else
                    {
                        stockInfo.LocationCode = task.TargetAddress;
                    }
                    
                    stockInfo.StockStatus = StockStatusEmun.入库完成.ObjToInt();
                    if (task.TaskType!=TaskTypeEnum.Inbound.ObjToInt())
                    {
                        stockInfo.IsFull = WhetherEnum.True.ObjToInt();
                    }
                    _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                    _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);
                    if (locationInfoEnd!=null)
                    {
                        _basicService.LocationInfoService.UpdateLocationStatus(locationInfoEnd, stockInfo.PalletType, LocationStatusEnum.InStock, stockInfo.WarehouseId);
                    }
                    BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId > 0 ? WIDESEA_Core.Enums.OperateTypeEnum.人工完成 : WIDESEA_Core.Enums.OperateTypeEnum.自动完成);
                    _unitOfWorkManage.CommitTran();
                    //记录库存变动
@@ -1264,6 +1450,10 @@
                        Quantity = inboundOrderDetail.OrderQuantity,
                        PalletType = 1
                    };
                    if (agvstation.StationArea==StationAreaEnum.二楼成品库缓存区.ToString())
                    {
                        newTask.TaskType = TaskTypeEnum.Inbound2ndFloor.ObjToInt();
                    }
                    inboundOrderDetail.OrderDetailStatus = InOrderStatusEnum.入库中.ObjToInt();
                    _unitOfWorkManage.BeginTran();
                    if (inboundOrder.InboundOrderStatus == InOrderStatusEnum.未开始.ObjToInt())
@@ -1747,5 +1937,21 @@
            }
            return content;
        }
        public Dt_AGVStationInfo? AssignWFBStation(List<string> assignPoints)
        {
            try
            {
                Dictionary<string, OrderByType> orderBy = new Dictionary<string, OrderByType>()
                {
                    { nameof(Dt_AGVStationInfo.Depth),OrderByType.Asc }
                };
                List<string> stockPoints = _stockRepository.StockInfoRepository.QueryData(x=>x.StockAttribute== MaterielTypeEnum.半成品.ObjToInt() && x.LocationCode.StartsWith("PNT")).Select(x=>x.LocationCode).ToList();
                return _basicRepository.AGVStationInfoRepository.QueryFirst(x => x.StationArea == StationAreaEnum.一楼暂存架.ToString() && x.IsOccupied == WhetherEnum.False.ObjToInt() && !stockPoints.Contains(x.AGVStationCode) && !assignPoints.Contains(x.AGVStationCode), orderBy);
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }
    }
}