From 430f4df6519253ffaf49f2d098ac1df77aa5891e Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 11 九月 2025 14:43:02 +0800
Subject: [PATCH] 销售出库添加一行'制单人'

---
 Controllers/Warehouse/MesItemBlController.cs |   89 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 80 insertions(+), 9 deletions(-)

diff --git a/Controllers/Warehouse/MesItemBlController.cs b/Controllers/Warehouse/MesItemBlController.cs
index b196f79..5505fed 100644
--- a/Controllers/Warehouse/MesItemBlController.cs
+++ b/Controllers/Warehouse/MesItemBlController.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.Warehouse;
 using NewPdaSqlServer.util;
 
@@ -12,9 +14,10 @@
 /// </summary>
 [Route("api/[controller]")]
 [ApiController]
-public class MesItemBlController : ControllerBase
+public class MesItemBlController : BaseController
 {
     private readonly MesItemBlManager _manager = new();
+    private readonly MesPrintMangeer _mCf = new();
 
     /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
 
@@ -201,9 +204,12 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            var (success, pendingList) = _manager.SplitBarcode(query);
-            resultInfos.success = success;
-            resultInfos.pendingList = pendingList;
+            resultInfos.tbBillList = new ExpandoObject();
+            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+            var scanResult = _manager.SplitBarcode(query);
+            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
+            //resultInfos.success = success;
+            //resultInfos.pendingList = pendingList;
             return new ResponseResult
             {
                 status = 0,
@@ -226,12 +232,12 @@
     /// <response code="200">鎴愬姛鑾峰彇琛ユ枡鍗曞彿鍒楄〃</response>
     /// <response code="400">鑾峰彇澶辫触</response>
     [HttpPost("GetSCBLBillNo")]
-    public ResponseResult GetSCBLBillNo(WarehouseQuery query)
+    public ResponseResult GetSCBLBillNo([FromBody] dynamic query)
     {
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = _manager.GetSCBLBillNo(query);
+            resultInfos.tbBillList = _manager.GetSCBLBillNo(query, RequestInfo);
             return new ResponseResult
             {
                 status = 0,
@@ -280,6 +286,26 @@
         }
     }
 
+    [HttpPost("GetLineInfo")]
+    public ResponseResult GetLineInfo([FromBody] dynamic query)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbLineInfo = _manager.GetLineInfo(query, RequestInfo);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
     /// <summary>
     ///     鎵弿鏉＄爜
     /// </summary>
@@ -297,15 +323,24 @@
     /// </remarks>
     /// <response code="200">鎵弿鎴愬姛</response>
     /// <response code="400">鎵弿澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
-    [HttpPost("SctlScanBarcode")]
-    public ResponseResult SctlScanBarcode([FromBody] WarehouseQuery query)
+    [HttpPost("ScblScanBarcode")]
+    public ResponseResult ScblScanBarcode([FromBody] WarehouseQuery query)
     {
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            var (success, pendingList) = _manager.SctlScanBarcode(query);
+            var (success, pendingList) = _manager.ScblScanBarcode(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,
@@ -450,5 +485,41 @@
         }
     }
 
+
+    /// <summary>
+    ///     鏍规嵁鍗曞彿鑾峰彇鐢熶骇琛ユ枡鍗曟槑缁�
+    /// </summary>
+    /// <param name="query">鏌ヨ鍙傛暟锛屽繀椤诲寘鍚玝illNo</param>
+    /// <returns>琛ユ枡鍗曟槑缁嗗垪琛�</returns>
+    /// <remarks>
+    ///     璇锋眰绀轰緥:
+    ///     POST /api/MesItemBl/GetMesItemBlDetailByBillNo
+    ///     {
+    ///     "billNo": "BL202401010001"
+    ///     }
+    /// </remarks>
+    /// <response code="200">鎴愬姛鑾峰彇琛ユ枡鍗曟槑缁�</response>
+    /// <response code="400">鑾峰彇澶辫触锛屽彲鑳芥槸鍗曟嵁鍙蜂笉瀛樺湪鎴栧凡瀹屾垚</response>
+    [HttpPost("GetMesItemWWBlDetailByBillNo")]
+    public ResponseResult GetMesItemWWBlDetailByBillNo(
+        [FromBody] WarehouseQuery query)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = _manager.GetMesItemWWBlDetailByBillNo(query);
+            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