SMT排位图导出修改

UAS_MES_LGDZ/DataOperate/ExcelHandler.cs

@@ -90,8 +90,8 @@ namespace UAS_MES_NEW.DataOperate
             {
                 if (DataTable.Rows[i]["STF_MACHINE"].ToString() != "" && DataTable.Rows[i]["STF_MACHINE"].ToString() != "***" && i != DataTable.Rows.Count - 1)
                 {
-                    Console.WriteLine(DataTable.Rows[i]["STF_MACHINE"].ToString());
-                    Console.WriteLine(DataTable.Rows[i + 1]["STF_MACHINE"].ToString());
+                    Console.WriteLine("机台" + DataTable.Rows[i]["STF_MACHINE"].ToString());
+                    Console.WriteLine("下一行机台" + DataTable.Rows[i + 1]["STF_MACHINE"].ToString());
                     ISheet sheet1 = book.CreateSheet(DataTable.Rows[i]["STF_MACHINE"].ToString() + "-" + DataTable.Rows[i + 1]["STF_MACHINE"].ToString().Substring(0, 1));
                     SheetName = DataTable.Rows[i]["STF_MACHINE"].ToString() + "-" + DataTable.Rows[i + 1]["STF_MACHINE"].ToString().Substring(0, 1);
                     IRow row1 = sheet1.CreateRow(0);
@@ -256,7 +256,7 @@ namespace UAS_MES_NEW.DataOperate
                         row.CreateCell(5);
                         row.CreateCell(6);
                         row.CreateCell(7);
-                        Console.WriteLine(DataTable.Rows[i]["STF_MODEL"].ToString() + " " + DataTable.Rows[i]["STF_FEEDER"].ToString() + " " + DataTable.Rows[i]["STF_FEEDERNO"].ToString());
+                        //Console.WriteLine(DataTable.Rows[i]["STF_MODEL"].ToString() + " " + DataTable.Rows[i]["STF_FEEDER"].ToString() + " " + DataTable.Rows[i]["STF_FEEDERNO"].ToString());
                         for (int k = i+1; k < DataTable.Rows.Count; k++)
                         {
                             if (k < DataTable.Rows.Count && DataTable.Rows[k]["STF_MODEL"].ToString() == "" &&

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -197,6 +197,14 @@ namespace UAS_MES_NEW.Make
                                     OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测未通过\n", Color.Red);
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量不合格", sncode.Text, "");
                                     LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
+                                    //dh.ExecuteSql("update makeserial set ms_downstatus=-1 where ms_id='" + oMsID + "'", "update");
+                                    //string md_code = "";
+                                    //LogicHandler.GetSerialNumByCaller("MakeDown", out md_code);
+                                    //sql.Clear();
+                                    //sql.Append("INSERT INTO MAKEDOWN (MD_ID,MD_LINECODE,MD_SCCODE,MD_STEPCODE,");
+                                    //sql.Append("MD_SNCODE,MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
+                                    //sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) values (MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
+                                    //sql.Append("'" + User.CurrentStepCode + "','" + sncode.Text + "','" + pr_code.Text + "','" + ma_code.Text + "','称重不合格','" + md_code + "',sysdate,'" + User.UserCode + "','-1')");
                                     //SetCheck set = new SetCheck("NG", Color.Red);
                                     //BaseUtil.SetFormCenter(set);
                                     //set.ShowDialog();

UAS_MES_LGDZ/FunctionCode/Make/Make_ColorBoxWeigh_ReadLine.cs

@@ -194,6 +194,15 @@ namespace UAS_MES_NEW.Make
                                 else
                                 {
                                     OperateResult.AppendText(">>彩盒" + sncode.Text + "重量检测未通过\n", Color.Red);
+                                    //dh.ExecuteSql("update makeserial set ms_downstatus=-1 where ms_id='" + oMsID + "'", "update");
+                                    //string md_code = "";
+                                    //LogicHandler.GetSerialNumByCaller("MakeDown", out md_code);
+                                    //sql.Clear();
+                                    //sql.Append("INSERT INTO MAKEDOWN (MD_ID,MD_LINECODE,MD_SCCODE,MD_STEPCODE,");
+                                    //sql.Append("MD_SNCODE,MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
+                                    //sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) values (MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
+                                    //sql.Append("'" + User.CurrentStepCode + "','" + sncode.Text + "','" + pr_code.Text + "','" + ma_code.Text + "','称重不合格','" + md_code + "',sysdate,'" + User.UserCode + "','-1')");
+                                    //dh.ExecuteSql(sql.GetString(), "insert");
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "彩盒称重:" + weight.Text, "称量不合格", sncode.Text, "");
                                     LogicHandler.RecordProdWeight(sncode.Text, "SN", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
                                     //SetCheck set = new SetCheck("NG", Color.Red);

UAS_MES_LGDZ/FunctionCode/Query/Query_SpecialReport.cs

@@ -224,7 +224,7 @@ namespace UAS_MES_NEW.Query
                     "'" + custname.Text + "','" + spec.Text + "','" + bomversion.Text + "',to_date('" + workdate.Value.ToString("yyyy-MM-dd") + "','yyyy-mm-dd'),'" + softname.Text + "','" + filecode.Text + "'," +
                     "to_date('" + releasedate.Value.ToString("yyyy-MM-dd") + "','yyyy-mm-dd'),'" + tableab.Text + "','" + ecn.Text + "','" + machinename.Text + "','" + mademan.Text + "')",
                     new string[] { "STF_MODEL", "STF_FEEDER", "STF_FEEDERNO", "STF_LOCATION", "STF_MACHINE" }, STF_MODEL.ToArray(), STF_FEEDER.ToArray(), STF_FEEDERNO.ToArray(), STF_LOCATION.ToArray(), STF_MACHINE.ToArray());
-                dh.ExecuteSql("delete from SMTTRACEFILE where ( STF_MODEL is null and  STF_FEEDER is null and STF_FEEDERNO is null and STF_MACHINE is null ) or stf_model in ('料槽','数量','印刷板') or STF_MACHINE in('贴片生产线：','设置：','***') ", "delete");
+                dh.ExecuteSql("delete from SMTTRACEFILE where ( STF_MODEL is null and  STF_FEEDER is null and STF_FEEDERNO is null and STF_MACHINE is null ) or stf_model in ('料槽','数量','印刷板') or STF_MACHINE in('贴片生产线：','设置：','***') or instr(STF_MACHINE,'/')>0 ", "delete");
                 dataGridView1.DataSource = dt;
                 //DataTable dt1 = (DataTable)dh.ExecuteSql("select STF_ID, STF_MODEL,STF_MACHINE, STF_FEEDER, STF_FEEDERNO, STF_LOCATION,replace(pr_orispeccode,' ','\n')pr_orispeccode,bo_mothercode,bd_baseqty,bd_soncode,bd_location, STF_CODE, STF_INDATE, STF_INMAN,sumqty from SMTTRACEFILE left join (select bo_mothercode,bd_baseqty,bd_soncode,replace(bd_location,',',' ')bd_location from BOMDetail LEFT JOIN bom on bd_bomid=bo_id left join Product ON bd_soncode=pr_code where bo_mothercode='" + pr_code.Text + "' ) on bo_mothercode=stf_prodcode and bd_soncode=STF_LOCATION left join product on pr_code=STF_LOCATION " +
                 //    "left join (select sum(bd_baseqty)-1 sumqty,bo_mothercode mothercode from BOMDetail LEFT JOIN bom on bd_bomid=bo_id left join Product ON bd_soncode=pr_code where bo_mothercode='" + pr_code.Text + "' group by bo_mothercode)on mothercode=bo_mothercode where stf_prodcode='" + pr_code.Text + "' order by stf_id", "select");