浏览代码

修改计划上传提示和工作中心顺序

callm 1 月之前
父节点
当前提交
cd8931925c
共有 2 个文件被更改,包括 14 次插入6 次删除
  1. 2 2
      FileWatcher/DataHelper.cs
  2. 12 4
      FileWatcher/UploadMakePlan.cs

+ 2 - 2
FileWatcher/DataHelper.cs

@@ -32,9 +32,9 @@ namespace FileWatcher
         //public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.0.253)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         //KS
-        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11710)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         //用户选择的数据库的连接字符串
-        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11710)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
         ////ZZ
         //private string ConnectionStrings = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=172.22.100.2)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";

+ 12 - 4
FileWatcher/UploadMakePlan.cs

@@ -12,7 +12,7 @@ namespace FileWatcher
     public partial class UploadMakePlan : Form
     {
 
-        string connectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=10.1.81.208)(PORT=11710)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        string connectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=N_MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.3.7)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
 
 
         StringBuilder sql = new StringBuilder();
@@ -72,7 +72,7 @@ namespace FileWatcher
                     {
                         //Console.WriteLine($"Processing sheet: {sheetName}");
                         // 获取标题行(第4行)
-                        string wccode = sheet.GetRow(2).GetCell(2).StringCellValue; // 第4行索引为3
+                        string wccode = sheet.GetRow(2).GetCell(1).StringCellValue; // 第4行索引为3
                         if (wccode == "")
                         {
                             OperateResult.AppendText("工作中心不存在");
@@ -131,7 +131,7 @@ namespace FileWatcher
                             OperateResult.AppendText("列头缺少,请检查表结构");
                             return;
                         }
-
+                        bool GetPlan = false;
                         using (OracleConnection conn = new OracleConnection(connectionString))
                         {
                             conn.Open();
@@ -185,13 +185,21 @@ namespace FileWatcher
                                             cmd.Parameters.Add(new OracleParameter(":6", stepcode));
                                             cmd.ExecuteNonQuery();
                                         }
+                                        GetPlan = true;
                                     }
                                 }
                                 detno = detno + 1;
                             }
                         }
                         dh.ExecuteSql("delete from MakePlanDetail where mpd_orderdetno is null", "delete");
-                        OperateResult.AppendText($"Processing sheet: {sheetName}计划上传成功\n");
+                        if (GetPlan)
+                        {
+                            OperateResult.AppendText($"Processing sheet: {sheetName}计划上传成功\n");
+                        }
+                        else
+                        {
+                            OperateResult.AppendText($"Processing sheet: {sheetName}没有需要上传的计划\n");
+                        }
                     }
                 }
                 string Error = "";