From 2f14ad3cc01d575bfde0850bae05fded8acb7af6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 12 一月 2025 00:20:26 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 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/OutStockLockInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
index 7339731..dd6e86c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutStockLockInfoController.cs"
@@ -1,11 +1,16 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
namespace WIDESEA_WMSServer.Controllers.Outbound
{
+ /// <summary>
+ /// 鍑哄簱璇︽儏
+ /// </summary>
[Route("api/OutStockLockInfo")]
[ApiController]
public class OutStockLockInfoController : ApiBaseController<IOutStockLockInfoService, Dt_OutStockLockInfo>
@@ -14,10 +19,30 @@
{
}
- [HttpPost, Route("GetByOrderDetailId")]
+ /// <summary>
+ /// 鎷ｉ��
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("GetStockOutboundOrder")]
+ public List<Dt_OutStockLockInfo> GetStockOutboundOrder([FromBody] SaveModel saveModel)
+ {
+ return Service.GetStockOutboundOrder(saveModel);
+ }
+ /// <summary>
+ /// 鎷ｉ�夊畬鎴�
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <returns></returns>
+ [HttpPost, HttpGet, Route("MaterialPick")]
+ public WebResponseContent MaterialPick(string palletCode)
+ {
+ return Service.MaterialPick(palletCode);
+ }
+ [HttpPost, HttpGet, Route("GetByOrderDetailId"), AllowAnonymous]
public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId)
{
- return Service.GetByOrderDetailId(orderDetailId);
+ return Service.GetByOrderDetailId(orderDetailId,null);
}
}
}
--
Gitblit v1.9.3