From 95e39ae7aecd6e1016c71cf5ae70a680d8f569bb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 29 四月 2025 10:48:30 +0800
Subject: [PATCH] 上传最新代码
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 1438bd1..6702606 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -129,9 +129,9 @@
/// </summary>
/// <returns></returns>
[HttpPost, Route("ProductDeliveryOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ProductDeliveryOrder([FromBody] Root<ErpProOutOrderDTO> erpProOutOrder)
+ public async Task<ErpResponseContent> ProductDeliveryOrder([FromBody] Root<ErpProOutOrderDTO> erpProOutOrder)
{
- WebResponseContent content = _outboundService.ProOutOrderService.ProductDeliveryOrder(erpProOutOrder.Content);
+ var content = await _outboundService.ProOutOrderService.ProductDeliveryOrder(erpProOutOrder.Content);
if (content.Status) return Instance.OK();
else return Instance.Error(content.Message);
}
@@ -143,7 +143,9 @@
[HttpPost, Route("ProductWarehousingOrder"), AllowAnonymous, MethodParamsValidate]
public ErpResponseContent ProductWarehousingOrder([FromBody] Root<ErpProductWarehousingOrderDTO> root)
{
- return Instance.OK();
+ WebResponseContent content = _inboundService.ErpProInOrderService.ProductWarehousingOrder(root.Content);
+ if (content.Status) return Instance.OK();
+ else return Instance.Error(content.Message);
}
/// <summary>
/// 鎴愬搧璋冩嫧鍑猴紙鐮斿彂锛�
@@ -151,9 +153,11 @@
/// <param name="root"></param>
/// <returns></returns>
[HttpPost, Route("ProductTransferOrder"), AllowAnonymous, MethodParamsValidate]
- public ErpResponseContent ProductTransferOrder([FromBody] Root<ErpProductTransferOrder> root)
+ public ErpResponseContent ProductTransferOrder([FromBody] Root<ErpProductTransferOrderDTO> root)
{
- return Instance.OK();
+ WebResponseContent content = _outboundService.ErpProTransferOrderService.ProductTransferOrder(root.Content);
+ if (content.Status) return Instance.OK();
+ else return Instance.Error(content.Message);
}
/// <summary>
/// 鎴愬搧鎶ュ簾鍑哄簱鍗曟帴鏀�
@@ -221,6 +225,15 @@
public string InvokeMatReceiveApi([FromBody]ERPReceiveModel receiveModel)
{
return _invokeERPService.InvokeMatReceiveApi(receiveModel);
+ }
+ /// <summary>
+ /// 鎺ㄩ�丒RP鏉ユ枡IQC璐ㄦ
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeCheckOrderApi"), AllowAnonymous]
+ public string InvokeCheckOrderApi(ERPCheckModel checkModel)
+ {
+ return _invokeERPService.InvokeCheckOrderApi(checkModel);
}
/// <summary>
/// 鎺ㄩ�丒RP鍏ュ簱
@@ -294,5 +307,23 @@
{
return _invokeERPService.InvokeProStockCheckApi(stockCheckModel);
}
+ /// <summary>
+ /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeProSaleCustomer"), AllowAnonymous]
+ public string InvokeProSaleCustomer(string saleOrder)
+ {
+ return _invokeERPService.InvokeProSaleCustomer(saleOrder);
+ }
+ /// <summary>
+ /// 鏌ヨ閿�鍞瓻RP瀹㈡埛
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeOutProErpSync"), AllowAnonymous]
+ public string InvokeOutProErpSync(string outProOrderNo)
+ {
+ return _invokeERPService.InvokeOutProErpSync(outProOrderNo);
+ }
}
}
--
Gitblit v1.9.3