添加默认回流工艺和工序

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

@@ -832,7 +832,7 @@
             this.cd_stepcode.Size = new System.Drawing.Size(256, 25);
             this.cd_stepcode.TabIndex = 68;
             this.cd_stepcode.TableName = null;
-            this.cd_stepcode.Tag = "Read";
+            this.cd_stepcode.Tag = "ms_stepcode";
             this.cd_stepcode.TextBoxEnable = true;
             // 
             // cr_code
@@ -844,7 +844,7 @@
             this.cr_code.Condition = null;
             this.cr_code.DBTitle = "回流工艺";
             this.cr_code.FormName = null;
-            this.cr_code.Location = new System.Drawing.Point(123, 95);
+            this.cr_code.Location = new System.Drawing.Point(123, 99);
             this.cr_code.Margin = new System.Windows.Forms.Padding(4);
             this.cr_code.Name = "cr_code";
             this.cr_code.Power = null;
@@ -853,7 +853,7 @@
             this.cr_code.Size = new System.Drawing.Size(255, 25);
             this.cr_code.TabIndex = 67;
             this.cr_code.TableName = null;
-            this.cr_code.Tag = "Read";
+            this.cr_code.Tag = "ms_craftcode";
             this.cr_code.TextBoxEnable = true;
             this.cr_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.cr_code_UserControlTextChanged);
             // 

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -112,9 +112,9 @@ namespace UAS_MES.Make
                             //验证makeserial或者ms_firstsn表序列号是否存在
                             sql.Clear();
                             sql.Append("select max(ms_id) ms_id,ms_makecode,ms_prodcode,ms_sncode,pr_detail ");
-                            sql.Append("from makeserial left join product on pr_code=ms_prodcode where ms_makecode ='" + macode + "' and(ms_sncode");
+                            sql.Append("ms_stepcode,ms_craftcode from makeserial left join product on pr_code=ms_prodcode where ms_makecode ='" + macode + "' and(ms_sncode");
                             sql.Append("='" + GetSNCode.Text + "' or ms_firstsn in (select firstsn from makesnrelation ");
-                            sql.Append("where sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail");
+                            sql.Append("where sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode");
                             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             if (dt.Rows.Count > 0)
                             {

UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -129,6 +129,18 @@
   <metadata name="mbp_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbp_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbl_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>