修改维修返工

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -163,6 +163,9 @@ namespace UAS_MES.Make
                                         dh.ExecuteSql("update package set pa_makecode='" + carton_macode + "' where pa_outboxcode='" + bigoutboxcode.Text + "'", "update");
                                     }
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserSourceCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "大箱采集", "卡通箱" + outboxcode.Text + "采集成功", outboxcode.Text, "");
+                                    //记录卡通箱所有序列号操作日志
+                                    LogicHandler.OutBoxStepPass(outboxcode.Text, pa_makecode.Text, User.UserSourceCode, User.UserCode, "大箱采集成功，大箱号:" + bigoutboxcode.Text, "大箱采集");
+                                    //
                                     OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
                                     LoadGridData();
                                     LoadCollectNum();

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -148,6 +148,9 @@ namespace UAS_MES.Make
                                     pa_makecode.Text = carton_macode;
                                     dh.ExecuteSql("update package set pa_makecode='" + carton_macode + "' where pa_outboxcode='" + palletcode.Text + "'", "update");
                                 }
+                                //已箱号过站
+                                LogicHandler.OutBoxStepPass(outboxcode.Text, pa_makecode.Text, User.UserSourceCode,User.UserSourceCode,"栈板采集成功，栈板号:"+palletcode.Text,"栈板采集");
+                                LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,"",User.UserLineCode,User.UserSourceCode,"栈板采集","栈板采集成功",palletcode.Text,"");
                                 OperateResult.AppendText(">>箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
                                 LoadGridData();
                             }

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -133,7 +133,7 @@ namespace UAS_MES.Make
                     return;
                 }
                 sql.Clear();
-                sql.Append("select ma_kind,ms_status,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
+                sql.Append("select ms_status,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework from makeserial left join make ");
                 sql.Append("on ms_makecode=ma_code where ms_sncode = '" + GetSNCode.Text + "' order by ms_id desc");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 if (dt.Rows.Count > 0)
@@ -228,7 +228,6 @@ namespace UAS_MES.Make
         private void Make_Repair_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
-
         }
 
         private void BadCodeTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
@@ -274,10 +273,19 @@ namespace UAS_MES.Make
         {
             BadCodeTree.Nodes.Clear();
             sql.Clear();
+            //不是返工工单时的取当前工单
             sql.Append("select mb_id,mb_sncode,mb_badcode,mb_bgcode,nvl(bc_name,mb_badcode) bc_name,nvl(bg_name,mb_bgcode) bg_name,");
             sql.Append("mb_badremark from makebad left join badcode on bc_code=mb_badcode left join badgroup ");
             sql.Append("on bg_code=mb_bgcode where mb_sncode='" + (GetSNCode.Text == "" ? ms_sncode.Text : GetSNCode.Text) + "' and mb_makecode='" + macode + "' and mb_status=0");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count == 0)
+            {
+                sql.Clear();
+                sql.Append("select mb_id,mb_sncode,mb_badcode,mb_bgcode,nvl(bc_name,mb_badcode) bc_name,nvl(bg_name,mb_bgcode) bg_name, ");
+                sql.Append("mb_badremark from makebad left join badcode on bc_code=mb_badcode left join badgroup on bg_code=mb_bgcode  ");
+                sql.Append("left join make on ma_code=mb_makecode where mb_sncode='" + (GetSNCode.Text == "" ? ms_sncode.Text : GetSNCode.Text) + "' and mb_makecode<>'" + macode + "' and mb_status=0");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            }
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 //添加根节点
@@ -431,7 +439,8 @@ namespace UAS_MES.Make
                     {
                         string ms_ifrework = dt.Rows[0]["ms_ifrework"].ToString();
                         string ms_paststep = dt.Rows[0]["ms_paststep"].ToString();
-                        if (!ms_paststep.Contains(cd_stepcode.Text))
+                        //如果回流的执行过的工序为空
+                        if (!ms_paststep.Contains(cd_stepcode.Text) && ms_paststep != "")
                         {
                             OperatResult.AppendText(">>不允许回流到未执行的工序\n", Color.Red);
                             return;