From c6e8b600398de38b6684f5fa1eaaaade8562859b Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 20 九月 2025 15:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/LongDeLiLiKu
---
项目代码/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
index a723b67..da8da61 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_WMSServer/Controllers/ERP/ErpBSTController.cs"
@@ -33,13 +33,15 @@
private readonly IInvokeERPService _invokeERPService;
private readonly IPurchaseBSTOrderService _purchaseBSTOrderService;
private readonly IOutBSTOrderService _outBSTOrderService;
+ private readonly IReturnBSTOrderService _returnBSTOrderService;
- public ErpBSTController(IBasicService basicService, IInvokeERPService invokeERPService,IPurchaseBSTOrderService purchaseBSTOrderService,IOutBSTOrderService outBSTOrderService)
+ public ErpBSTController(IBasicService basicService, IInvokeERPService invokeERPService,IPurchaseBSTOrderService purchaseBSTOrderService,IOutBSTOrderService outBSTOrderService,IReturnBSTOrderService returnBSTOrderService)
{
_basicService = basicService;
_invokeERPService = invokeERPService;
_purchaseBSTOrderService = purchaseBSTOrderService;
_outBSTOrderService = outBSTOrderService;
+ _returnBSTOrderService = returnBSTOrderService;
}
/// <summary>
/// 娣诲姞鑰佸巶鐗╂枡
@@ -53,7 +55,7 @@
}
/// <summary>
- /// 娣诲姞鑰佸巶渚涘簲鍟嗕俊鎭�
+ /// 鎺ユ敹鑰佸巶渚涘簲鍟嗕俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceiveSupplier"), AllowAnonymous]
@@ -64,7 +66,7 @@
}
/// <summary>
- /// 娣诲姞鑰佸巶閲囪喘鍗曚俊鎭�
+ /// 鎺ユ敹鑰佸巶閲囪喘鍗曚俊鎭�
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceivePurchaseOrder"), AllowAnonymous]
@@ -74,7 +76,7 @@
}
/// <summary>
- /// 娣诲姞鍑哄簱鎺掔▼淇℃伅
+ /// 鎺ユ敹鍑哄簱鎺掔▼淇℃伅
/// </summary>
/// <returns></returns>
[HttpPost, HttpGet, Route("ReceiveOutOrder"), AllowAnonymous]
@@ -82,5 +84,32 @@
{
return _outBSTOrderService.AddOutBSTOrder(bSTOutOrderDTOs);
}
+ /// <summary>
+ /// 鎺ユ敹鍗氭�濋�氶鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceivePicking"), AllowAnonymous]
+ public WebResponseContent ReceivePicking()
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�") ;
+ }
+ /// <summary>
+ /// 鎺ユ敹鍗氭�濋�氶��鏂欎俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceiveReturnOrder"), AllowAnonymous]
+ public WebResponseContent ReceiveReturnOrder([FromBody] List<BSTReturnOrderDTO> bSTReturnOrderDTOs)
+ {
+ return _returnBSTOrderService.ReceiveReturnOrder(bSTReturnOrderDTOs);
+ }
+ /// <summary>
+ /// 鎺ユ敹鍗氭�濋�氱洏鐐逛俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("ReceiveStockCheckOrder"), AllowAnonymous]
+ public WebResponseContent ReceiveStockCheckOrder([FromBody] List<BSTOutOrderDTO> bSTOutOrderDTOs)
+ {
+ return _outBSTOrderService.AddOutBSTOrder(bSTOutOrderDTOs);
+ }
}
}
--
Gitblit v1.9.3