From 7e88876cd6c68e963ec0560f4e329e5dad483d9c Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 28 十一月 2025 16:58:16 +0800
Subject: [PATCH] 增加casno等7个字段

---
 Wms/Wms/Controllers/StatisticalController.cs |  104 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 21ace0d..63db2a4 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -9,6 +9,8 @@
 using System.Threading.Tasks;
 using Model.ModelDto.SysDto;
 using WMS.BLL.LogServer;
+using Model.ModelVm.BllTaskVm;
+using Model.ModelVm;
 
 namespace Wms.Controllers
 {
@@ -23,6 +25,8 @@
         private readonly IStockDetailServer _stockDetail; //缁熻鎶ヨ〃
         private readonly IDataBoxInfoServer _dataBoxInfo; //瀵煎嚭
         private readonly IStockInfoServer _stockInfo; //搴撳瓨淇℃伅
+
+
         /// <summary>
         /// 鏋勯�犲嚱鏁�
         /// </summary>
@@ -37,6 +41,76 @@
             _dataBoxInfo = dataBoxInfo;
             _stockInfo = stockInfo; //搴撳瓨淇℃伅
         }
+
+
+        /// <summary>
+        /// 鑾峰彇搴撳瓨鐗╂枡绫诲瀷鍒嗗竷
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult GetGoodsTypeFb()
+        {
+            IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetGoodsTypeFb();
+            return Ok(new
+            {
+                data = dtoIE,
+                code = 0,
+                msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+            });
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇搴撳瓨璐ㄩ噺鐘舵�佸垎甯�
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult GetQualityStatusFb()
+        {
+            IEnumerable<IdNameNumRateDto> dtoIE = _stock.GetQualityStatusFb();
+            return Ok(new
+            {
+                data = dtoIE,
+                code = 0,
+                msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+            });
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇浠撳簱鐘跺喌鎬�
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult GetWareHouseState()
+        {
+            WarehouseStateDto dto = _stock.GetWareHouseState();
+            return Ok(new
+            {
+                data = dto,
+                code = 0,
+                msg = "鑾峰彇浠撳簱姒傚喌鎴愬姛"
+            });
+        }
+
+
+        /// <summary>
+        /// 鑾峰彇浠撳簱鐘跺喌璇︽儏
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult GetWareHouseStateInfo()
+        {
+            IEnumerable<WarehouseUseDto> dtoIE = _stock.GetWareHouseStateInfo();
+            return Ok(new
+            {
+                data = dtoIE,
+                code = 0,
+                msg = "鑾峰彇浠撳簱璇︽儏鎴愬姛"
+            });
+        }
+
+
 
         #region 搴撳瓨鏄庣粏
 
@@ -107,14 +181,11 @@
         /// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
         /// <returns></returns>
         [HttpGet]
-        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, 
-            string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, 
-            string startTime, string endTIme,string WareHouseNo,string AreaNo)
+        public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme, string WareHouseNo, string AreaNo)
         {
             try
             {
-                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, 
-                    bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
+                List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme, WareHouseNo, AreaNo);
                 return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
             }
             catch (Exception e)
@@ -173,7 +244,7 @@
         /// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
         /// <returns></returns>
         [HttpGet]
-        public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo, 
+        public IActionResult GetBoxInfo(string id, string skuNo, string skuName, string palletNo, string lotNo,
             string boxNo, string status, string inspectMark, string bitBoxMark, string inspectStatus, string WareHouseNo, string AreaNo)
         {
             try
@@ -483,5 +554,26 @@
         }
 
         #endregion
+
+        #region#琛ユ墦鏍囩
+        /// <summary>
+        /// 琛ユ墦搴撳瓨鏄庣粏绠辩爜
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult GetBuDaLabelList(BuDaLabelBoxVm model)
+        {
+            try
+            {
+                var list = _dataBoxInfo.GetBuDaLabelList(model.BoxNo);
+                return Ok(new { code = 0, msg = "鑾峰彇琛ユ墦绠辩爜鏍囩淇℃伅", data = list });
+            }
+            catch (Exception e)
+            {
+                return Ok(new { code = 1, count = 0, msg = e.Message });
+            }
+        }
+        #endregion
     }
 }

--
Gitblit v1.8.0