拆解处理界面更新，岗位备料增加线别显示

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

@@ -75,6 +75,7 @@
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.cm_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_spid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_firstsn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_wccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -92,7 +93,7 @@
             this.cm_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.New_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.cm_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.cm_status_1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_maid = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_materialtype = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_maprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -168,6 +169,7 @@
             this.LabelDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
             this.LabelDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Choose,
+            this.cm_status,
             this.cm_spid,
             this.cm_firstsn,
             this.cm_wccode,
@@ -185,7 +187,7 @@
             this.cm_soncode,
             this.cm_barcode,
             this.New_BarCode,
-            this.cm_status,
+            this.cm_status_1,
             this.cm_maid,
             this.cm_materialtype,
             this.cm_maprodcode,
@@ -607,6 +609,13 @@
             this.Choose.Name = "Choose";
             this.Choose.Width = 80;
             // 
+            // cm_status
+            // 
+            this.cm_status.DataPropertyName = "cm_status";
+            this.cm_status.HeaderText = "";
+            this.cm_status.Name = "cm_status";
+            this.cm_status.Visible = false;
+            // 
             // cm_spid
             // 
             this.cm_spid.DataPropertyName = "cm_spid";
@@ -737,11 +746,10 @@
             this.New_BarCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.New_BarCode.Width = 300;
             // 
-            // cm_status
+            // cm_status_1
             // 
-            this.cm_status.DataPropertyName = "cm_status";
-            this.cm_status.HeaderText = "上线状态";
-            this.cm_status.Name = "cm_status";
+            this.cm_status_1.HeaderText = "上线状态";
+            this.cm_status_1.Name = "cm_status_1";
             // 
             // cm_maid
             // 
@@ -810,7 +818,7 @@
             this.Load += new System.EventHandler(this.Make_Decompose_Load);
             this.SizeChanged += new System.EventHandler(this.Make_Decompose_SizeChanged);
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -863,6 +871,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_status;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_spid;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_firstsn;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_wccode;
@@ -880,7 +889,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_soncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_barcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn New_BarCode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn cm_status;
+        private System.Windows.Forms.DataGridViewTextBoxColumn cm_status_1;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_maid;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_materialtype;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_maprodcode;

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -120,6 +120,7 @@ namespace UAS_MES.Make
                 {
                     LabelDataGridView.Rows[i].Cells["cm_barcode"].Value = dh.getFieldDataByCondition("CRAFTMATERIAL", "CM_BARCODE", "cm_id = '" + LabelDataGridView.Rows[i].Cells["cm_id"].Value + "'");
                     LabelDataGridView.Rows[i].Cells["pr_detail_"].Value = dh.getFieldDataByCondition("product", "pr_detail", "pr_code = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "'");
+                    LabelDataGridView.Rows[i].Cells["cm_status_1"].Value = (LabelDataGridView.Rows[i].Cells["cm_status"].Value.ToString()=="-1")?"已拆解":"上线";
                 }
             }
             else

UAS-MES/FunctionCode/Make/Make_Decompose.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="cm_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="cm_spid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -168,7 +171,7 @@
   <metadata name="New_BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="cm_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="cm_status_1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="cm_maid.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

@@ -53,6 +53,7 @@
             this.ma_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Screen = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.sp_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mss_linecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mss_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mss_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mss_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -299,6 +300,7 @@
             this.BatchProductDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.BatchProductDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.sp_soncode,
+            this.mss_linecode,
             this.mss_makecode,
             this.mss_id,
             this.mss_prodcode,
@@ -384,6 +386,12 @@
             this.sp_soncode.Name = "sp_soncode";
             this.sp_soncode.ReadOnly = true;
             // 
+            // mss_linecode
+            // 
+            this.mss_linecode.DataPropertyName = "mss_linecode";
+            this.mss_linecode.HeaderText = "线别";
+            this.mss_linecode.Name = "mss_linecode";
+            // 
             // mss_makecode
             // 
             this.mss_makecode.DataPropertyName = "mss_makecode";
