From 638a684258fb4bc6adf76a1964bdf0d7f99e404f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 31 三月 2025 02:18:54 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 122 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 120 insertions(+), 2 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 e04985f..da0a41b 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"
@@ -124,7 +124,69 @@
if (content.Status) return Instance.OK();
else return Instance.Error(content.Message);
}
-
+ /// <summary>
+ /// 鎺ユ敹ERP鎴愬搧鍑哄簱鍗曚俊鎭�(璁㈠崟鍑哄簱/瀵勫敭鍑哄簱)
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("ProductDeliveryOrder"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ProductDeliveryOrder([FromBody] Root<ErpProOutOrderDTO> erpProOutOrder)
+ {
+ WebResponseContent content = _outboundService.ProOutOrderService.ProductDeliveryOrder(erpProOutOrder.Content);
+ if (content.Status) return Instance.OK();
+ else return Instance.Error(content.Message);
+ }
+ /// <summary>
+ /// 鎴愬搧瀵勫敭杞叆/璋冩嫧鍏ュ簱
+ /// </summary>
+ /// <param name="root"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ProductWarehousingOrder"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ProductWarehousingOrder([FromBody] Root<ErpProductWarehousingOrderDTO> root)
+ {
+ WebResponseContent content = _inboundService.ErpProInOrderService.ProductWarehousingOrder(root.Content);
+ if (content.Status) return Instance.OK();
+ else return Instance.Error(content.Message);
+ }
+ /// <summary>
+ /// 鎴愬搧璋冩嫧鍑猴紙鐮斿彂锛�
+ /// </summary>
+ /// <param name="root"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ProductTransferOrder"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ProductTransferOrder([FromBody] Root<ErpProductTransferOrderDTO> root)
+ {
+ WebResponseContent content = _outboundService.ErpProTransferOrderService.ProductTransferOrder(root.Content);
+ if (content.Status) return Instance.OK();
+ else return Instance.Error(content.Message);
+ }
+ /// <summary>
+ /// 鎴愬搧鎶ュ簾鍑哄簱鍗曟帴鏀�
+ /// </summary>
+ /// <param name="root"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ProductScrappedOrder"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ProductScrappedOrder([FromBody] Root<ErpProductScrappedOrderDTO> root)
+ {
+ return Instance.OK();
+ }
+ /// <summary>
+ /// 鎴愬搧棰嗘枡鍑哄簱鍗曟帴鏀�
+ /// </summary>
+ /// <param name="root"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ProductOutOrder"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ProductOutOrder([FromBody] Root<ErpProOutLingOrder> root)
+ {
+ return Instance.OK();
+ }
+ /// <summary>
+ /// 閿�鍞寚娲惧崟鎺ユ敹
+ /// </summary>
+ [HttpPost, Route("ProductSpecifyVer"), AllowAnonymous, MethodParamsValidate]
+ public ErpResponseContent ProductSpecifyVer([FromBody] Root<ErpProductSpecifyVerDTO> root)
+ {
+ return Instance.OK();
+ }
/// <summary>
/// 鎺ユ敹ERP閫�鏂欏崟淇℃伅
/// </summary>
@@ -165,6 +227,15 @@
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鍏ュ簱
/// </summary>
/// <returns></returns>
@@ -182,12 +253,59 @@
return _invokeERPService.InvokeReturnApi(returnModel);
}
/// <summary>
- /// 鎺ㄩ�丒RP閫�鏂欎笂鎶�
+ /// ERP鐩樿耽/浜忎笂鎶ユ帴鍙ｈ皟鐢�
/// </summary>
[HttpPost, Route("InvokeTakeStockApi"), AllowAnonymous]
public string InvokeTakeStockApi([FromBody] ERPTakeStockModel takeModel)
{
return _invokeERPService.InvokeTakeStockApi(takeModel);
}
+ /// <summary>
+ /// ERP鎴愬搧鍏ュ簱涓婃姤鎺ュ彛璋冪敤
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeProInApi"), AllowAnonymous]
+ public string InvokeProInApi([FromBody] ERPProInboundModel inboundModel)
+ {
+ return _invokeERPService.InvokeProInApi(inboundModel);
+ }
+ /// <summary>
+ /// ERP鎴愬搧鍑哄簱涓婃姤鎺ュ彛璋冪敤
+ /// </summary>
+ [HttpPost, Route("InvokeProOutApi"), AllowAnonymous]
+ public string InvokeProOutApi([FromBody] ERPProOutOrderModel outOrderModel)
+ {
+ return _invokeERPService.InvokeProOutApi(outOrderModel);
+ }
+ /// <summary>
+ /// 鎴愬搧浠撴鎶ュ簾鍑哄簱鎺ㄩ�丒RP
+ /// </summary>
+ /// <param name="checkModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeProCheckApi"), AllowAnonymous]
+ public string InvokeProCheckApi([FromBody] ERPProductCheckModel checkModel)
+ {
+ return _invokeERPService.InvokeProCheckApi(checkModel);
+ }
+ /// <summary>
+ /// 鎴愬搧瓒呭懆鏈熸姤搴熸帹閫丒Rp
+ /// </summary>
+ /// <param name="sheetModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeProScrapSheetApi"), AllowAnonymous]
+ public string InvokeProScrapSheetApi([FromBody] ERPScrapSheetModel sheetModel)
+ {
+ return _invokeERPService.InvokeProScrapSheetApi(sheetModel);
+ }
+ /// <summary>
+ /// 鎴愬搧鐩樼偣鐩樿耽/鐩樹簭
+ /// </summary>
+ /// <param name="stockCheckModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("InvokeProStockCheckApi"), AllowAnonymous]
+ public string InvokeProStockCheckApi([FromBody] ERPProStockCheckModel stockCheckModel)
+ {
+ return _invokeERPService.InvokeProStockCheckApi(stockCheckModel);
+ }
}
}
--
Gitblit v1.9.3