From 094889f27d4bda5116747a2dcc57724a9d5e90d7 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 09 十二月 2025 13:51:12 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
index d3fcdff..48e53f0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/StockInfoController.cs"
@@ -25,7 +25,7 @@
/// <param name="orderId"></param>
/// <param name="materielCode"></param>
/// <returns></returns>
- [HttpPost, HttpGet, Route("GetStockSelectViews"),AllowAnonymous]
+ [HttpPost, HttpGet, Route("GetStockSelectViews"), AllowAnonymous]
public List<StockSelectViewDTO> GetStockSelectViews(int orderId, string materielCode)
{
return Service.GetStockSelectViews(orderId, materielCode);
@@ -40,7 +40,34 @@
[HttpPost, HttpGet, Route("GetSelectViewDTOs"), AllowAnonymous]
public List<StockSelectViewDTO> GetSelectViewDTOs(string orderNo, string materielCode)
{
- return Service.GetSelectViewDTOs(orderNo, materielCode);
+ try
+ {
+ return Service.GetSelectViewDTOs(orderNo, materielCode);
+ }
+ catch (Exception ex)
+ {
+ return new List<StockSelectViewDTO>();
+ }
}
+
+ /// <summary>
+ /// /
+ /// </summary>
+ /// <param name="orderNo"></param>
+ /// <param name="materielCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetAllocateStockSelect"), AllowAnonymous]
+ public List<StockSelectViewDTO> GetAllocateSelectViewDTOs(int orderId,int orderDetailId, string materielCode)
+ {
+ try
+ {
+ return Service.GetAllocateSelectViewDTOs(orderId, orderDetailId,materielCode);
+ }
+ catch (Exception ex)
+ {
+ return new List<StockSelectViewDTO>();
+ }
+ }
+
}
}
--
Gitblit v1.9.3