From 7313ce7591cb7e969069d20aca05ac02be4e8ba1 Mon Sep 17 00:00:00 2001
From: lenovo <lenovo@LC>
Date: Sun, 27 Apr 2025 15:16:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E5=B7=B7=E9=81=93=E9=80=BB=E8=BE=91=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E7=9C=8B=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F=EF=BC=8C=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BB=BB=E5=8A=A1=E6=95=B0=E5=B0=91=E7=9A=84=E5=B7=B7?=
 =?UTF-8?q?=E9=81=93=E8=BF=9B=E8=A1=8C=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SiaSun.LMS.Implement/S_CellService.cs         | 40 +++++++++++--------
 SiaSun.LMS.WCFHost/HouseMap.config            |  2 +-
 SiaSun.LMS.WCFHost/SiaSun.LMS.WCFHost.csproj  |  2 +-
 .../SiaSun.LMS.WPFClient.csproj               |  2 +-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/SiaSun.LMS.Implement/S_CellService.cs b/SiaSun.LMS.Implement/S_CellService.cs
index 0810655..ad63b51 100644
--- a/SiaSun.LMS.Implement/S_CellService.cs
+++ b/SiaSun.LMS.Implement/S_CellService.cs
@@ -511,20 +511,26 @@ namespace SiaSun.LMS.Implement
                     su[i] = dt_nohave.Rows.Count;//记库存数
                     sm[i] = dt_manage_num.Rows.Count;//记任务数
                 }
+                #region 原入库分配巷道逻辑
+                //int iMinIndex = 0;
+                //for (int i = 1; i < dt_laneway.Rows.Count; ++i)
+                //{
+                //    if (sm[i] < sm[iMinIndex])
+                //    {
+                //        iMinIndex = i;
+                //    }
+                //    else if (sm[i] == sm[iMinIndex] && su[i] > su[iMinIndex])
+                //    {
+                //        iMinIndex = i;
+                //    }
+                //}
+                //DEVICE_CODE = Convert.ToInt32(dt_laneway.Rows[iMinIndex]["DEVICE_CODE"]);
+                #endregion
 
-                int iMinIndex = 0;
-                for (int i = 1; i < dt_laneway.Rows.Count; ++i)
-                {
-                    if (sm[i] < sm[iMinIndex])
-                    {
-                        iMinIndex = i;
-                    }
-                    else if (sm[i] == sm[iMinIndex] && su[i] > su[iMinIndex])
-                    {
-                        iMinIndex = i;
-                    }
-                }
-                DEVICE_CODE = Convert.ToInt32(dt_laneway.Rows[iMinIndex]["DEVICE_CODE"]);
+                #region 新入库分配巷道逻辑
+                index_n = SiaSun.LMS.Common.StringUtil.CheckMin(sm);
+                DEVICE_CODE = Convert.ToInt32(dt_laneway.Rows[index_n]["DEVICE_CODE"]);
+                #endregion
                 //index = SiaSun.LMS.Common.StringUtil.CheckMin(su);
                 //index_n = SiaSun.LMS.Common.StringUtil.CheckMin(sm);
 
@@ -539,12 +545,12 @@ namespace SiaSun.LMS.Implement
 
                 ////优先入库双伸巷道的空货位数
                 //DataTable dt_cellnear = this.GetList(string.Format(@"SELECT CELL_ID
-			             //                                              FROM WH_CELL
-		              //                                                 WHERE DEVICE_CODE = {0} 
+                //                                              FROM WH_CELL
+                //                                                 WHERE DEVICE_CODE = {0} 
                 //                                                       AND CELL_STATUS = 'Nohave'
-					           //                                        AND RUN_STATUS = 'Enable'
+                //                                        AND RUN_STATUS = 'Enable'
                 //                                                       AND CELL_FORK_TYPE = 'Near'
-					           //                                        AND CELL_TYPE ='Cell'", DEVICE_CODE));
+                //                                        AND CELL_TYPE ='Cell'", DEVICE_CODE));
                 //if (dt_cellnear.Rows.Count == 2)
                 //{
                 //    bResult = false;
diff --git a/SiaSun.LMS.WCFHost/HouseMap.config b/SiaSun.LMS.WCFHost/HouseMap.config
index 7a4848c..f79dd33 100644
--- a/SiaSun.LMS.WCFHost/HouseMap.config
+++ b/SiaSun.LMS.WCFHost/HouseMap.config
@@ -8,7 +8,7 @@
   <database>	  
     <provider name="sqlServer2.0"/>
     <!--<dataSource name="SqlMap" connectionString="server=192.168.0.203;database=SSWMS_YCHYCP;uid=sa;pwd=`123qwe"/>-->
-    <dataSource name="SqlMap" connectionString="server=.;database=SSWMS_YCHYCP;uid=sa;pwd=`123qwe"/>
+    <dataSource name="SqlMap" connectionString="server=.;database=SSWMS_YCHYCP;uid=sa;pwd=1"/>
     
    <!--<provider name="oracleClient1.0"/>-->
     <!--<dataSource name="SqlMap" connectionString=" data source= (DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = YUBINBIN_VM_XP)(PORT = 1521))(CONNECT_DATA=(SERVER = YUBINBIN_VM_XP)(SERVICE_NAME = orcl)));User ID=test;Password=1;Unicode=true;Pooling=true;"/>-->
diff --git a/SiaSun.LMS.WCFHost/SiaSun.LMS.WCFHost.csproj b/SiaSun.LMS.WCFHost/SiaSun.LMS.WCFHost.csproj
index 7e5e88e..5072578 100644
--- a/SiaSun.LMS.WCFHost/SiaSun.LMS.WCFHost.csproj
+++ b/SiaSun.LMS.WCFHost/SiaSun.LMS.WCFHost.csproj
@@ -65,7 +65,7 @@
     <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
diff --git a/SiaSun.LMS.WPFClient/SiaSun.LMS.WPFClient.csproj b/SiaSun.LMS.WPFClient/SiaSun.LMS.WPFClient.csproj
index fa3d9bb..cb1d8d5 100644
--- a/SiaSun.LMS.WPFClient/SiaSun.LMS.WPFClient.csproj
+++ b/SiaSun.LMS.WPFClient/SiaSun.LMS.WPFClient.csproj
@@ -77,7 +77,7 @@
     <ManifestKeyFile>SiaSun.LMS.WPFClient_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>false</SignManifests>