From 02b26bfaca24386f7b4f4a5e9f336812370ed49b Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 09:45:46 +0800
Subject: [PATCH] 获取BOM参数调整
---
Controllers/Warehouse/MesItemTblController.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/Controllers/Warehouse/MesItemTblController.cs b/Controllers/Warehouse/MesItemTblController.cs
index 6a06111..8fa0035 100644
--- a/Controllers/Warehouse/MesItemTblController.cs
+++ b/Controllers/Warehouse/MesItemTblController.cs
@@ -8,12 +8,11 @@
namespace NewPdaSqlServer.Controllers.Warehouse;
/// <summary>
-/// 鐢熶骇閫�鏂欑浉鍏虫帴鍙�
+/// 鐢熶骇閫�鏂欑浉鍏虫帴鍙�
/// </summary>
-
[Route("api/[controller]")]
[ApiController]
-public class MesItemTblController : ControllerBase
+public class MesItemTblController : BaseController
{
private readonly MesItemTblManager m = new();
@@ -166,16 +165,16 @@
// 鏂板鐨勬柟娉�
/// <summary>
- /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
+ /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
/// </summary>
/// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
[HttpPost("GetSCTLBillNo")]
- public ResponseResult GetSCTLBillNo()
+ public ResponseResult GetSCTLBillNo(WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetSCTLBillNo();
+ resultInfos.tbBillList = m.GetSCTLBillNo(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -190,17 +189,29 @@
}
/// <summary>
- /// 鏍规嵁鍗曞彿鑾峰彇鐢熶骇閫�鏂欏崟鏄庣粏
+ /// 鏍规嵁鍗曞彿鑾峰彇鐢熶骇閫�鏂欏崟鏄庣粏
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>閫�鏂欏崟鏄庣粏鍒楄〃</returns>
[HttpPost("GetMesItemTblDetailByBillNo")]
- public ResponseResult GetMesItemTblDetailByBillNo([FromBody] WarehouseQuery query)
+ public ResponseResult GetMesItemTblDetailByBillNo(
+ [FromBody] WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetMesItemTblDetailByBillNo(query);
+ resultInfos.tbBillList = m.GetMesItemTblDetailByBillNo(query, RequestInfo);
+
+ //if(resultInfos.tbBillList.Count < 1)
+ //{
+ // return new ResponseResult
+ // {
+ // status = 1,
+ // message = "璇ョ敵璇峰崟鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛侊紒锛�",
+ // data = ""
+ // };
+ //}
+
return new ResponseResult
{
status = 0,
@@ -215,7 +226,7 @@
}
/// <summary>
- /// 鎵弿搴撲綅
+ /// 鎵弿搴撲綅
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>搴撲綅淇℃伅</returns>
@@ -240,7 +251,7 @@
}
/// <summary>
- /// 鎵弿鏉＄爜
+ /// 鎵弿鏉＄爜
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>鎵弿缁撴灉</returns>
@@ -250,7 +261,32 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SctlScanBarcode(query);
+ resultInfos.tbBillList = m.SctlScanBarcode(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 濮斿閫�鏂欐壂鎻忔潯鐮�
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>鎵弿缁撴灉</returns>
+ [HttpPost("WwtlScanBarcode")]
+ public ResponseResult WwtlScanBarcode([FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.SctlScanBarcode(query, RequestInfo);
return new ResponseResult
{
status = 0,
--
Gitblit v1.9.3