Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

pan

2025-12-01 8bc5ee69d84d190aaeecf1b17e7d939845d385e1

Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_IStockService/IStockInfoService.cs

@@ -19,5 +19,7 @@
        (List<Dt_StockInfo>, Dictionary<int, decimal>) GetOutboundStocks(List<Dt_StockInfo> stockInfos, string materielCode, decimal needQuantity, out decimal residueQuantity);

        List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode);

        List<StockSelectViewDTO> GetSelectViewDTOs(string orderNo, string materielCode);
    }
}

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundBatchPickingService.cs

@@ -2765,6 +2765,7 @@
                // SplitType = isAutoSplit ? "鑷姩鎷嗗寘" : "鎵嬪姩鎷嗗寘"
                OriginalStockQuantity = originalStockQuantity ?? stockDetail.StockQuantity,
                //RemainingStockQuantity = stockDetail.StockQuantity - splitQty
                TaskNum = lockInfo.TaskNum
            };

            await _splitPackageService.Db.Insertable(splitHistory).ExecuteCommandAsync();

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_StockService/StockInfoService.cs

@@ -1,4 +1,5 @@
锘縰sing AutoMapper;
锘縰sing Autofac.Core;
using AutoMapper;
using SqlSugar;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.StockEnum;
@@ -279,6 +280,11 @@
        //    }

        //}
        public List<StockSelectViewDTO> GetSelectViewDTOs(string orderNo,string materielCode)
        {
            var outboundOrder = SqlSugarHelper.DbWMS.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == orderNo).First();
            return GetStockSelectViews(outboundOrder.Id, materielCode);
        }

        public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
        {

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -684,7 +684,7 @@
                    }
                    else if (outboundOrder.OrderType == OutOrderTypeEnum.ReCheck.ObjToInt())
                    {

                        //涓嶇敤鍥炰紶
                    }
                    else
                    {

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs

@@ -31,5 +31,16 @@
            return Service.GetStockSelectViews(orderId, materielCode);
        }

        /// <summary>
        /// 鏌ヨ璁㈠崟绔嬪簱搴撳瓨瑙嗗浘
        /// </summary>
        /// <param name="orderId"></param>
        /// <param name="materielCode"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("GetSelectViewDTOs"), AllowAnonymous]
        public List<StockSelectViewDTO> GetSelectViewDTOs(string orderNo, string materielCode)
        {
            return Service.GetSelectViewDTOs(orderNo, materielCode);
        }
    }
}