From c38154df95a2c2fa1bd32c45f6be9c0d98e37440 Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期二, 29 四月 2025 10:52:14 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" index a23bac9..1e4d934 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs" @@ -6,7 +6,9 @@ using WIDESEA_Core; using WIDESEA_Core.BaseServices; using WIDESEA_DTO; +using WIDESEA_DTO.ERP; using WIDESEA_DTO.Inbound; +using WIDESEA_External.Model; using WIDESEA_IInboundRepository; using WIDESEA_Model.Models; @@ -19,8 +21,35 @@ WebResponseContent GetInboundOrders(SaveModel saveModel); WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum); - WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums); + WebResponseContent InPinKu(string inboundOrderId,int warehouseId, List<string> serNums); + WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums); + WebResponseContent MaterielGroup(string palletCode, int Initiallife, int warehouseId, List<string> serNums); - WebResponseContent FeedbackInboundOrder(int id); + //WebResponseContent FeedbackInboundOrder(int id); + + WebResponseContent MaterielGroup(SaveModel saveModel); + /// <summary> + /// 鍏ュ簱瀹屾垚涓婃姤 + /// </summary> + /// <returns></returns> + WebResponseContent FeedbackInboundOrder(int inboundOrderId); + /// <summary> + /// 閫�鏂欏畬鎴愪笂鎶ヨ嚦ERP + /// </summary> + WebResponseContent FeedbackReturnOrder(Dt_InboundOrder inboundOrder,Dt_ReturnOrder returnOrder); + /// <summary> + /// 鏍规嵁浠撳簱鍜屾墭鐩樺彿鑾峰彇鎵樼洏绫诲瀷 + /// </summary> + /// <returns></returns> + int GetPalletType(Dt_Warehouse warehouse, string palletCode); + /// <summary> + /// 鍏朵粬鍏ュ簱鍗曟帴鏀�(璋冩嫈鍏ヤ粨,瀹緵鍥炴敹,鐗╂枡閿�鍞��璐�) + /// </summary> + /// <returns></returns> + WebResponseContent ReceiveWarehousingOrder(ErpInOrderDTO model); + /// <summary> + /// 鎴愬搧鍏ュ簱涓婁紶ERP + /// </summary> + WebResponseContent FeedbackProIn(Dt_MesProInOrder mesProInOrder); } } -- Gitblit v1.9.3