修改彩盒上料打印代码

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -18,16 +18,6 @@ namespace UAS_MES.Make
         AutoSizeFormClass asc = new AutoSizeFormClass();
         //保存StepProduct查询出来的数据
         DataTable ListA = new DataTable();
-        //保存make left join makecraftdetail left join product的数据
-        DataTable mapB;
-        //保存ProductLabel数据
-        DataTable ListC;
-        //工序编号
-        string stepcode;
-        //下一工序编号
-        string nextstepcode;
-        //工艺路线编号
-        string craftcode;
         //制造单号
         string ma_code;
         //当前工单的序列号
@@ -35,7 +25,7 @@ namespace UAS_MES.Make
         //当前提示的索引
         int RemainIndex = 0;
 
-        //string Step = "Loading";
+        string ErrorMessage = "";
 
         ApplicationClass lbl;
 
@@ -69,15 +59,15 @@ namespace UAS_MES.Make
                 //LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, code.Text, User.UserCode, out Omakecode, out Omsid, out Oerrormessage)
                 //通过输入指定字符来设置当前执行的步骤
                 if (load.Checked=true)
-                {
                     OperateResult.AppendText(">>开始执行上料工序\n", Color.Green);
-                }
                 else if (unload.Checked=true)
-                {
                     OperateResult.AppendText(">>开始执行下料工序\n", Color.Green);
+                if (ms_makecode.Text == "") {
+                    if (!LogicHandler.GetMakeInfo(code.Text, out ma_code, out ErrorMessage))
+                    {
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                    }
                 }
-                //判断如果该序列号的归属工单和之前查询的是一致的话，就不进行重复数据的查询
-                ma_code = dh.getFieldDataByCondition("makeserial", "ms_makecode", "ms_sncode='" + code.Text + "'").ToString();
                 if (ms_makecode.Text != ma_code || ma_code == "")
                 {
                     //ma_code不为空的时候表示不是第一次加载，提示用户切换工单
@@ -104,14 +94,6 @@ namespace UAS_MES.Make
                     //判断当前的执行状态 ,Loading表示执行上料操作，UnLoading表示执行下料操作
                     if (load.Checked=true)
                     {
-                        sql.Clear();
-                        sql.Append("select ma_code,ma_craftcode,ms_nextstepcode, ms_status,ms_stepcode from makeserial ");
-                        sql.Append("left join make on ma_code=ms_makecode where ms_sncode=:sncode or ms_psn=:sncode");
-                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select", code.Text, code.Text);
-                        //记录一些变量
-                        stepcode = dt.Rows[0]["ms_stepcode"].ToString();
-                        nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
-                        craftcode = dt.Rows[0]["ma_craftcode"].ToString();
                         string ErrorMessage;
                         string Omakecode;
                         string Omsid;
@@ -142,14 +124,8 @@ namespace UAS_MES.Make
                                     {
                                         OperateResult.AppendText(">>请采集" + ListA.Rows[RemainIndex]["sp_soncode"].ToString() + "的条码\n", Color.Green);
                                     }
-                                    //未查询到数据时标识是测试工序
-                                    else
-                                    {
-                                        DoTestProcedure();
-                                    }
                                 }
-                                //同上，如果,iftest不等于0也进入测试工序
-                                else if (dt.Rows[0]["cd_iftest"].ToString() != "0")
+                                 if (dt.Rows[0]["cd_iftest"].ToString() != "0")
                                 {
                                     DoTestProcedure();
                                 }
@@ -166,13 +142,9 @@ namespace UAS_MES.Make
                     {
                         string ErrorMessage1 = "";
                         if (LogicHandler.SetMaterialDown(sncode.Text, code.Text,User.UserSourceCode, User.CurrentStepCode, User.UserName, out ErrorMessage1))
-                        {
                             OperateResult.AppendText(">>条码" + code.Text + "下料成功\n", Color.Green);
-                        }
                         else
-                        {
                             OperateResult.AppendText(">>" + ErrorMessage1 + "\n", Color.Red);
-                        }
                     }
                 }
                 else
@@ -202,10 +174,7 @@ namespace UAS_MES.Make
                             RemainIndex = RemainIndex + 1;
                             OperateResult.AppendText(">>请采集物料编号为" + ListA.Rows[RemainIndex]["sp_soncode"].ToString() + "的条码\n", Color.Green);
                         }
-                        else
-                        {
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                        }
+                        else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                     }
                 }
             }