From a5b17bdb0836d31aa2388c19e2be8224cfd1d4f9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 27 十月 2025 09:39:49 +0800
Subject: [PATCH] 1.卡板条码查询调整为存储过程
---
Controllers/Wom/WwGdController.cs | 348 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 342 insertions(+), 6 deletions(-)
diff --git a/Controllers/Wom/WwGdController.cs b/Controllers/Wom/WwGdController.cs
index a1a34f0..505e1aa 100644
--- a/Controllers/Wom/WwGdController.cs
+++ b/Controllers/Wom/WwGdController.cs
@@ -1,7 +1,9 @@
锘縰sing System.Dynamic;
+using Masuit.Tools.Win32.AntiVirus;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;
@@ -9,9 +11,10 @@
[ApiController]
[Route("api/[controller]")]
-public class WwGdController : ControllerBase
+public class WwGdController : BaseController
{
private readonly WwGdManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
/// <summary>
/// 鎵爜
@@ -19,8 +22,8 @@
/// <param name="query">鎵爜璇锋眰鍙傛暟</param>
/// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
/// // Demo Request:
- // POST /api/WwGdController/ScanCode
- // Body:
+ // POST /api/WwGd/ScanCode
+ // BodyGetItemsByDaa001
// {
// "query": {
// "Code": "SampleCode",
@@ -35,6 +38,15 @@
// 璋冪敤WwGdManager鐨凷canCode鏂规硶杩涜鎵爜鎿嶄綔
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.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,
@@ -55,7 +67,7 @@
/// <param name="query">鎵爜纭璇锋眰鍙傛暟</param>
/// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
/// // Demo Request:
- // POST /api/WwGdController/ScanCodeCF
+ // POST /api/WwGd/ScanCodeCF
// Body:
// {
// "query": {
@@ -85,13 +97,68 @@
}
}
+
+ /// <summary>
+ /// 鑾峰彇搴撲綅淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetBarKwByItem")]
+ public ResponseResult GetBarKwByItem(dynamic unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetBarKwByItem(unity);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <summary>
+ /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("GetXcslDaa")]
+ public ResponseResult GetXcslDaa([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetXcslDaa(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>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
// Demo Request:
- // POST /api/WwGdController/GetItemsByDaa001
+ // POST /api/WwGd/GetItemsByDaa001
// Body:
// {
// "query": {
@@ -105,7 +172,7 @@
{
// 璋冪敤WwGdManager鐨凣etItemsByDaa001鏂规硶鑾峰彇浠ｉ鐗╂枡鏄庣粏
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItemsByDaa001(query);
+ resultInfos.tbBillList = m.GetItemsByDaa001(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -121,6 +188,275 @@
}
/// <summary>
+ /// 濮斿宸ュ崟琛ユ枡鎵爜
+ /// </summary>
+ /// <param name="query">鏉″舰鐮佸彿</param>
+ /// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
+ // Demo Request:
+ // POST /api/WwGd/WwblScanBarcode
+ // Body:
+ // {
+ // 鍙傛暟璇存槑:
+ // - billNo: 鍗曟嵁鍙�(蹇呭～)
+ // - barcode: 鏉＄爜(蹇呭～)
+ // - userName: 鐢ㄦ埛鍚�
+ // - blNo: 琛ユ枡鍗曞彿(蹇呭～)
+ // }
+ [HttpPost("WwblScanBarcode")]
+ public ResponseResult WwblScanBarcode(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var (success, pendingList) = m.WwblScanBarcode(query);
+ resultInfos.success = success;
+ resultInfos.pendingList = pendingList;
+ if (success.status == 2)
+ {
+ return new ResponseResult
+ {
+ status = Convert.ToInt32(success.status),
+ message = success.message,
+ data = resultInfos.success
+ };
+ }
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鐢熶骇琛ユ枡鍗曟潯鐮佹媶鍒�
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>鎷嗗垎缁撴灉鍜屽緟澶勭悊鍒楄〃</returns>
+ /// <remarks>
+ /// 璇锋眰绀轰緥:
+ /// POST /api/WwGd/SplitBarcode
+ /// {
+ /// "billNo": "WO202401010001", // 宸ュ崟鍙�(蹇呭～)
+ /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
+ /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
+ /// "blNo": "BL202401010001", // 琛ユ枡鍗曞彿(蹇呭～)
+ /// "Num": 10 // 鎷嗗垎鏁伴噺(蹇呭～,蹇呴』澶т簬0)
+ /// }
+ /// 涓氬姟澶勭悊锛�
+ /// - 楠岃瘉琛ユ枡鍗曠姸鎬�
+ /// - 楠岃瘉鏉＄爜搴撳瓨淇℃伅
+ /// - 楠岃瘉鎷嗗垎鏁伴噺鏄惁鍚堢悊
+ /// - 鎵ц鏉＄爜鎷嗗垎浜嬪姟澶勭悊
+ /// - 鏇存柊宸ュ崟鍜岃ˉ鏂欏崟鐩稿叧鏁伴噺
+ /// 杩斿洖鏁版嵁鍖呭惈锛�
+ /// - success: 鎷嗗垎鏄惁鎴愬姛
+ /// - pendingList: 寰呭鐞嗘槑缁嗗垪琛紝鍖呭惈锛�
+ /// * Bld012: 鐗╂枡ID
+ /// * Bld002: 鐗╂枡缂栧彿
+ /// * Bld003: 鐗╂枡鍚嶇О
+ /// * Bld004: 鐗╂枡瑙勬牸
+ /// * Bld007: 璁″垝鏁伴噺
+ /// * Bld008: 宸茶ˉ鏁伴噺
+ /// </remarks>
+ /// <response code="200">鎷嗗垎鎴愬姛</response>
+ /// <response code="400">鎷嗗垎澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
+ [HttpPost("SplitBarcode")]
+ public ResponseResult SplitBarcode([FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var (success, pendingList) = m.SplitBarcode(query);
+ resultInfos.success = success;
+ resultInfos.pendingList = pendingList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鎵弿鏉＄爜
+ /// </summary>
+ /// <param name="query">鏌ヨ瀵硅薄</param>
+ /// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
+ /// <remarks>
+ /// 璇锋眰绀轰緥:
+ /// POST /api/WwGd/WwtlScanBarcode
+ /// {
+ /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
+ /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
+ /// }
+ /// 涓氬姟澶勭悊锛�
+ /// - 楠岃瘉鏉＄爜鏄惁瀛樺湪
+ /// - 楠岃瘉鐢ㄦ埛鏄惁鏈夋潈闄�
+ /// - 鎵ц鏉＄爜鎵弿浜嬪姟澶勭悊
+ /// - 鏇存柊鐩稿叧璁板綍
+ /// 杩斿洖鏁版嵁鍖呭惈锛�
+ /// - success: 鎵弿鏄惁鎴愬姛
+ /// - message: 鎵弿缁撴灉淇℃伅
+ /// </remarks>
+ /// <response code="200">鎵弿鎴愬姛</response>
+ /// <response code="400">鎵弿澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
+ [HttpPost("WwtlScanBarcode")]
+ public ResponseResult WwtlScanBarcode([FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var wwtlScanBarcode = m.WwtlScanBarcode(query);
+ resultInfos.tbBillList = wwtlScanBarcode;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+ /// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <summary>
+ /// 鑾峰彇濮斿鍑哄簱鐢宠鍗曞彿
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("GetWWCKsq")]
+ public ResponseResult GetWWCKsq([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetWWCKsq(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>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
+ [HttpPost("GetItemsByWwckNo")]
+ public ResponseResult GetItemsByWwckNo(WarehouseQuery query)
+ {
+ try
+ {
+ // 璋冪敤WwGdManager鐨凣etItemsByDaa001鏂规硶鑾峰彇浠ｉ鐗╂枡鏄庣粏
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsByWwckNo(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ [HttpPost("WwckScanCode")]
+ public ResponseResult WwckScanCode(WarehouseQuery query)
+ {
+ try
+ {
+ // 璋冪敤WwGdManager鐨凷canCode鏂规硶杩涜鎵爜鎿嶄綔
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.WwckScanCode(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,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 濮斿鐢宠鍑哄簱鎷嗗垎
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [HttpPost("WwckScanCodeCF")]
+ public ResponseResult WwckScanCodeCF(WarehouseQuery query)
+ {
+ try
+ {
+ // 璋冪敤WwGdManager鐨凷canCodeCF鏂规硶杩涜鎵爜纭鎿嶄綔
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = new ExpandoObject();
+ resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+ var scanResult = m.WwckScanCodeCF(query);
+ resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
/// 鑾峰彇鎵�鏈�
/// </summary>
/// <returns></returns>
--
Gitblit v1.9.3