From ee4806a4b2ec94ec63b4cb9b58447d9863baebe5 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 27 三月 2025 09:02:41 +0800
Subject: [PATCH] 修改问题

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

diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index fbbdd73..30f6152 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -87,6 +87,8 @@
                     Layer = m.Layer,
                     Height = m.Height,
                     Weight = m.Weight,
+                    AisleOne=m.AisleOne,
+                    AisleTwo=m.AisleTwo,
                     TempName = m.TemperatureInfo == null ? "" : m.TemperatureInfo.DictName,
                     CreateTime = m.CreateTime,
                     CreateUserName = m.CreateUserInfo == null ? "" : m.CreateUserInfo.UserName,
@@ -233,33 +235,48 @@
             try
             {
                 var q = 0;
-                // 鎺�(缁�)寰幆
-                for (int i = 1; i <= model.Row; i++)
+                List<SysStorageLocat> _list = new List<SysStorageLocat>();
+                // 鍒楀惊鐜�
+                for (int z = 1; z <= model.Col; z++)
                 {
-                    // 鍒楀惊鐜�
-                    for (int z = 1; z <= model.Col; z++)
+                    var locatInfo = new SysStorageLocat()
                     {
-                        q += await LocatRst.AddAsync(new SysStorageLocat()
-                        {
-                            // 鍖哄煙+鎺�+鍒�+灞�
-                            LocatNo = model.AreaNo + i.ToString().PadLeft(2, '0') + z.ToString().PadLeft(2, '0') + "01",
-                            WareHouseNo = model.HouseNo,
-                            RoadwayNo = "",
-                            AreaNo = model.AreaNo,
-                            Status = "0",
-                            AisleOne = "1",
-                            AisleTwo = "",
-                            Flag = "0",
-                            Depth = z.ToString(),
-                            Row = i,
-                            Column = z,
-                            Layer = 1,
-                            CreateUser = userId
-                        }); ;
-                    }
+                        // 鍖哄煙+鎺�+鍒�+娣卞害
+                        LocatNo = model.AreaNo + model.Row.ToString().PadLeft(3, '0') + z.ToString().PadLeft(2, '0'),
+                        WareHouseNo = model.HouseNo,
+                        RoadwayNo = "",
+                        AreaNo = model.AreaNo,
+                        Status = "0",
+                        AisleOne = "",
+                        AisleTwo = "",
+                        Flag = "0",
+                        Depth = "1",
+                        Row = model.Row,
+                        Column = z,
+                        Layer = 1,
+                        CreateUser = userId
+                    };
+                    _list.Add(locatInfo);
                 }
-
-                return q;
+                foreach (var item in _list)
+                {
+                    if (model.AisleNum > 0)
+                    {
+                        if (item.LocatNo != _list[0].LocatNo)
+                        {
+                            item.AisleOne = _list[0].LocatNo;
+                        }                        
+                        if (model.AisleNum > 1)
+                        {
+                            if (item.LocatNo != _list[model.Col-1].LocatNo)
+                            {
+                                item.AisleTwo = _list[model.Col - 1].LocatNo;
+                            }                                
+                        }
+                    }                    
+                    await LocatRst.AddAsync(item);
+                }
+                return _list.Count;
             }
             catch (Exception e)
             {
@@ -872,6 +889,6 @@
 
         }
 
-        #endregion
+        #endregion 
     }
 }

--
Gitblit v1.8.0