@@ -501,10 +509,10 @@
             this.Text = "岗位备料";
             this.Load += new System.EventHandler(this.岗位备料_Load);
             this.SizeChanged += new System.EventHandler(this.岗位备料_SizeChanged);
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BatchProductDGV)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }
@@ -535,6 +543,7 @@
         private CustomControl.CustomCheckBox.CustomCheckBox show_all_check;
         private CustomControl.ButtonUtil.NormalButton normalButton1;
         private System.Windows.Forms.DataGridViewTextBoxColumn sp_soncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mss_linecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn mss_makecode;
         private System.Windows.Forms.DataGridViewTextBoxColumn mss_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn mss_prodcode;

UAS-MES/FunctionCode/Make/Make_PositionStock.cs

@@ -161,22 +161,22 @@ namespace UAS_MES.Make
             if (!show_all_check.Checked)
             {
                 sql.Clear();
-                sql.Append("select nvl(mss_makecode,' ') mss_makecode,sp_fsoncode,nvl(mss_id,0) mss_id,sp_soncode,mss_prodcode,sp_oneuseqty,mss_barcode,nvl(mss_qty,0) mss_qty ,nvl(mss_remain,0)mss_remain,");
+                sql.Append("select nvl(mss_makecode,' ') mss_makecode,mss_linecode,sp_fsoncode,nvl(mss_id,0) mss_id,sp_soncode,mss_prodcode,sp_oneuseqty,mss_barcode,nvl(mss_qty,0) mss_qty ,nvl(mss_remain,0)mss_remain,");
                 sql.Append("pr_detail,nvl(mss_useqty,0) mss_useqty from stepbom left join stepproduct on sp_sbid=sb_id left join product on ");
                 sql.Append("pr_code=sp_mothercode left join makesourcestock on  mss_craftcode=sb_craftcode and mss_makecode='"+ma_code.Text+"' ");
                 sql.Append("and mss_stepcode=sp_stepcode and sp_soncode=mss_prodcode and sp_fsoncode=mss_fprodcode left join make on ma_bomversion=sb_bomversion where sb_prodcode='" + ma_prodcode.Text + "' and sb_craftcode='" + ma_craftcode.Text + "' ");
-                sql.Append("and sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and ma_code='" + ma_code.Text + "' and mss_linecode = '" + User.UserLineCode + "' order by sp_soncode");
+                sql.Append("and sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and ma_code='" + ma_code.Text + "' order by sp_soncode");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.FillDgvWithDataTable(BatchProductDGV, dt);
             }
             else
             {
                 sql.Clear();
-                sql.Append("select nvl(mss_makecode,' ') mss_makecode,sp_fsoncode,nvl(mss_id,0) mss_id,sp_soncode,mss_prodcode,sp_oneuseqty,mss_barcode,nvl(mss_qty,0) mss_qty ,nvl(mss_remain,0)mss_remain,");
+                sql.Append("select nvl(mss_makecode,' ') mss_makecode,mss_linecode,sp_fsoncode,nvl(mss_id,0) mss_id,sp_soncode,mss_prodcode,sp_oneuseqty,mss_barcode,nvl(mss_qty,0) mss_qty ,nvl(mss_remain,0)mss_remain,");
                 sql.Append("pr_detail,nvl(mss_useqty,0) mss_useqty from stepbom left join stepproduct on sp_sbid=sb_id left join product on ");
                 sql.Append("pr_code=sp_mothercode left join makesourcestock on  mss_craftcode=sb_craftcode ");
                 sql.Append("and mss_stepcode=sp_stepcode and sp_soncode=mss_prodcode and sp_fsoncode=mss_fprodcode where  ");
-                sql.Append(" sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 and mss_linecode = '"+User.UserLineCode+"' order by sp_soncode");
+                sql.Append(" sp_stepcode='" + User.CurrentStepCode + "' and sp_tracekind=2 order by sp_soncode");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.FillDgvWithDataTable(BatchProductDGV, dt);
             }

UAS-MES/FunctionCode/Make/Make_PositionStock.resx

@@ -290,6 +290,9 @@
   <metadata name="sp_soncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="mss_linecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="mss_makecode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>