From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期六, 20 九月 2025 15:16:56 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu --- 项目代码/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs | 84 +---------------------------------------- 1 files changed, 3 insertions(+), 81 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" index 822d536..a66209d 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" @@ -19,89 +19,11 @@ /// </summary> IOutStockLockInfoRepository Repository { get; } - /// <summary> - /// - /// </summary> - /// <param name="outboundOrder"></param> - /// <param name="outboundOrderDetail"></param> - /// <param name="outStocks"></param> - /// <param name="taskNum"></param> - /// <returns></returns> - List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, List<Dt_StockInfo> outStocks, int? taskNum = null); + List<Dt_OutStockLockInfo> GetByOrderDetailId(string orderNo,int orderDetailId, OutLockStockStatusEnum? outStockStatus); /// <summary> - /// + /// 鐢熸垚鍑哄簱璇︽儏 /// </summary> - /// <param name="outboundOrder"></param> - /// <param name="outboundOrderDetail"></param> - /// <param name="outStock"></param> - /// <param name="assignQuantity"></param> - /// <param name="taskNum"></param> - /// <returns></returns> - Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutboundOrder outboundOrder, Dt_OutboundOrderDetail outboundOrderDetail, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null); - - /// <summary> - /// PP澶у嵎鍑哄簱 - /// </summary> - /// <param name="mesOutboundOrder"></param> - /// <param name="outStock"></param> - /// <param name="assignQuantity"></param> - /// <param name="taskNum"></param> - /// <returns></returns> - Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesOutboundOrder mesOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null); - - /// <summary> - /// PP灏忓嵎鍑哄簱 - /// </summary> - /// <param name="mesOutboundOrder"></param> - /// <param name="outStock"></param> - /// <param name="assignQuantity"></param> - /// <param name="taskNum"></param> - /// <returns></returns> - List<Dt_OutStockLockInfo> GetOutStockLockInfos(Dt_MesPPCutOutboundOrder mesPPCutOutboundOrder,Dt_MesPPCutOutboundOrderDetail mesPPCutOutboundOrderDetail, List<Dt_StockInfo> outStock, int? taskNum = null); - - /// <summary> - /// - /// </summary> - /// <param name="mesOutboundOrder"></param> - /// <param name="outStock"></param> - /// <param name="assignQuantity"></param> - /// <param name="taskNum"></param> - /// <returns></returns> - Dt_OutStockLockInfo GetOutStockLockInfo(Dt_MesPPOutboundOrder mesPPOutboundOrder, Dt_StockInfo outStock, float assignQuantity, int? taskNum = null); - - /// <summary> - /// - /// </summary> - /// <param name="orderDetailId"></param> - /// <param name="outStockStatus"></param> - /// <returns></returns> - List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum? outStockStatus); - /// <summary> - /// 鏍规嵁鍑哄簱鍗曞彿鑾峰彇鍑哄簱璇︽儏 - /// </summary> - /// <param name="OrderNo"></param> - /// <returns></returns> - List<Dt_OutStockLockInfo> OutStockLockInfos(string OrderNo); - - /// <summary> - /// - /// </summary> - /// <param name="saveModel"></param> - /// <returns></returns> - List<Dt_OutStockLockInfo> GetStockOutboundOrder(SaveModel saveModel); - - /// <summary> - /// 鍒嗘嫞 - /// </summary> - /// <param name="palletCode">鎵樼洏鍙�</param> - /// <returns></returns> - WebResponseContent MaterialPick(string palletCode); - /// <summary> - /// 鑾峰彇Mes鍑哄簱璇︽儏 - /// </summary> - /// <param name="taskNo">Mes浠诲姟鍗曞彿</param> - /// <returns></returns> - List<Dt_OutStockLockInfo> GetByMesOrderDetail(string taskNo); + Dt_OutStockLockInfo GetOutStockLockInfo(Dt_OutBSTOrder outBSTOrder, Dt_OutBSTOrderDetail outboundOrderDetail, Dt_StockInfo outStock, decimal assignQuantity, int? taskNum = null); } } -- Gitblit v1.9.3