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_WMSServer/Controllers/Outbound/ProOutOrderController.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 53 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/ProOutOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/ProOutOrderController.cs"
index 49e980c..a5cbeba 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/ProOutOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/ProOutOrderController.cs"
@@ -21,10 +21,60 @@
/// 鎴愬搧鍑哄緟鍙戣揣鍖�(骞冲簱)+鍚屾ERP鍑哄簱
/// </summary>
/// <returns></returns>
- [HttpPost, Route("OutProductPK"), AllowAnonymous]
- public WebResponseContent OutProductPK([FromBody] string[] OutPKCodes, string ProOutNo)
+ [HttpPost, HttpGet, Route("OutProductPK"), AllowAnonymous]
+ public WebResponseContent OutProductPK([FromBody] SaveModel saveModel, string ProOutNo)
{
- return Service.OutProductPK(OutPKCodes, ProOutNo);
+ return Service.OutProductPK(saveModel, ProOutNo);
+ }
+ ///// <summary>
+ ///// 鎴愬搧鍑哄緟鍙戣揣鍖�(骞冲簱)+鍚屾ERP鍑哄簱(鏈粦瀹氬嚭搴撳崟搴撳瓨)
+ ///// </summary>
+ ///// <returns></returns>
+ //[HttpPost, Route("OutProductNoPK"), AllowAnonymous]
+ //public WebResponseContent OutProductNoPK(string[] OutPKCodes, string ProOutNo)
+ //{
+ // return Service.OutProductNoPK(OutPKCodes, ProOutNo);
+ //}
+ /// <summary>
+ /// 鏌ヨ鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ [HttpPost, HttpGet, Route("GetProOutOrders")]
+ public WebResponseContent GetProOutOrders([FromBody] SaveModel saveModel)
+ {
+ return Service.GetProOutOrders(saveModel);
+ }
+ /// <summary>
+ /// 鏌ヨ鏄庣粏
+ /// </summary>
+ [HttpPost, HttpGet, Route("GetOrderDetails")]
+ public WebResponseContent GetOrderDetails(int keyId)
+ {
+ return Service.GetOrderDetails(keyId);
+ }
+ /// <summary>
+ /// 妫�鏌�
+ /// </summary>
+ [HttpPost, HttpGet, Route("CheckCode")]
+ public WebResponseContent CheckCode(string code)
+ {
+ return WebResponseContent.Instance.OK();
+ }
+ /// <summary>
+ /// 鏌ヨERP璁㈠崟鎵ｉ櫎搴撳瓨鏁伴噺
+ /// </summary>
+ [HttpPost, HttpGet, Route("OutProErpSync")]
+ public WebResponseContent OutProErpSync(string outProOrderNo)
+ {
+ return Service.OutProErpSync(outProOrderNo);
+ }
+ /// <summary>
+ /// 鍑哄簱鍗曟壂鐮佸悓姝RP
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("OutProScanCodeSync")]
+ public async Task<WebResponseContent> OutProScanCodeSync([FromBody]SaveModel saveModel)
+ {
+ return await Service.OutProScanCodeSync(saveModel);
}
}
}
--
Gitblit v1.9.3