From ac2f359d397c0ec5eb87c9cbc415584d1d88439f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 16 九月 2025 08:56:53 +0800
Subject: [PATCH] 采购退料:列表选择、列表明细更改为存储过程，添加组织隔离，添加库位列表，添加隐藏完结单号功能
---
Controllers/Warehouse/MesItemQtController.cs | 130 +++++++++++++++++++++++++++++--------------
1 files changed, 88 insertions(+), 42 deletions(-)
diff --git a/Controllers/Warehouse/MesItemQtController.cs b/Controllers/Warehouse/MesItemQtController.cs
index a3ab253..3a80f9e 100644
--- a/Controllers/Warehouse/MesItemQtController.cs
+++ b/Controllers/Warehouse/MesItemQtController.cs
@@ -1,24 +1,27 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
namespace NewPdaSqlServer.Controllers.Warehouse;
/// <summary>
-/// 鍏朵粬鍑哄簱鐩稿叧鎺ュ彛
+/// 鍏朵粬鍑哄簱鐩稿叧鎺ュ彛
/// </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
/// <summary>
- /// 鑾峰彇鎵�鏈�
+ /// 鑾峰彇鎵�鏈�
/// </summary>
/// <returns>鍏朵粬鍑哄簱鍗曞垪琛�</returns>
[HttpPost("GetList")]
@@ -46,11 +49,11 @@
#region 鍏朵粬鍑哄簱涓氬姟
/// <summary>
- /// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
+ /// 鑾峰彇鏈畬鎴愮殑閫�鏂欏崟鍙峰垪琛�
/// </summary>
/// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
/// <remarks>
- /// 鑾峰彇鐘舵�佷负宸插鏍�(Qt015=true)涓旀湭瀹岀粨(Qt014=false)鐨勯��鏂欏崟鍙峰垪琛�
+ /// 鑾峰彇鐘舵�佷负宸插鏍�(Qt015=true)涓旀湭瀹岀粨(Qt014=false)鐨勯��鏂欏崟鍙峰垪琛�
/// </remarks>
/// <response code="200">鎴愬姛鑾峰彇閫�鏂欏崟鍙峰垪琛�</response>
/// <response code="400">鑾峰彇澶辫触</response>
@@ -60,7 +63,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetPendingQtList();
+ resultInfos.tbBillList = _manager.GetPendingQtList(RequestInfo);
return new ResponseResult
{
status = 0,
@@ -75,20 +78,18 @@
}
/// <summary>
- /// 鑾峰彇寰呭鐞嗙殑閫�鏂欏崟鏄庣粏鍒楄〃
+ /// 鑾峰彇寰呭鐞嗙殑閫�鏂欏崟鏄庣粏鍒楄〃
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>寰呭鐞嗙殑閫�鏂欏崟鏄庣粏鍒楄〃</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- ///
- /// POST /api/MesItemQt/GetPendingQtList
+ /// 璇锋眰绀轰緥:
+ /// POST /api/MesItemQt/GetPendingQtDetailList
/// {
- /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
- /// "billNo": "QT20240101001" // 閫�鏂欏崟鍙�(蹇呭～)
+ /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
+ /// "billNo": "QT20240101001" // 閫�鏂欏崟鍙�(蹇呭～)
/// }
- ///
- /// 杩斿洖鏈畬鎴愮殑鏄庣粏璁板綍(Qd007-Qd008>0)
+ /// 杩斿洖鏈畬鎴愮殑鏄庣粏璁板綍(Qd007-Qd008>0)
/// </remarks>
/// <response code="200">鎴愬姛鑾峰彇閫�鏂欏崟鏄庣粏</response>
/// <response code="400">鑾峰彇澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
@@ -98,7 +99,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetPendingQtList(query);
+ resultInfos.tbBillList = _manager.GetPendingQtDetailList(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -113,37 +114,60 @@
}
/// <summary>
- /// 鎵弿鏉＄爜鍑哄簱
+ /// 鎵弿鏉＄爜鍑哄簱
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>鍑哄簱缁撴灉銆佸緟澶勭悊鏄庣粏鍜屾彁绀烘秷鎭�</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- ///
+ /// 璇锋眰绀轰緥:
/// POST /api/MesItemQt/OutScanBarcode
/// {
- /// "billNo": "QT20240101001", // 閫�鏂欏崟鍙�(蹇呭～)
- /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
- /// "userName": "admin" // 鐢ㄦ埛鍚�(蹇呭～)
+ /// "billNo": "QT20240101001", // 閫�鏂欏崟鍙�(蹇呭～)
+ /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
+ /// "userName": "admin" // 鐢ㄦ埛鍚�(蹇呭～)
/// }
- ///
- /// 杩斿洖鏁版嵁鍖呭惈:
- /// - form: 澶勭悊缁撴灉琛ㄥ崟
- /// - item: 寰呭鐞嗘槑缁嗗垪琛�
- /// - message: 澶勭悊缁撴灉娑堟伅
+ /// 杩斿洖鏁版嵁鍖呭惈:
+ /// - form: 澶勭悊缁撴灉琛ㄥ崟
+ /// - item: 寰呭鐞嗘槑缁嗗垪琛�
+ /// - message: 澶勭悊缁撴灉娑堟伅
/// </remarks>
/// <response code="200">鎵弿鎴愬姛</response>
/// <response code="400">鎵弿澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
[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,
@@ -158,25 +182,23 @@
}
/// <summary>
- /// 鎵撳嵃鏉＄爜鍑哄簱
+ /// 鎵撳嵃鏉＄爜鍑哄簱
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>鍑哄簱缁撴灉銆佸緟澶勭悊鏄庣粏鍜屾彁绀烘秷鎭�</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- ///
+ /// 璇锋眰绀轰緥:
/// POST /api/MesItemQt/PrintQtckBarcode
/// {
- /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
- /// "billNo": "QT20240101001", // 閫�鏂欏崟鍙�(蹇呭～)
- /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
- /// "Fum": 10 // 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
+ /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
+ /// "billNo": "QT20240101001", // 閫�鏂欏崟鍙�(蹇呭～)
+ /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
+ /// "Fum": 10 // 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// }
- ///
- /// 杩斿洖鏁版嵁鍖呭惈:
- /// - form: 澶勭悊缁撴灉琛ㄥ崟
- /// - item: 寰呭鐞嗘槑缁嗗垪琛�
- /// - message: 澶勭悊缁撴灉娑堟伅
+ /// 杩斿洖鏁版嵁鍖呭惈:
+ /// - form: 澶勭悊缁撴灉琛ㄥ崟
+ /// - item: 寰呭鐞嗘槑缁嗗垪琛�
+ /// - message: 澶勭悊缁撴灉娑堟伅
/// </remarks>
/// <response code="200">鎵撳嵃鎴愬姛</response>
/// <response code="400">鎵撳嵃澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
@@ -203,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