From 4ef0acfc95e9e654ae142f8d5b21d68c55ddfc8d Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 27 五月 2025 10:37:04 +0800
Subject: [PATCH] 1.巡检新增扫描工单获取检验信息

---
 Controllers/Wom/WomdaaController.cs |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 37724e4..2d9aa02 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using NewPdaSqlServer.Dto.service;
 using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
 using NewPdaSqlServer.service.Wom;
 using NewPdaSqlServer.util;
 
@@ -12,6 +13,7 @@
 public class WomdaaController : ControllerBase
 {
     private readonly WomdaaManager m = new();
+    private readonly MesPrintMangeer _mCf = new();
 
     #region 鐢熶骇棰嗘枡
 
@@ -102,7 +104,10 @@
         try
         {
             dynamic resultInfos = new ExpandoObject();
-            resultInfos.tbBillList = m.ScanCodeCF(query);
+            resultInfos.tbBillList = new ExpandoObject();
+            resultInfos.tbBillList.printInfo = _mCf.getPrintInfo(query);
+            var scanResult = m.ScanCodeCF(query);
+            resultInfos.tbBillList.cfBarInfo = _mCf.getCfInfo(scanResult);
             return new ResponseResult
             {
                 status = 0,
@@ -427,7 +432,7 @@
 
     //GetItemsXcsl
     /// <summary>
-    ///     鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
+    ///     鏍规嵁宸ュ崟鍙疯幏鍙栧緟鏀舵枡鐗╂枡鏄庣粏
     /// </summary>
     /// <returns></returns>
     [HttpPost("GetItemsXcsl")]
@@ -450,5 +455,56 @@
         }
     }
 
+
+    //GetItemsXcsl
+    /// <summary>
+    ///     鐗╂枡鏉$爜鏀舵枡
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("ScanXcsl")]
+    public ResponseResult ScanXcsl(dynamic query)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.ScanXcsl(query);
+            return new ResponseResult
+            {
+                status = 0,
+                message = "OK",
+                data = resultInfos
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
+    }
+
+    //GetItemsXcsl
+    /// <summary>
+    ///     鏍规嵁绾夸綋鑾峰彇浠櫒閲嶉噺
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("GetWeightByXt")]
+    public ResponseResult GetWeightByXt(dynamic query)
+    {
+        try
+        {
+            dynamic resultInfos = new ExpandoObject();
+            resultInfos.tbBillList = m.GetWeightByXt(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