限制生产前缀

UAS_MES_ODLF/FunctionCode/Packing/Packing_PackageCollection.cs

@@ -1109,11 +1109,13 @@ namespace UAS_MES_NEW.Packing
             {
                 OutBoxLength.Enabled = false;
                 PreFix.Enabled = false;
+                pa_outboxcode.Enabled = false;
             }
             else
             {
                 OutBoxLength.Enabled = true;
                 PreFix.Enabled = true;
+                pa_outboxcode.Enabled = true;
             }
         }
     }

UAS_MES_ODLF/FunctionCode/Packing/Packing_PackageCollection1.cs

@@ -54,7 +54,7 @@ namespace UAS_MES_NEW.Packing
 
         private void PackCollection_Load(object sender, EventArgs e)
         {
-           // 杀死之前全部未关闭的进程
+            // 杀死之前全部未关闭的进程
             Process[] processes = System.Diagnostics.Process.GetProcessesByName("lppa");
             Process[] processes1 = System.Diagnostics.Process.GetProcessesByName("bartend");
             for (int i = 0; i < processes1.Length; i++)
@@ -185,15 +185,15 @@ namespace UAS_MES_NEW.Packing
         {
             //try
             //{
-                if (e.KeyCode == Keys.Enter)
+            if (e.KeyCode == Keys.Enter)
+            {
+                LoadData();
+                LoadGridData();
+                if (CheckOutBoxLength())
                 {
-                    LoadData();
-                    LoadGridData();
-                    if (CheckOutBoxLength())
-                    {
-                        sn_code.Focus();
-                    }
+                    sn_code.Focus();
                 }
+            }
             //}
             //catch (Exception ex)
             //{
@@ -236,7 +236,7 @@ namespace UAS_MES_NEW.Packing
                         }
                     }
                 }
-                dt = (DataTable)dh.ExecuteSql("select mil_imei1 from Makeimeilist where mil_psn='"+sn_code.Text+ "' and mil_makecode='T1030B-1025' order by mil_id desc", "select");
+                dt = (DataTable)dh.ExecuteSql("select mil_imei1 from Makeimeilist where mil_psn='" + sn_code.Text + "' and mil_makecode='T1030B-1025' order by mil_id desc", "select");
                 if (dt.Rows.Count > 0)
                 {
                     sn_code.Text = dt.Rows[0]["mil_imei1"].ToString();
@@ -246,7 +246,7 @@ namespace UAS_MES_NEW.Packing
                     dt = (DataTable)dh.ExecuteSql("select ms_status,ms_id,ms_makecode,ms_nextstepcode,ms_craftcode,ms_prodcode from makeserial where ms_sncode ='" + sn_code.Text + "' order by ms_id desc", "select");
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage) || (dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                     {
-                        if (oMsID == "" || oMsID == "null" || oMsID == "0") 
+                        if (oMsID == "" || oMsID == "null" || oMsID == "0")
                         {
                             oMsID = dt.Rows[0]["ms_id"].ToString();
                             oMsStatus = dt.Rows[0]["ms_status"].ToString();
@@ -277,7 +277,7 @@ namespace UAS_MES_NEW.Packing
                         PR_CHECKCARTONW = dh.getFieldDataByCondition("craftdetail left join craft on cr_id=cd_crid left join makeserial on ms_craftcode =cr_code and cr_prodcode = ms_prodcode", "nvl(cd_ifweigh,'0') cd_ifweigh", "ms_sncode='" + sn_code.Text + "' and ms_makecode='" + oMakeCode + "' and cd_stepcode = '" + User.CurrentStepCode + "'").ToString();
                         //获取序列号信息
                         sql.Clear();
-                        sql.Append("select nvl(ms_iostatus,0) ms_iostatus,pa_salecode,ms_salecode,ms_outno,ms_makecode,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
+                        sql.Append("select nvl(ms_iostatus,0) ms_iostatus,pa_salecode,ms_salecode,ms_outno,ms_makecode,PR_OUTBOXRULE,ms_prodcode,nvl(pa_downstatus,0) pa_downstatus,pa_sccode,pa_checkno,pr_packrule,");
                         sql.Append("nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype from makeserial left join product on ms_prodcode=pr_code left join packagedetail ");
                         sql.Append("on pd_barcode=ms_sncode left join package on pa_id =pd_paid where ms_id='" + oMsID + "'");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
@@ -286,14 +286,20 @@ namespace UAS_MES_NEW.Packing
                         string ms_iostatus = "";
                         string ms_outno = "";
                         string ms_salecode_text = "";
+                        string PR_OUTBOXRULE = "";
                         if (dt.Rows.Count > 0)
                         {
+                            PR_OUTBOXRULE = dt.Rows[0]["PR_OUTBOXRULE"].ToString();
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
                             ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
                             ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
                             ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
                             ms_outno = dt.Rows[0]["ms_outno"].ToString();
                             ms_salecode_text = dt.Rows[0]["ms_salecode"].ToString();
+                            if (PR_OUTBOXRULE != "")
+                            {
+                                PreFix.Text = PR_OUTBOXRULE;
+                            }
                             if (locksalecode.Checked && ms_salecode.Text != "" && ms_salecode.Text != ms_salecode_text)
                             {
                                 OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号" + ms_salecode_text + "与界面订单号" + ms_salecode.Text + "不同,无法采集\n", Color.Red, sn_code);
@@ -425,7 +431,7 @@ namespace UAS_MES_NEW.Packing
                                     pa_outboxcode.Text = LogicHandler.GetOutBoxCode1("PACKAGE", ms_makecode, pr_code.Text, User.UserCode);
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "卡通箱采集", "卡通箱" + pa_outboxcode.Text + "自动生成", sn_code.Text, PreFix.Text + ":" + OutBoxLength.Text);
                                 }
-                                if (!CheckOutBoxLength(ms_salecode_text))
+                                if (!CheckOutBoxLength())
                                 {
                                     return;
                                 }
@@ -1111,11 +1117,13 @@ namespace UAS_MES_NEW.Packing
             {
                 OutBoxLength.Enabled = false;
                 PreFix.Enabled = false;
+                pa_outboxcode.Enabled = false;
             }
             else
             {
                 OutBoxLength.Enabled = true;
                 PreFix.Enabled = true;
+                pa_outboxcode.Enabled = true;
             }
         }
     }

UAS_MES_ODLF/FunctionCode/Packing/Packing_PackageCollection2.cs

@@ -1111,11 +1111,13 @@ namespace UAS_MES_NEW.Packing
             {
                 OutBoxLength.Enabled = false;
                 PreFix.Enabled = false;
+                pa_outboxcode.Enabled = false;
             }
             else
             {
                 OutBoxLength.Enabled = true;
                 PreFix.Enabled = true;
+                pa_outboxcode.Enabled = true;
             }
         }
     }

UAS_MES_ODLF/FunctionCode/Packing/Packing_PackageCollectionWeigh.cs

@@ -1045,11 +1045,13 @@ namespace UAS_MES_NEW.Packing
             {
                 OutBoxLength.Enabled = false;
                 PreFix.Enabled = false;
+                pa_outboxcode.Enabled = false;
             }
             else
             {
                 OutBoxLength.Enabled = true;
                 PreFix.Enabled = true;
+                pa_outboxcode.Enabled = true;
             }
         }
     }