From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 bc3971c..1dff918 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,6 +6,7 @@
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;
@@ -21,23 +22,36 @@
WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum);
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 MaterielGroup(SaveModel saveModel);
+
+ WebResponseContent MaterielPPorGM(string materielBoxCode="");
/// <summary>
/// 鍏ュ簱瀹屾垚涓婃姤
/// </summary>
/// <returns></returns>
- WebResponseContent FeedbackInboundOrder(Dt_InboundOrder inboundOrder);
+ WebResponseContent FeedbackInboundOrder(int inboundOrderId);
/// <summary>
- ///
+ /// 閫�鏂欏畬鎴愪笂鎶ヨ嚦ERP
/// </summary>
- /// <param name="warehouse"></param>
- /// <param name="palletCode"></param>
- /// <param name="materielInfo"></param>
+ 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