Browse Source

excel导出排序

callm 4 years ago
parent
commit
9a667665d0

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

@@ -1130,6 +1130,7 @@ namespace UAS_LabelMachine
                                 {
                                     if (ShowCountIndex == SplitBatchIndex)
                                     {
+                                        row1.CreateCell(j+1);
                                         row1.Cells[j + 1].SetCellValue(sumCount);
                                         row1.Cells[j + 1].CellStyle = styleborder;
                                     }
@@ -3580,7 +3581,7 @@ namespace UAS_LabelMachine
                                 }
                                 else if (j == ShowPieceIndex)
                                 {
-                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum - 1);
+                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
                                 else if (j == ShowCountIndex)
@@ -3610,7 +3611,7 @@ namespace UAS_LabelMachine
                                 }
                                 else if (j == ShowPieceIndex)
                                 {
-                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum - 1);
+                                    row1.Cells[ShowPieceIndex].SetCellValue(PageNum);
                                     row1.Cells[j].CellStyle = styleborder;
                                 }
                                 else if (j == ShowCountIndex)

File diff suppressed because it is too large
+ 202 - 172
UAS-出货标签管理(贸易版)/UAS_出货标签管理.Designer.cs


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

@@ -1019,7 +1019,7 @@ namespace UAS_LabelMachine
             sql.Clear();
             sql.Append("select to_char(nvl(cl_date,sysdate),'YYYY-MM-DD HH24:Mi:SS') cl_date,cl_labelname,cl_isdefault,la_id||'#'||cl_labelurl||'#'||to_char(cl_date,'YYYY-MM-DD HH24:Mi:SS') ");
             sql.Append(" la_id,cl_custcode from customerlabel left join customer on cu_code=cl_custcode left join label on la_code=CL_LABELCODE where (cl_custcode='" + cu_code.Text + "' ");
-            sql.Append(" or cl_custcode is null) and cl_labeltype='单盘' order by cl_labelname");
+            sql.Append(" or cl_custcode is null) and cl_labeltype='单盘' order by cl_custcode");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             SingleLabelCombox.DisplayMember = "cl_labelname";
             SingleLabelCombox.ValueMember = "la_id";
@@ -1097,7 +1097,7 @@ namespace UAS_LabelMachine
             sql.Clear();
             sql.Append("select to_char(nvl(cl_date,sysdate),'YYYY-MM-DD HH24:Mi:SS') cl_date,cl_labelname,cl_isdefault,la_id||'#'||cl_labelurl||'#'||to_char(cl_date,'YYYY-MM-DD HH24:Mi:SS') ");
             sql.Append(" la_id,cl_custcode from customerlabel left join customer on cu_code=cl_custcode left join label on la_code=CL_LABELCODE where (cl_custcode='" + cu_code.Text + "' ");
-            sql.Append(" or cl_custcode is null) and cl_labeltype='外箱' order by cl_labelname");
+            sql.Append(" or cl_custcode is null) and cl_labeltype='外箱' order by cl_custcode");
             dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             OutBoxCombox.DisplayMember = "cl_labelname";
             OutBoxCombox.ValueMember = "la_id";

Some files were not shown because too many files changed in this diff