修改报废删除抽检明细

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

@@ -94,6 +94,7 @@
             this.RepairComplete = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.pr_detail_label = new System.Windows.Forms.Label();
             this.ms_checkno = new System.Windows.Forms.Label();
+            this.ms_reworkcheckno = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).BeginInit();
@@ -990,11 +991,26 @@
             this.ms_checkno.Text = "送检批号";
             this.ms_checkno.Visible = false;
             // 
+            // ms_reworkcheckno
+            // 
+            this.ms_reworkcheckno.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.ms_reworkcheckno.AutoSize = true;
+            this.ms_reworkcheckno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ms_reworkcheckno.Location = new System.Drawing.Point(1047, 94);
+            this.ms_reworkcheckno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ms_reworkcheckno.Name = "ms_reworkcheckno";
+            this.ms_reworkcheckno.Size = new System.Drawing.Size(92, 27);
+            this.ms_reworkcheckno.TabIndex = 129;
+            this.ms_reworkcheckno.Text = "返修批号";
+            this.ms_reworkcheckno.Visible = false;
+            // 
             // Make_Repair
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1200, 735);
+            this.Controls.Add(this.ms_reworkcheckno);
             this.Controls.Add(this.ms_checkno);
             this.Controls.Add(this.mb_badremark);
             this.Controls.Add(this.ms_sncode);
@@ -1134,5 +1150,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn mbl_id;
         private System.Windows.Forms.Label pr_detail_label;
         private System.Windows.Forms.Label ms_checkno;
+        private System.Windows.Forms.Label ms_reworkcheckno;
     }
 }

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -143,10 +143,10 @@ 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,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework ");
+                        sql.Append("select max(ms_id) ms_id,ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework,ms_reworkcheckno ");
                         sql.Append("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 where ");
-                        sql.Append("sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework");
+                        sql.Append("sn='" + GetSNCode.Text + "')) group by ms_makecode,ms_prodcode,ms_sncode,pr_detail,ms_stepcode,ms_craftcode,ms_checkno,ms_ifrework,ms_reworkcheckno");
                         dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
@@ -364,8 +364,8 @@ namespace UAS_MES.Make
                             {
                                 dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + User.CurrentStepCode + "',ms_reworkstatus= 4,ms_nextstepcode='',ms_stepcode='" + User.CurrentStepCode + "'", "ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
                                 dh.UpdateByCondition("oqcbatch", "ob_nowcheckqty=ob_nowcheckqty-1", "ob_checkno='" + ms_checkno.Text + "'");
-                                dh.ExecuteSql("delete from oqcbatchdetail where obd_sncode='" + ms_sncode.Text + "'", "delete");
-                                dh.UpdateByCondition("ReworkDetail", "rd_rwstatus='报废'", "rd_reid=(select re_id from rework where re_code='"+reworkcode+"') and rd_sncode='"+ reworkcode + "'");
+                                dh.ExecuteSql("delete from oqcbatchdetail where obd_sncode='" + ms_sncode.Text + "' and obd_checkno='" + ms_reworkcheckno.Text + "'", "delete");
+                                dh.UpdateByCondition("ReworkDetail", "rd_rwstatus='报废'", "rd_reid=(select re_id from rework where re_code='" + reworkcode + "') and rd_sncode='" + reworkcode + "'");
                             }
                         }
                         dh.UpdateByCondition("make", "MA_NGMADEQTY=nvl(MA_NGMADEQTY,0)+1", "ma_code='" + macode + "'");

UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -129,6 +129,18 @@
   <metadata name="DeleteCom.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="DeleteCom.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="DeletePos.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>