召回的SN不允许站点重置，打印拆解物料数量修改

UAS_MES_YDCY/FunctionCode/Special/Special_MaterialLabel.Designer.cs

@@ -174,6 +174,7 @@
             // 
             this.PrintNum.AllPower = null;
             this.PrintNum.BackColor = System.Drawing.Color.White;
+            this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
             this.PrintNum.Location = new System.Drawing.Point(226, 620);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(6);

UAS_MES_YDCY/FunctionCode/Special/Special_MaterialLabel.cs

@@ -83,13 +83,24 @@ namespace UAS_MES_NEW.Special
         {
             if (e.KeyCode == Keys.Enter)
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select pr_detail,ms_outboxcode,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode,nvl(ms_qccheck,0)ms_qccheck from makeserial left join product on pr_code=ms_prodcode where (ms_sncode='" + sn_code.Text + "'  or ms_imei1='" + sn_code.Text + "' and ms_imei2='" + sn_code.Text + "')  order by ms_id desc", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select pr_detail,ms_outboxcode,nvl(ms_edistatus,0)ms_edistatus,ms_sncode,ms_firstsn,ms_id,ms_nextstepcode,ms_currentstepcode,ms_makecode,ms_status,ms_checkno,ms_craftcode,ms_prodcode,ms_stepcode,nvl(ms_qccheck,0)ms_qccheck from makeserial left join product on pr_code=ms_prodcode where (ms_sncode='" + sn_code.Text + "'  or ms_imei1='" + sn_code.Text + "' and ms_imei2='" + sn_code.Text + "')  order by ms_id desc", "select");
                 if (dt.Rows.Count > 0)
                 {
                     pr_code.Text = dt.Rows[0]["ms_prodcode"].ToString();
                     string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
-                    string ms_qccheck = dt.Rows[0]["ms_qccheck"].ToString();
+                    string ms_edistatus = dt.Rows[0]["ms_edistatus"].ToString();
+                    if (ms_edistatus == "0")
+                    {
+                        OperateResult.AppendText(">>序列号" + sn_code.Text + "未召回,不允许打印\n", Color.Red, sn_code);
+                        PrintNum.Text = "";
+                        return;
+                    }
                     pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
+                    dt = (DataTable)dh.ExecuteSql("select count(1) from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_remark='返工下放自动拆解' and cm_status=-1", "select");
+                    if (dt.Rows[0][0].ToString() != "0")
+                    {
+                        PrintNum.Text = dt.Rows[0][0].ToString();
+                    }
                 }
                 else OperateResult.AppendText(">>序列号" + sn_code.Text + "不存在\n", Color.Red, sn_code);
             }

UAS_MES_YDCY/FunctionCode/Special/Special_MaterialLabel.resx

@@ -177,7 +177,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN
@@ -308,7 +308,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDQAACw0B7QfALAAACdNJREFUeF7t3dtOW4cW
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAACdNJREFUeF7t3dtOW4cW
         heFe9VUibakv1/eoVGk/TFedps2hnCGAjTnYnAlgbGNzJpUqza2xgL2zmSlL4oqV8V98Fx2q190/YxwC
         30XEdwA8pQGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMNAHykAYCPNADwkQYAPtIAwEcaAPhIAwAfaQDg
         Iw0AfKQBgI80APCRBgA+0gDARxoA+EgDAB9pAOAjDQB8pAGAjzQA8JEGAD7SAMBHGgD4SAMAH2kA4CMN

UAS_MES_YDCY/FunctionCode/Special/Special_Reset.cs

@@ -60,12 +60,17 @@ namespace UAS_MES_NEW.Special
 
         private bool ReSN(string sncode, string stepcode)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select ms_paststep,ms_makecode from makeserial where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select ms_paststep,ms_makecode,nvl(ms_outstatus,0)ms_outstatus from makeserial where ms_sncode ='" + sncode + "' order by ms_id desc", "select");
             if (!dt.Rows[0]["ms_paststep"].ToString().Contains(cd_stepcode.Text))
             {
                 OperatResult.AppendText(">>序列号" + sncode + "不允许回流到未执行工序\n", Color.Red);
                 return false;
             }
+            if (dt.Rows[0]["ms_outstatus"].ToString() == "-1")
+            {
+                OperatResult.AppendText(">>序列号" + sncode + "已出货不允许回流\n", Color.Red);
+                return false;
+            }
             string makecode = dt.Rows[0]["ms_makecode"].ToString();
             string stname = dh.getFieldDataByCondition("step", "st_name", "st_code = '" + stepcode + "'").ToString();
             dh.ExecuteSql("update makeserial set ms_status=1,ms_outboxcode='',ms_printcount = 0,ms_stepcode='', ms_nextstepcode= '" + stepcode + "' where ms_sncode='" + sncode + "' and ms_makecode='" + makecode + "'", "update");