修改投入工序取数

UAS_MES_ODLF/DataOperate/ExcelHandler.cs

@@ -268,8 +268,8 @@ namespace UAS_MES_NEW.DataOperate
         /// <returns></returns>
         public MemoryStream DataTableToExcel_BAIDU(DataTable DataTable, DateTime begindate, int DateNum)
         {
-            string[] Step = new[] { "1-MT1", "2-MT2", "3-MMI", "4-RSA(耦合)", "5-AUD(曲线)", "6-THD(自播自录)", "7-SCK(验号)" };
-            string[] StepCode = new[] { "B_MT1", "B_MT2", "B_MMI", "B_RSA", "B_AUD", "B_THD", "B_SN", "B_OUTLOOK" };
+            string[] Step = new[] { "1-MT1", "2-MT2", "3-MMI", "4-RSA(耦合)", "5-AUD(曲线)", "6-THD(自播自录)", "7-SCK(验号)","投入数" };
+            string[] StepCode = new[] { "B_MT1", "B_MT2", "B_MMI", "B_RSA", "B_AUD", "B_THD", "B_SN", "B_OUTLOOK","B_LCDBA1" };
             string[] Kind = new[] { "测试数", "不良数", "误测数", "FPY", "RPY" };
             string[] TotalKind = new[] { "总投入数", "总不良数", "FPY", "RPY" };
             string[] OutLook = new[] { "测试数", "不良数", "FPY" };
@@ -517,7 +517,7 @@ namespace UAS_MES_NEW.DataOperate
                 {
                     int rowindex = 6 + j * 5;
                     DataTable dt = PublicMethod.BaseUtil.filterDataTable(DataTable, "sp_date='" + begindate.AddDays(i).ToString("yyyy-MM-dd") + "' and 工序编号='" + StepCode[j] + "'");
-                    if (StepCode[j] != "B_OUTLOOK")
+                    if (StepCode[j] != "B_OUTLOOK" && StepCode[j] != "B_LCDBA1")
                     {
                         for (int k = rowindex; k < rowindex + 5; k++)
                         {
@@ -536,10 +536,6 @@ namespace UAS_MES_NEW.DataOperate
                                         if (double.TryParse(dt.Rows[0]["测试数"].ToString(), out 测试数))
                                         {
                                             cell.SetCellValue(测试数);
-                                            if (StepCode[j] == "B_MT1")
-                                            {
-                                                TotalIN = 测试数;
-                                            }
                                         }
                                     }
                                     cell.CellStyle = GREY_25_PERCENT;
@@ -612,7 +608,7 @@ namespace UAS_MES_NEW.DataOperate
                             }
                         }
                     }
-                    else
+                    else if (StepCode[j] == "B_OUTLOOK")
                     {
                         for (int k = rowindex; k < rowindex + 3; k++)
                         {
@@ -631,10 +627,6 @@ namespace UAS_MES_NEW.DataOperate
                                         if (double.TryParse(dt.Rows[0]["测试数"].ToString(), out 测试数))
                                         {
                                             cell.SetCellValue(测试数);
-                                            if (StepCode[j] == "B_MT1")
-                                            {
-                                                TotalIN = 测试数;
-                                            }
                                         }
                                     }
                                     cell.CellStyle = GREY_25_PERCENT;
@@ -676,6 +668,16 @@ namespace UAS_MES_NEW.DataOperate
                             }
                         }
                     }
+                    else {
+                        double 投入数;
+                        if (dt.Rows.Count > 0)
+                        {
+                            if (double.TryParse(dt.Rows[0]["投入数"].ToString(), out 投入数))
+                            {
+                                TotalIN = 投入数;
+                            }
+                        }
+                    }
                 }
 
                 //设置最上方的总计数量

UAS_MES_ODLF/FunctionCode/Make/Make_RePrintLabel.cs

@@ -258,12 +258,12 @@ namespace UAS_MES_NEW.Make
                 //打印成功,记录日志commandlog , cl_operate彩盒或者机身标补打印，cl_result补打印成功
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱标签补打印,箱号:" + inputValue.Text, "补打印成功", inputValue.Text, "");
                 //如果pa_downstatus<>0，则更新pa_downstatus=-1 where pa_outboxcode=?code，同时插入记录至表 MAKEDOWN
-                if (mapB.Rows[0]["pa_downstatus"].ToString() == "0")
-                {
-                    dh.ExecuteSql("update package set pa_downstatus='-1' where pa_outboxcode='" + inputValue.Text + "'", "update");
-                    //插入MakeDown表
-                    putInfo2MakeDown();
-                }
+                //if (mapB.Rows[0]["pa_downstatus"].ToString() == "0")
+                //{
+                //    dh.ExecuteSql("update package set pa_downstatus='-1' where pa_outboxcode='" + inputValue.Text + "'", "update");
+                //    //插入MakeDown表
+                //    putInfo2MakeDown();
+                //}
             }
         }