From bfa01e00dc6b89cbba901175689a2199b8f82da4 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期日, 07 九月 2025 23:19:33 +0800
Subject: [PATCH] 1.生产退料
---
Controllers/Warehouse/MesItemTblController.cs | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/Controllers/Warehouse/MesItemTblController.cs b/Controllers/Warehouse/MesItemTblController.cs
index 347c52b..8fa0035 100644
--- a/Controllers/Warehouse/MesItemTblController.cs
+++ b/Controllers/Warehouse/MesItemTblController.cs
@@ -12,7 +12,7 @@
/// </summary>
[Route("api/[controller]")]
[ApiController]
-public class MesItemTblController : ControllerBase
+public class MesItemTblController : BaseController
{
private readonly MesItemTblManager m = new();
@@ -169,12 +169,12 @@
/// </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,
@@ -200,7 +200,18 @@
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,
@@ -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