From 770f02888443c1be46549f164abfd3be78a3dbd3 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 25 十一月 2025 09:42:22 +0800
Subject: [PATCH] 1.标准版更新（20251125）
---
Controllers/Warehouse/MesItemQtController.cs | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/Controllers/Warehouse/MesItemQtController.cs b/Controllers/Warehouse/MesItemQtController.cs
index 7daac28..3a80f9e 100644
--- a/Controllers/Warehouse/MesItemQtController.cs
+++ b/Controllers/Warehouse/MesItemQtController.cs
@@ -1,6 +1,7 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
@@ -11,9 +12,11 @@
/// </summary>
[Route("api/[controller]")]
[ApiController]
-public class MesItemQtController : ControllerBase
+public class MesItemQtController : BaseController
{
private readonly MesItemQtManager _manager = new();
+
+ private readonly MesPrintMangeer _mCf = new();
#region 鍩虹CRUD
@@ -60,7 +63,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetPendingQtList();
+ resultInfos.tbBillList = _manager.GetPendingQtList(RequestInfo);
return new ResponseResult
{
status = 0,
@@ -81,7 +84,7 @@
/// <returns>寰呭鐞嗙殑閫�鏂欏崟鏄庣粏鍒楄〃</returns>
/// <remarks>
/// 璇锋眰绀轰緥:
- /// POST /api/MesItemQt/GetPendingQtList
+ /// POST /api/MesItemQt/GetPendingQtDetailList
/// {
/// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
/// "billNo": "QT20240101001" // 閫�鏂欏崟鍙�(蹇呭～)
@@ -91,13 +94,12 @@
/// <response code="200">鎴愬姛鑾峰彇閫�鏂欏崟鏄庣粏</response>
/// <response code="400">鑾峰彇澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
[HttpPost("GetPendingQtDetailList")]
- public ResponseResult GetPendingQtDetailList(
- [FromBody] WarehouseQuery query)
+ public ResponseResult GetPendingQtDetailList([FromBody] WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetPendingQtList(query);
+ resultInfos.tbBillList = _manager.GetPendingQtDetailList(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -134,13 +136,38 @@
[HttpPost("OutScanBarcode")]
public ResponseResult OutScanBarcode([FromBody] WarehouseQuery query)
{
+ //try
+ //{
+ // dynamic resultInfos = new ExpandoObject();
+ // var (form, items, message) = _manager.OutScanBarcode(query);
+ // resultInfos.form = form;
+ // resultInfos.items = items;
+ // resultInfos.message = message;
+ // return new ResponseResult
+ // {
+ // status = 0,
+ // message = "OK",
+ // data = resultInfos
+ // };
+ //}
+ //catch (Exception ex)
+ //{
+ // return ResponseResult.ResponseError(ex);
+ //}
+
try
{
dynamic resultInfos = new ExpandoObject();
- var (form, items, message) = _manager.OutScanBarcode(query);
- resultInfos.form = form;
- resultInfos.items = items;
- resultInfos.message = message;
+ resultInfos.tbBillList = _manager.ScanCode(query);
+ if (resultInfos.tbBillList.result == "2")
+ {
+ return new ResponseResult
+ {
+ status = Convert.ToInt32(resultInfos.tbBillList.result),
+ message = resultInfos.tbBillList.strMsg,
+ data = resultInfos
+ };
+ }
return new ResponseResult
{
status = 0,
@@ -198,5 +225,29 @@
}
}
+
+ [HttpPost("ScanCodeCF")]
+ public ResponseResult ScanCodeCF(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ var scanResult = _manager.ScanCodeCF(query);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
#endregion
}
\ No newline at end of file
--
Gitblit v1.9.3