Explorar el Código

去除删除不了原因

callm hace 1 mes
padre
commit
8fb848d02a

+ 1 - 1
UAS_MES_XMW/FunctionCode/Make/Make_Repair.cs

@@ -682,7 +682,6 @@ namespace UAS_MES_NEW.Make
                             else
                             {
                                 sqls.Clear();
-                                sqls.Add("delete from makebadreason where mbr_sncode='"+ ms_sncode.Text + "'");
                                 sqls.Add("update makeserial set ms_paststep = ms_paststep ||'," + User.CurrentStepCode + "',ms_status=4,ms_reworkstatus= 4,ms_nextstepcode='',ms_stepcode='" + User.CurrentStepCode + "' where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
                                 sqls.Add("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + ms_reworkcheckno.Text + "'");
                                 sqls.Add("delete from oqcbatchdetail where obd_sncode='" + ms_sncode.Text + "' and obd_checkno='" + ms_reworkcheckno.Text + "'");
@@ -1089,6 +1088,7 @@ namespace UAS_MES_NEW.Make
                         OperatResult.AppendText(">>SN" + ms_sncode.Text + "不处于报废状态,不允许取消报废\n", Color.Red);
                         return;
                     }
+                    //dh.ExecuteSql("delete from makebadreason where mbr_sncode='" + ms_sncode.Text + "'", "delete");
                     OperatResult.AppendText(">>SN" + ms_sncode.Text + "取消报废成功\n", Color.Green);
                     sqls.Add("update makeserial set ms_paststep = ms_paststep ||'," + User.CurrentStepCode + "',ms_status=3,ms_reworkstatus= '',ms_nextstepcode='',ms_stepcode='" + User.CurrentStepCode + "' where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
                     dh.ExecuteSQLTran(sqls.ToArray());

+ 3 - 1
UAS_MES_ZKLH/FunctionCode/Query/Query_SOP.cs

@@ -129,7 +129,7 @@ namespace UAS_MES_NEW.Query
                             Worksheet she = workbook.Worksheets[i];
 
                             // 获取原表的实际数据范围和最大列
-                            int totalRows = she.Cells.MaxDataRow;
+                            int totalRows = she.Cells.MaxDataRow+1;
                             int lastColIndex = she.Cells.MaxDataColumn + 5;
                             string lastColLetter = CellsHelper.ColumnIndexToName(lastColIndex);
 
@@ -168,10 +168,12 @@ namespace UAS_MES_NEW.Query
                                 // 1. 动态设置原表的打印区域(模拟切片)
                                 if (endRow < rowSliceSize)
                                 {
+                                    Console.WriteLine($"A{startRow + 1}:{lastColLetter}{rowSliceSize + 1}");
                                     she.PageSetup.PrintArea = $"A{startRow + 1}:{lastColLetter}{rowSliceSize + 1}";
                                 }
                                 else
                                 {
+                                    Console.WriteLine($"A{startRow + 1}:{lastColLetter}{endRow + 1}");
                                     she.PageSetup.PrintArea = $"A{startRow + 1}:{lastColLetter}{endRow + 1}";
                                 }