From 3a89a0b435821e074e781e5eb9eaebae16de01d6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 24 八月 2024 16:28:36 +0800
Subject: [PATCH] PDA组托页面和平库入库托盘上架

---
 Wms/WMS.BLL/SysServer/StorageLocatServer.cs |   52 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index f3ffb62..ec36530 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -119,12 +119,25 @@
             }
         }
 
-
-        public bool EditStorageLocat(EditLocateVm model,string url ,int userId)
+        public List<SysStorageLocat> GetStorageLocat()
         {
             try
             {
-                var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature,url, userId);
+                var data = LocatRst.GetAll().ToList();
+                return data;
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
+
+        public bool EditStorageLocat(EditLocateVm model, string url, int userId)
+        {
+            try
+            {
+                var bl = LocatRst.EditStorageLocat(model.Id,model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
 
                 return bl;
             }
@@ -137,6 +150,7 @@
         /// <summary>
         /// 娣诲姞鍌ㄤ綅淇℃伅锛堢珛浣撳簱锛夌敤浜庡紑鍙戜汉鍛樻坊鍔犲熀纭�淇℃伅
         /// </summary>
+        /// <param name="index">褰撳墠鎺掓暟</param>
         /// <param name="houseNo">浠撳簱鍙�</param>
         /// <param name="roadwayNo">宸烽亾鍙�</param>
         /// <param name="areaNo">鍖哄煙鍙�</param>
@@ -146,14 +160,14 @@
         /// <param name="dept">娣卞害</param>
         /// <param name="userId">鎿嶄綔浜�</param>
         /// <returns></returns>
-        public async Task<int> AddStorageLocat(string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
+        public async Task<int> AddStorageLocat(int index, string houseNo, string roadwayNo, string areaNo, int row, int col, int layer, string dept, int userId)
         {
             try
             {
                 var q = 0;
                 //R01 -01 -01 -02
                 //宸烽亾鈥撴帓-鍒�-灞� 
-                for (int r = 12; r <= row; r++)//鎺�
+                for (int r = index; r <= row; r++)//鎺�
                 {
                     var r1 = "1";
                     if (r < 10)
@@ -233,12 +247,30 @@
             try
             {
                 var q = 0;
+                var depth = 0;
+                var depthString = "";
                 // 鎺�(缁�)寰幆
                 for (int i = 1; i <= model.Row; i++)
                 {
                     // 鍒楀惊鐜�
                     for (int z = 1; z <= model.Col; z++)
                     {
+                        if (z == 1)
+                        {
+                            depth += 1;
+                            if (depth >= 10)
+                            {
+                                depthString = depth.ToString();
+                            }
+                            else if (depth < 10)
+                            {
+                                depthString = "0" + depth.ToString();
+                            }
+                            else {
+                                //鍏朵綑鏉′欢
+                            }
+                        }
+                        
                         q += await LocatRst.AddAsync(new SysStorageLocat()
                         {
                             // 鍖哄煙+鎺�+鍒�+灞�
@@ -250,7 +282,7 @@
                             AisleOne = "1",
                             AisleTwo = "",
                             Flag = "0",
-                            Depth = z.ToString(),
+                            Depth = depthString,
                             Row = i,
                             Column = z,
                             Layer = 1,
@@ -267,11 +299,11 @@
             }
         }
 
-        public bool EditStorageLocatList(EditLocateListVm model,string url, int userId)
+        public bool EditStorageLocatList(EditLocateListVm model, string url, int userId)
         {
             try
             {
-                var bl = LocatRst.EditStorageLocatList(model.Id, model.Status, model.Flag, model.Temperature, url, userId);
+                var bl = LocatRst.EditStorageLocatList(model.Id, model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
 
                 return bl;
             }
@@ -847,8 +879,8 @@
                 //    "B14",
                 //    "B15",
                 //};
-                string row1 = "'B01','B02','B03','B04','B05','B06','B07'";
-                string row3 = "'B11','B12','B13','B14','B15'";
+                string row1 = "'A06'";
+                string row3 = "'A08'";
                 string str = $"select * from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and ";
                 if (row == "1")
                 {

--
Gitblit v1.8.0