From e2f151957b38d3c02c26be4343b6916d65e800b7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 13:52:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IInboundOrderService.cs | 11 +++++++++--
1 files changed, 9 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 db7d5b0..edec038 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"
@@ -7,6 +7,7 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO;
using WIDESEA_DTO.Inbound;
+using WIDESEA_External.Model;
using WIDESEA_IInboundRepository;
using WIDESEA_Model.Models;
@@ -19,10 +20,16 @@
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 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(Dt_StockInfo stockInfo,Dt_InboundOrder inboundOrder, List<ERPInboundDetailModel> detailModels);
}
}
--
Gitblit v1.9.3