万利达MES加严装箱限制修改

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -214,10 +214,10 @@ namespace UAS_MES.Make
                                 return;
                             }
                         }
-                        if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
-                        {
-                            OperateResult.AppendText(sn_code.Text+ "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
-                            return;
+                        //if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
+                        //{
+                        //    OperateResult.AppendText(sn_code.Text+ "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
+                        //    return;
                         }
                         string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
                         if (nextstepcode != "" && nextstepcode != User.CurrentStepCode)

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -284,11 +284,11 @@ namespace UAS_MES.Make
                                 return;
                             }
                         }
-                        if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
-                        {
-                            OperateResult.AppendText(sn_code.Text + "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
-                            return;
-                        }
+                        //if (dt.Rows[0]["ms_checkpack"].ToString() != "0")
+                        //{
+                        //    OperateResult.AppendText(sn_code.Text + "处于故障品完工装箱限制状态,不允许采集装箱\n", Color.Red);
+                        //    return;
+                        //}
                         string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsID + "'").ToString();
                         if (nextstepcode != "" && nextstepcode != User.CurrentStepCode)
                         {

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -564,11 +564,11 @@ namespace UAS_MES.Make
                             return;
                         }
                         if (ms_ifrework == "0")
-                            SQLS.Add("update makeserial set ms_checkno='',ms_paststep = ms_paststep || case when instr(','||ms_paststep||',','" + User.CurrentStepCode + "')=0 then ','||'" + User.CurrentStepCode + "' end , ms_nextstepcode ='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1 where ms_id='" + msid + "'");
+                            SQLS.Add("update makeserial set ms_checkpack = -1,ms_checkno='',ms_paststep = ms_paststep || case when instr(','||ms_paststep||',','" + User.CurrentStepCode + "')=0 then ','||'" + User.CurrentStepCode + "' end , ms_nextstepcode ='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_status=1 where ms_id='" + msid + "'");
                         else
-                            SQLS.Add("update makeserial set ms_checkno='',ms_paststep = ms_paststep || case when instr(','||ms_paststep||',','" + User.CurrentStepCode + "')=0 then ','||'" + User.CurrentStepCode + "' end , ms_nextstepcode ='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_reworkstatus=1 where ms_id='" + msid + "'");
+                            SQLS.Add("update makeserial set  ms_checkpack = -1, ms_checkno='',ms_paststep = ms_paststep || case when instr(','||ms_paststep||',','" + User.CurrentStepCode + "')=0 then ','||'" + User.CurrentStepCode + "' end , ms_nextstepcode ='" + cd_stepcode.Text + "',ms_craftcode='" + cr_code.Text + "',ms_stepcode='" + User.CurrentStepCode + "',ms_reworkstatus=1 where ms_id='" + msid + "'");
                     }
-                    SQLS.Add("update makebad set mb_status=-1,ms_checkpack = -1 where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ms_makecode.Text + "'");
+                    SQLS.Add("update makebad set mb_status=-1 where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ms_makecode.Text + "'");
                     //取消最近拆解部件
                     SQLS.Add("update craftmaterial set cm_lastdeco=0 where cm_sncode='" + ms_sncode.Text + "' and cm_makecode='" + ms_makecode.Text + "' and nvl(cm_lastdeco,0)<>0");           
                     dh.ExecuteSQLTran(SQLS.ToArray());