From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 18 九月 2024 16:37:13 +0800
Subject: [PATCH] 增加对申请入库时对平库库位的校验

---
 Wms/Wms/Controllers/BllAsnController.cs |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index d92a29a..b4e38cc 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -14,13 +14,14 @@
 using System.Threading.Tasks;
 using SqlSugar;
 using System.Diagnostics;
+using Model.ModelDto.SysDto;
+using static System.Reflection.Metadata.BlobBuilder;
 
 namespace Wms.Controllers
 {
     [Route("api/[controller]/[action]")]
     [ApiController]
     [Authorize]
-
     public class BllAsnController : ControllerBase
     {
         #region 渚濊禆娉ㄥ叆
@@ -33,10 +34,11 @@
         private readonly IAuditLogServer _auditLog;                                 // 瀹℃牳璁板綍
         private readonly IBllLabelBoxNoServer _labelBox;                            // 绠辩爜鏍囩
         private readonly IProcurePlanServer _procurePlanSvc;                            // 绠辩爜鏍囩
+        private readonly IPalletUpShelfServer _palletUpShelfSvc;                            // 涓婃灦璁板綍
         #endregion
 
         #region 鏋勯�犲嚱鏁�
-        public BllAsnController(IArrivalNoticeServer arrivalNoticeSvc, IPalletBindServer palletBindSvc, IBllBoxInfoServer bllBoxInfoSvc, ITaskServer taskSvc, IOperationASNServer logSvc, IPalletUnbindServer palletUnbind, IAuditLogServer auditLog, IBllLabelBoxNoServer labelBox, IProcurePlanServer procurePlanSvc)
+        public BllAsnController(IArrivalNoticeServer arrivalNoticeSvc, IPalletBindServer palletBindSvc, IBllBoxInfoServer bllBoxInfoSvc, ITaskServer taskSvc, IOperationASNServer logSvc, IPalletUnbindServer palletUnbind, IAuditLogServer auditLog, IBllLabelBoxNoServer labelBox, IProcurePlanServer procurePlanSvc, IPalletUpShelfServer palletUpShelfSvc)
         {
             _arrivalNoticeSvc = arrivalNoticeSvc;
             _PalletBindSvc = palletBindSvc;
@@ -47,6 +49,7 @@
             _auditLog = auditLog;
             _labelBox = labelBox;
             _procurePlanSvc = procurePlanSvc;
+            _palletUpShelfSvc = palletUpShelfSvc;
         }
         #endregion
 
@@ -332,7 +335,7 @@
         }
         #endregion
 
-        #region 鎵樼洏缁戝畾
+        #region 缁勬墭鏀惰揣
         [HttpPost]
         public IActionResult GetPalletBindList(PalletBindVm model)
         {
@@ -510,7 +513,8 @@
         {
             try
             {
-                var models = _PalletBindSvc.GetLocateList("W01", model.RoadwayNo, model.Row, model.Column, model.Layer, model.LocateNo, model.StockDetailId, model.Page, model.Limit, out int count);
+                var models = _PalletBindSvc.GetLocateList("W01", model.RoadwayNo, model.Row, model.Column, model.Layer, model.LocateNo, 
+                    model.StockDetailId, model.Page, model.Limit, out int count);
 
                 return Ok(new { code = 0, count, msg = "鑾峰彇鎸囧畾鍌ㄤ綅淇℃伅", data = models });
             }
@@ -1257,6 +1261,23 @@
             }
         }
         #endregion
+
+        #region 涓婃灦浠诲姟璁板綍
+
+        /// <summary>
+        /// 鑾峰彇涓婃灦浠诲姟璁板綍淇℃伅鍒嗛〉闆嗗悎
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ServiceFilter(typeof(ApiResponseActionFilter))]
+        public async Task<SqlSugarPagedList> GetPalletUpShelfList(PalletUpShelfVm model)
+        {
+            RefAsync<int> count = new RefAsync<int>();
+            var data = await _palletUpShelfSvc.GetPalletUpShelfList(model.TraceNo, model.TaskNo,model.PalletNo,model.SkuNo,model.SkuName,model.LotNo,model.Status,model.Page,model.Limit, count);
+            return new SqlSugarPagedList() { Items = data, Total = count };
+        }
+        #endregion
     }
 
 }

--
Gitblit v1.8.0