有绑定关键物料不允许解绑

UAS_MES_YD/FunctionCode/Make/Make_TestCollection.cs

@@ -888,9 +888,16 @@ namespace UAS_MES_NEW.Make
             {
                 string ms_sncode = dt.Rows[0]["ms_sncode"].ToString();
                 string ms_makecode = dt.Rows[0]["ms_makecode"].ToString();
+                if (dh.getFieldDataByCondition("craftmaterial", "cm_barcode", "cm_sncode='" + ms_sncode + "' and cm_status=0").ToString() != "")
+                {
+                    MessageBox.Show("转好后已绑定关键物料，请先解绑物料!");
+                    return;
+                }
                 dh.ExecuteSql("delete from sninfo where si_sn='" + ms_sncode + "'", "delete");
                 dh.ExecuteSql("delete from makesnrelation where sn='" + ms_sncode + "' and makecode='" + ms_makecode + "'", "delete");
                 dh.ExecuteSql("update makeserial set ms_sncode=ms_firstsn,ms_imei1='',ms_imei3='',ms_imei4='',ms_mac='',ms_bt='',ms_netcode='',ms_imei2='',ms_beforesn='' where ms_sncode='" + ms_sncode + "' and ms_makecode='" + ma_code.Text + "'", "update");
+                dh.ExecuteSql("update makeimeilist set mil_sncode='',mil_status='' where mil_makecode='"+ms_makecode+"' and mil_sncode='"+ms_sncode+"'", "update");
+                dh.ExecuteSql("update makeaddresslist set mal_sncode='',mal_status='' where mal_makecode='"+ms_makecode+"' and mal_sncode='"+ms_sncode+"'", "update");
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "解绑", "解绑成功", ms_sncode, ob_checkno.Text);
                 OperateResult.AppendText(">>" + ms_sncode + "解绑成功\n", Color.Green);
             }

UAS_MES_YD/FunctionCode/Packing/Packing_CartonBoxWeigh_HAOQ.Designer.cs

@@ -235,7 +235,7 @@
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
             this.weight.Location = new System.Drawing.Point(235, 51);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(331, 148);
+            this.weight.Size = new System.Drawing.Size(360, 148);
             this.weight.TabIndex = 43;
             // 
             // label15

UAS_MES_YD/FunctionCode/Packing/Packing_CartonBoxWeigh_HAOQ.cs

@@ -67,7 +67,7 @@ namespace UAS_MES_NEW.Packing
                 this.Close();
             }
         }
-
+            
         private void 卡通箱称重_Load(object sender, EventArgs e)
         {
             CheckForIllegalCrossThreadCalls = false;

UAS_MES_YD/FunctionCode/Special/Special_CancelOQC.cs

@@ -66,7 +66,7 @@ namespace UAS_MES_NEW.Special
             if (dt.Rows.Count == 0) { OperateResult.AppendText(">>工序不在所选途程中\n"); return; }
 
             StringBuilder sql = new StringBuilder();
-            sql.Append("update craftmaterial set cm_status=-1,CM_DROPMAN='"+User.UserName+"' where  cm_stepcode in (select cd_stepcode from craft left join ");
+            sql.Append("update craftmaterial set cm_status=-1,CM_DROPMAN='" + User.UserName + "' where  cm_stepcode in (select cd_stepcode from craft left join ");
             sql.Append("craftdetail on cd_crid = cr_id where cr_prodcode = '" + ms_prodcode + "'  and cd_detno >= " + cd_stepno.Text + ") ");
             sql.Append("and cm_firstsn='" + ms_firstsn + "' and cm_makecode='" + ms_makecode + "'");
             dh.ExecuteSql(sql.ToString(), "update");
@@ -77,7 +77,7 @@ namespace UAS_MES_NEW.Special
 
             dh.ExecuteSql("update makeserial set ms_nextstepcode='" + cd_stepcode.Text + "',ms_checkno='' where ms_id='" + ms_id + "'", "update");
 
-            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "OQC回流", "回流成功" + cd_stepcode.Text, ms_sncode, ms_checkno);
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ms_makecode, User.UserLineCode, User.UserSourceCode, "OQC回流", "回流成功" + cd_stepcode.Text + "产品:" + ms_prodcode + "序号:" + cd_stepno.Text, ms_sncode, ms_checkno);
             OperateResult.AppendText(">>" + SN.Text + "回流成功\n");
             //cr_code.Text = "";
             //cd_stepcode.Text = "";