添加途程相对条件

UAS-MES/FunctionCode/Make/Make_FeedingCollection.Designer.cs

@@ -222,6 +222,8 @@
             // ma_softversion_label
             // 
             this.ma_softversion_label.AutoSize = true;
+            this.ma_softversion_label.Checked = true;
+            this.ma_softversion_label.CheckState = System.Windows.Forms.CheckState.Checked;
             this.ma_softversion_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ma_softversion_label.Location = new System.Drawing.Point(907, 226);
             this.ma_softversion_label.Margin = new System.Windows.Forms.Padding(4);
@@ -234,6 +236,8 @@
             // ma_ecncode_label
             // 
             this.ma_ecncode_label.AutoSize = true;
+            this.ma_ecncode_label.Checked = true;
+            this.ma_ecncode_label.CheckState = System.Windows.Forms.CheckState.Checked;
             this.ma_ecncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ma_ecncode_label.Location = new System.Drawing.Point(907, 278);
             this.ma_ecncode_label.Margin = new System.Windows.Forms.Padding(4);
@@ -351,6 +355,7 @@
             this.ma_softversion.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ma_softversion.BackColor = System.Drawing.Color.White;
+            this.ma_softversion.Enabled = false;
             this.ma_softversion.ID = null;
             this.ma_softversion.Location = new System.Drawing.Point(1029, 226);
             this.ma_softversion.Margin = new System.Windows.Forms.Padding(4);
@@ -368,6 +373,7 @@
             this.ma_ecncode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ma_ecncode.BackColor = System.Drawing.Color.White;
+            this.ma_ecncode.Enabled = false;
             this.ma_ecncode.ID = null;
             this.ma_ecncode.Location = new System.Drawing.Point(1029, 282);
             this.ma_ecncode.Margin = new System.Windows.Forms.Padding(4);
@@ -554,10 +560,10 @@
             this.Text = "上料采集";
             this.Load += new System.EventHandler(this.Make_FeedingCollection_Load);
             this.SizeChanged += new System.EventHandler(this.Make_FeedingCollection_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -954,7 +954,7 @@ namespace UAS_MES.PublicMethod
             sql.Append(",mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_status,mb_badremark,mb_bgname,mb_badname)");
             sql.Append("select makebad_seq.nextval,ma_code,ms_code,ms_sncode,'" + iUserCode + "',sysdate,'" + StepCode + "','" + iSourceCode + "',:bc_code,:bg_code,'',");
             sql.Append("sp_soncode,'0',:bc_remark,:bg_name,:bc_name from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
-            sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+            sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode and sp_craftcode=ms_craftcode where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
             dh.BatchInsert(sql.ToString(), new string[] { "bc_code", "bg_code", "bc_remark", "bg_name", "bc_name" }, iBadCode, iBadGroupCode, iBadRemark, iBadGroupName, iBadName);
             //更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
             //如果存在送检批号则进行删除