From ac2f359d397c0ec5eb87c9cbc415584d1d88439f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期二, 16 九月 2025 08:56:53 +0800
Subject: [PATCH] 采购退料:列表选择、列表明细更改为存储过程，添加组织隔离，添加库位列表，添加隐藏完结单号功能

---
 Controllers/Warehouse/MesBarCFController.cs |   92 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/Controllers/Warehouse/MesBarCFController.cs b/Controllers/Warehouse/MesBarCFController.cs
index adfe372..09436ea 100644
--- a/Controllers/Warehouse/MesBarCFController.cs
+++ b/Controllers/Warehouse/MesBarCFController.cs
@@ -1,9 +1,12 @@
 锘縰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;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace NewPdaSqlServer.Controllers.Warehouse;
 
@@ -12,6 +15,8 @@
 public class MesBarCFController : ControllerBase
 {
     private readonly MesBarCFManager m = new();
+
+    private readonly MesPrintMangeer _mCf = new();
 
     /// <summary>
     ///     鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
@@ -42,17 +47,100 @@
     ///     鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
     /// </summary>
     /// <returns></returns>
+    [HttpPost("GetBarInfoBefore")]
+    public ResponseResult GetBarInfoBefore(WarehouseQuery unity)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.GetBarInfoBefore(unity);
+            resultInfos.tbMesItems = m.GetItemNo(resultInfos.tbBillList.ITEM_ID);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    /// <summary>
+    ///     鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+    /// </summary>
+    /// <returns></returns>
     [HttpPost("BarCF")]
     public ResponseResult BarCF(WarehouseQuery unity)
     {
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = m.BarCF(unity);
+            resultInfos.tbBillList = new ExpandoObject();
+            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+            var scanResult = m.BarCF(unity);
+            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
             return new ResponseResult
             {
                 status = 0,
-                message = resultInfos.tbBillList,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+
+    /// <summary>
+    ///     PDA閲嶆墦鏉＄爜
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("BarRePrint")]
+    public ResponseResult BarRePrint(WarehouseQuery unity)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = new ExpandoObject();
+            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+            resultInfos.tbBillList.cfBarInfo = _mCf.getPrintBarInfo(unity);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+
+    /// <summary>
+    ///     鑾峰彇鏉＄爜淇℃伅鍜岀墿鏂欎俊鎭�
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("BarCfBefore")]
+    public ResponseResult BarCfBefore(WarehouseQuery unity)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = new ExpandoObject();
+            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(unity);
+            var scanResult = m.BarCfBefore(unity);
+            resultInfos.tbBillList.cfBarInfo = _mCf.getCfBeforeInfo(scanResult);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
                 data = resultInfos
             };
         }

--
Gitblit v1.9.3