修改工单条码用作序列号条件

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

@@ -62,6 +62,7 @@
             this.ms_craftcode = new System.Windows.Forms.Label();
             this.ma_bomversion = new System.Windows.Forms.Label();
             this.ma_bomversion_label = new System.Windows.Forms.Label();
+            this.ma_craftcode = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.ClearSn_code)).BeginInit();
             this.SuspendLayout();
@@ -497,11 +498,23 @@
             this.ma_bomversion_label.TabIndex = 144;
             this.ma_bomversion_label.Text = "Bom版本";
             // 
+            // ma_craftcode
+            // 
+            this.ma_craftcode.AutoSize = true;
+            this.ma_craftcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_craftcode.Location = new System.Drawing.Point(1006, 114);
+            this.ma_craftcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ma_craftcode.Name = "ma_craftcode";
+            this.ma_craftcode.Size = new System.Drawing.Size(0, 27);
+            this.ma_craftcode.TabIndex = 145;
+            this.ma_craftcode.Visible = false;
+            // 
             // Make_FeedingCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1197, 680);
+            this.Controls.Add(this.ma_craftcode);
             this.Controls.Add(this.ma_bomversion_label);
             this.Controls.Add(this.ma_bomversion);
             this.Controls.Add(this.ms_craftcode);
@@ -584,5 +597,6 @@
         private System.Windows.Forms.Label ms_craftcode;
         private System.Windows.Forms.Label ma_bomversion;
         private System.Windows.Forms.Label ma_bomversion_label;
+        private System.Windows.Forms.Label ma_craftcode;
     }
 }

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -82,7 +82,7 @@ namespace UAS_MES.Make
         {
             DBFind = ma_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, DBFind);
-            string ifforsn = dh.getFieldDataByCondition("make left join stepbom on ma_prodcode=sb_prodcode left join stepproduct on sb_id=sp_sbid", "nvl(sp_ifforsn,0) sp_ifforsn", "ma_code='" + ma_code.Text + "' and sp_craftcode='" + ms_craftcode.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' and sb_bomversion='" + ma_bomversion.Text + "' order by sp_detno").ToString();
+            string ifforsn = dh.getFieldDataByCondition("make left join stepbom on ma_prodcode=sb_prodcode left join stepproduct on sb_id=sp_sbid", "nvl(sp_ifforsn,0) sp_ifforsn", "ma_code='" + ma_code.Text + "' and sp_craftcode='" + ma_craftcode.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' and sb_bomversion='" + ma_bomversion.Text + "' order by sp_detno").ToString();
             if (ifforsn != "" && ifforsn != "0")
                 iflastsn.Checked = true;
             else