拆解换料更新数据修改

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

@@ -68,6 +68,8 @@
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.cm_stepcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_stepname = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_craftname = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_craftcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -154,6 +156,8 @@
             this.LabelDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
             this.LabelDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Choose,
+            this.cm_stepcode,
+            this.cm_stepname,
             this.cm_craftname,
             this.cm_craftcode,
             this.cm_id,
@@ -502,6 +506,20 @@
             this.Choose.Name = "Choose";
             this.Choose.Width = 80;
             // 
+            // cm_stepcode
+            // 
+            this.cm_stepcode.DataPropertyName = "cm_stepcode";
+            this.cm_stepcode.HeaderText = "";
+            this.cm_stepcode.Name = "cm_stepcode";
+            this.cm_stepcode.Visible = false;
+            // 
+            // cm_stepname
+            // 
+            this.cm_stepname.DataPropertyName = "cm_stepname";
+            this.cm_stepname.HeaderText = "";
+            this.cm_stepname.Name = "cm_stepname";
+            this.cm_stepname.Visible = false;
+            // 
             // cm_craftname
             // 
             this.cm_craftname.DataPropertyName = "cm_craftname";
@@ -704,6 +722,8 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_stepcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_stepname;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_craftname;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_craftcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_id;

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -105,7 +105,7 @@ namespace UAS_MES.Make
         {
             sncode_1 = sncode;
             sql.Clear();
-            sql.Append("select cm_craftcode,cm_craftname,cm_makecode,cm_sncode,cm_maprodcode,cm_maid,cm_soncode,pr_detail,cm_materialtype,");
+            sql.Append("select cm_craftcode,cm_craftname,cm_makecode,cm_sncode,cm_stepcode,cm_stepname,cm_maprodcode,cm_maid,cm_soncode,pr_detail,cm_materialtype,");
             sql.Append("max(cm_status) cm_status,max(cm_id) cm_id from craftmaterial left join product on pr_code=cm_soncode where(cm_sncode  in (select sn from makesnrelation ");
             sql.Append("where firstsn='"+ sncode_1 + "')  or cm_sncode in ( select firstsn from makesnrelation where sn = '" + sncode_1 + "')");
             sql.Append("or cm_sncode = '" + sncode_1 + "') group by cm_craftcode,cm_makecode,cm_sncode,cm_maprodcode,cm_maid,cm_soncode,pr_detail,cm_materialtype,cm_craftname ORDER BY cm_status DESC");
@@ -310,7 +310,7 @@ namespace UAS_MES.Make
                             sql.Append("insert into craftmaterial (cm_id, cm_makecode,cm_maid,cm_maprodcode,cm_soncode,cm_mscode,cm_sncode,cm_stepcode,cm_stepname,");
                             sql.Append("cm_craftcode,cm_craftname,cm_barcode,cm_inqty,cm_indate,cm_inman,cm_linecode,cm_wccode,cm_sourcecode,cm_spid, cm_materialtype,cm_status)");
                             sql.Append("values(Craftmaterial_seq.nextval,'" + LabelDataGridView.Rows[i].Cells["cm_makecode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_maid"].Value + "','" + ms_prodcode.Text + "','" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
-                            sql.Append(",'" + LabelDataGridView.Rows[i].Cells["cm_sncode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_sncode"].Value + "','" + User.CurrentStepCode + "','" + User.CurrentStepName + "',");
+                            sql.Append(",'" + LabelDataGridView.Rows[i].Cells["cm_sncode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_sncode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_stepcode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_stepname"].Value + "',");
                             sql.Append("'" + LabelDataGridView.Rows[i].Cells["cm_craftcode"].Value + "','" + LabelDataGridView.Rows[i].Cells["cm_craftname"].Value + "','" + LabelDataGridView.Rows[i].Cells["New_BarCode"].Value + "',1,sysdate,'" + User.UserName + "','" + User.UserLineCode + "','" + ms_wccode.Text + "',");
                             sql.Append("'" + User.UserSourceCode + "','" + sp_id + "','" + LabelDataGridView.Rows[i].Cells["cm_materialtype"].Value + "','0')");
                             dh.ExecuteSql(sql.GetString(), "insert");

UAS-MES/FunctionCode/Make/Make_Decompose.resx

@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="cm_stepcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="cm_stepname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="cm_craftname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -249,7 +249,7 @@ namespace UAS_MES.Make
                                     {
                                         OperateResult.AppendText(">>打印序列号" + sn_code.Text + "\n", Color.Black);
                                         doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text.Split(':')[1]);
-                                        Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                                        Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text));
                                         dh.UpdateByCondition("makeserial", "ms_printcount=nvl(ms_printcount,0)+1", "ms_sncode='" + sn_code.Text + "'");
                                     }
                                     else OperateResult.AppendText(">>" + pr_code.Text + "未维护标签\n", Color.Black);