BUG调整

UAS-出货标签管理(贸易版)/ExportColumns.cs

@@ -167,6 +167,7 @@ namespace UAS_LabelMachine
 
         private void LoadData()
         {
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
             StringBuilder sql = new StringBuilder();
             custcode = dh.getFieldDataByCondition("prodinout", "pi_cardcode", "pi_inoutno='" + inoutno + "'").ToString();
             DataTable SQL1_ = (DataTable)dh.ExecuteSql("select es_filed,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='DataPage' and es_enable=-1 and es_custcode='" + custcode + "' and nvl(es_istitle,0)<>-1 order by es_detno", "select");
@@ -175,15 +176,23 @@ namespace UAS_LabelMachine
             {
                 SQL1_ = (DataTable)dh.ExecuteSql("select es_filed,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='DataPage' and es_enable=-1 and es_custcode is null  and nvl(es_istitle,0)<>-1 order by es_detno", "select");
             }
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
+
             string es_field1 = "";
             for (int i = 0; i < SQL1_.Rows.Count; i++)
             {
                 es_field1 += SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString() + ",";
             }
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
+
             //分页信息的DataTable
             string datasql = "";
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
             LogicHandler.GetDataSQL(inoutno, es_field1.Substring(0, es_field1.Length - 1), out datasql);
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
             DataTable dt = (DataTable)dh.ExecuteSql(datasql, "select");
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
+
             for (int i = 0; i < dt.Columns.Count; i++)
             {
                 if (dt.Columns[i].ColumnName == (SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString()).ToUpper())
@@ -198,6 +207,8 @@ namespace UAS_LabelMachine
             {
                 SQL_ = (DataTable)dh.ExecuteSql("select es_filed,es_datatype,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='First' and es_enable=-1 and es_custcode is null and  nvl(es_istitle,0)<>-1 order by es_detno", "select");
             }
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
+
             string es_field = "";
             for (int i = 0; i < SQL_.Rows.Count; i++)
             {
@@ -215,6 +226,8 @@ namespace UAS_LabelMachine
                     dt1.Columns[i].ColumnName = SQL_.Rows[i]["es_caption"].ToString();
                 }
             }
+            Console.WriteLine(DateTime.Now.ToString("yyyy/MM/dd h:mm:ss.fff"));
+
             if (FirstPage.DataSource != null)
                 FirstPage.DataSource = null;
             if (DataPage.DataSource != null)

UAS-出货标签管理(贸易版)/PublicMethod/ExcelHandler.cs

@@ -278,7 +278,8 @@ namespace UAS_LabelMachine
             HSSFWorkbook book = new HSSFWorkbook();
             //Excel中的Sheet
             ISheet sheet = book.CreateSheet("分页");
-
+            //芯片号需要作为更新盒号的条件
+            bool ShowChcode = true;
             //更新箱号
             List<string> ch_code = new List<string>();
             //系统打印箱号
@@ -314,7 +315,7 @@ namespace UAS_LabelMachine
                     {
                         if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_code"))
                         {
-                            DataTable.Columns.RemoveAt(i);
+                            ShowChcode = true;
                             break;
                         }
                     }
@@ -546,7 +547,7 @@ namespace UAS_LabelMachine
                                     else
                                         row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
                                     //如果chw_itemname1的值为空，则值为100和0，其中一列不显示，不显示
-                                    if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_orispeccode") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode"))
+                                    if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_orispeccode") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode")||(!ShowChcode&&DataTable.Columns[j].ColumnName.ToLower().Contains("ch_code")))
                                     {
                                         sheet.SetColumnHidden(j - 4, true);
                                     }
@@ -754,7 +755,7 @@ namespace UAS_LabelMachine
                                     }
                                     else
                                         row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
-                                    if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_orispeccode") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode"))
+                                    if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_orispeccode") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode")||(!ShowChcode && DataTable.Columns[j].ColumnName.ToLower().Contains("ch_code")))
                                     {
                                         sheet.SetColumnHidden(j - 4, true);
                                     }
@@ -961,7 +962,7 @@ namespace UAS_LabelMachine
                                     }
                                     else
                                         row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
-                                    if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_orispeccode") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode"))
+                                    if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_orispeccode") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode")||(!ShowChcode && DataTable.Columns[j].ColumnName.ToLower().Contains("ch_code")))
                                     {
                                         sheet.SetColumnHidden(j - 4, true);
                                     }