添加报表不良代码跳转界面

UAS_MES_ZT/FunctionCode/Query/BadItem.Designer.cs

@@ -0,0 +1,111 @@
+namespace UAS_MES_NEW.Query
+{
+    partial class BadItem
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.Data = new System.Windows.Forms.DataGridView();
+            this.detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.mb_badname = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.times = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.sums = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.rate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.Data)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // Data
+            // 
+            this.Data.AllowUserToAddRows = false;
+            this.Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.Data.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.detno,
+            this.mb_badname,
+            this.times,
+            this.sums,
+            this.rate});
+            this.Data.Location = new System.Drawing.Point(12, 28);
+            this.Data.Name = "Data";
+            this.Data.RowTemplate.Height = 37;
+            this.Data.Size = new System.Drawing.Size(1706, 1109);
+            this.Data.TabIndex = 221;
+            // 
+            // detno
+            // 
+            this.detno.DataPropertyName = "detno";
+            this.detno.HeaderText = "detno";
+            this.detno.Name = "detno";
+            // 
+            // mb_badname
+            // 
+            this.mb_badname.DataPropertyName = "mb_badname";
+            this.mb_badname.HeaderText = "工序";
+            this.mb_badname.Name = "mb_badname";
+            // 
+            // times
+            // 
+            this.times.DataPropertyName = "times";
+            this.times.HeaderText = "出现次数";
+            this.times.Name = "times";
+            // 
+            // sums
+            // 
+            this.sums.DataPropertyName = "sums";
+            this.sums.HeaderText = "合计";
+            this.sums.Name = "sums";
+            // 
+            // rate
+            // 
+            this.rate.DataPropertyName = "rate";
+            this.rate.HeaderText = "占比";
+            this.rate.Name = "rate";
+            // 
+            // BadItem
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1730, 1149);
+            this.Controls.Add(this.Data);
+            this.Name = "BadItem";
+            this.Text = "不良代码数据";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.Load += new System.EventHandler(this.BadItem_Load);
+            this.SizeChanged += new System.EventHandler(this.BadItem_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.Data)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.DataGridView Data;
+        private System.Windows.Forms.DataGridViewTextBoxColumn detno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mb_badname;
+        private System.Windows.Forms.DataGridViewTextBoxColumn times;
+        private System.Windows.Forms.DataGridViewTextBoxColumn sums;
+        private System.Windows.Forms.DataGridViewTextBoxColumn rate;
+    }
+}

UAS_MES_ZT/FunctionCode/Query/BadItem.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Query
+{
+    public partial class BadItem : Form
+    {
+
+        DataHelper dh = SystemInf.dh;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        string _linecode;
+        string _prodcode;
+        string _wccode;
+        string _begindate;
+        string _enddate;
+        string _stepcode;
+        public BadItem(string linecode, string prodcode, string wccode, string begindate, string enddate, string stepcode)
+        {
+            InitializeComponent();
+            _linecode = linecode;
+            _prodcode = prodcode;
+            _wccode = wccode;
+            _begindate = begindate;
+            _enddate = enddate;
+            _stepcode = stepcode;
+        }
+
+        private void BadItem_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void BadItem_Load(object sender, EventArgs e)
+        {
+            string condition = " mb_indate between to_date('" + _begindate + "', 'yyyy-mm-dd hh24:mi:ss') and to_date('" + _enddate + "', 'yyyy-mm-dd hh24:mi:ss') and mb_stepcode='" + _stepcode + "' ";
+            if (_prodcode != "")
+            {
+                condition += " and ma_prodcode = '" + _prodcode + "'";
+            }
+            if (_linecode != "")
+            {
+                condition += " and mb_linecode = '" + _linecode + "'";
+            }
+
+            string v_sql = "";
+            LogicHandler.GetQuerySQL(condition, "不良代码", out v_sql);
+            DataTable dt = (DataTable)dh.ExecuteSql(v_sql, "select");
+            BaseUtil.FillDgvWithDataTable(Data, dt);
+        }
+    }
+}

UAS_MES_ZT/FunctionCode/Query/BadItem.resx

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="detno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mb_badname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="times.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sums.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="rate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

UAS_MES_ZT/FunctionCode/Query/Query_DateRate.Designer.cs

@@ -38,13 +38,6 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.Data = new System.Windows.Forms.DataGridView();
-            this.detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.sp_stepname = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.OKQTY = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SNQTY = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.合计 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.报废 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.OKRATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -57,6 +50,14 @@
             this.wc_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.pr_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.Export = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.detno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.st_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.sp_stepcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OKQTY = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SNQTY = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.合计 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.报废 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OKRATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.Data)).BeginInit();
             this.SuspendLayout();
             // 
@@ -140,7 +141,8 @@
             this.Data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.Data.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.detno,
-            this.sp_stepname,
+            this.st_name,
+            this.sp_stepcode,
             this.OKQTY,
             this.SNQTY,
             this.合计,
@@ -151,48 +153,7 @@
             this.Data.RowTemplate.Height = 37;
             this.Data.Size = new System.Drawing.Size(1744, 917);
             this.Data.TabIndex = 220;
-            // 
-            // detno
-            // 
-            this.detno.DataPropertyName = "detno";
-            this.detno.HeaderText = "detno";
-            this.detno.Name = "detno";
-            // 
-            // sp_stepname
-            // 
-            this.sp_stepname.DataPropertyName = "st_name";
-            this.sp_stepname.HeaderText = "工序";
-            this.sp_stepname.Name = "sp_stepname";
-            // 
-            // OKQTY
-            // 
-            this.OKQTY.DataPropertyName = "OKQTY";
-            this.OKQTY.HeaderText = "通过";
-            this.OKQTY.Name = "OKQTY";
-            // 
-            // SNQTY
-            // 
-            this.SNQTY.DataPropertyName = "NGQTY";
-            this.SNQTY.HeaderText = "不良";
-            this.SNQTY.Name = "SNQTY";
-            // 
-            // 合计
-            // 
-            this.合计.DataPropertyName = "SUMQTY";
-            this.合计.HeaderText = "合计";
-            this.合计.Name = "合计";
-            // 
-            // 报废
-            // 
-            this.报废.DataPropertyName = "报废";
-            this.报废.HeaderText = "报废";
-            this.报废.Name = "报废";
-            // 
-            // OKRATE
-            // 
-            this.OKRATE.DataPropertyName = "OKRATE";
-            this.OKRATE.HeaderText = "直通率";
-            this.OKRATE.Name = "OKRATE";
+            this.Data.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Data_CellContentClick);
             // 
             // dataGridViewTextBoxColumn1
             // 
@@ -339,6 +300,57 @@
             this.Export.UseVisualStyleBackColor = false;
             this.Export.Click += new System.EventHandler(this.Export_Click);
             // 
+            // detno
+            // 
+            this.detno.DataPropertyName = "detno";
+            this.detno.HeaderText = "detno";
+            this.detno.Name = "detno";
+            // 
+            // st_name
+            // 
+            this.st_name.DataPropertyName = "st_name";
+            this.st_name.HeaderText = "工序";
+            this.st_name.Name = "st_name";
+            // 
+            // sp_stepcode
+            // 
+            this.sp_stepcode.DataPropertyName = "sp_stepcode";
+            this.sp_stepcode.HeaderText = "工序编号";
+            this.sp_stepcode.Name = "sp_stepcode";
+            this.sp_stepcode.Width = 5;
+            // 
+            // OKQTY
+            // 
+            this.OKQTY.DataPropertyName = "OKQTY";
+            this.OKQTY.HeaderText = "通过";
+            this.OKQTY.Name = "OKQTY";
+            // 
+            // SNQTY
+            // 
+            this.SNQTY.DataPropertyName = "NGQTY";
+            this.SNQTY.HeaderText = "不良";
+            this.SNQTY.Name = "SNQTY";
+            this.SNQTY.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.SNQTY.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // 合计
+            // 
+            this.合计.DataPropertyName = "SUMQTY";
+            this.合计.HeaderText = "合计";
+            this.合计.Name = "合计";
+            // 
+            // 报废
+            // 
+            this.报废.DataPropertyName = "报废";
+            this.报废.HeaderText = "报废";
+            this.报废.Name = "报废";
+            // 
+            // OKRATE
+            // 
+            this.OKRATE.DataPropertyName = "OKRATE";
+            this.OKRATE.HeaderText = "直通率";
+            this.OKRATE.Name = "OKRATE";
+            // 
             // Query_DateRate
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
@@ -385,13 +397,6 @@
         private CustomControl.TextBoxWithIcon.SearchTextBox li_code;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.DataGridView Data;
-        private System.Windows.Forms.DataGridViewTextBoxColumn detno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn sp_stepname;
-        private System.Windows.Forms.DataGridViewTextBoxColumn OKQTY;
-        private System.Windows.Forms.DataGridViewTextBoxColumn SNQTY;
-        private System.Windows.Forms.DataGridViewTextBoxColumn 合计;
-        private System.Windows.Forms.DataGridViewTextBoxColumn 报废;
-        private System.Windows.Forms.DataGridViewTextBoxColumn OKRATE;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
@@ -399,5 +404,13 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn detno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn st_name;
+        private System.Windows.Forms.DataGridViewTextBoxColumn sp_stepcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn OKQTY;
+        private System.Windows.Forms.DataGridViewLinkColumn SNQTY;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 合计;
+        private System.Windows.Forms.DataGridViewTextBoxColumn 报废;
+        private System.Windows.Forms.DataGridViewTextBoxColumn OKRATE;
     }
 }

UAS_MES_ZT/FunctionCode/Query/Query_DateRate.cs

@@ -85,8 +85,7 @@ namespace UAS_MES_NEW.Query
                 condition += " and sp_linecode = '" + li_code.Text + "'";
             }
             string v_sql = "";
-            string v_sql1 = "";
-            LogicHandler.GetQuerySQL(condition, out v_sql, out v_sql1);
+            LogicHandler.GetQuerySQL(condition, "直通率", out v_sql);
             DataTable dt = (DataTable)dh.ExecuteSql(v_sql, "select");
             BaseUtil.FillDgvWithDataTable(Data, dt);
         }
@@ -96,5 +95,22 @@ namespace UAS_MES_NEW.Query
             Dbfind = pr_code.ReturnData;
             BaseUtil.SetFormValue(this.Controls, Dbfind);
         }
+
+        private void Data_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            try
+            {
+                if (Data.Columns[e.ColumnIndex].Name == "SNQTY")
+                {
+                    Form baditem = new BadItem(li_code.Text, pr_code.Text, wc_code.Text, BeginDate.Value.ToString("yyyy-MM-dd HH:mm:ss"), EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss"), Data.Rows[e.RowIndex].Cells["sp_stepcode"].Value.ToString());
+                    baditem.Show();
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+
+        }
     }
-}
+}

UAS_MES_ZT/FunctionCode/Query/Query_DateRate.resx

@@ -123,7 +123,10 @@
   <metadata name="detno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="sp_stepname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="st_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="sp_stepcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="OKQTY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

UAS_MES_ZT/PublicMethod/LogicHandler.cs

@@ -1475,13 +1475,11 @@ namespace UAS_MES_NEW.PublicMethod
             }
         }
 
-        public static void GetQuerySQL(string iCondition, out string v_sql, out string v_sql1)
+        public static void GetQuerySQL(string iCondition, string type, out string v_sql1)
         {
-            v_sql = "";
             v_sql1 = "";
-            string[] param = new string[] { iCondition, v_sql, v_sql1 };
+            string[] param = new string[] { iCondition, type, v_sql1 };
             dh.CallProcedure("GetQuerySQL", ref param);
-            v_sql = param[1];
             v_sql1 = param[2];
         }
     }

UAS_MES_ZT/UAS_MES_ZT.csproj

@@ -966,6 +966,12 @@
     <Compile Include="FunctionCode\Packing\Packing_ProdWeightSet.Designer.cs">
       <DependentUpon>Packing_ProdWeightSet.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Query\BadItem.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Query\BadItem.Designer.cs">
+      <DependentUpon>BadItem.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Query\Query_ExeProgress.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1609,6 +1615,9 @@
     <EmbeddedResource Include="FunctionCode\Packing\Packing_ProdWeightSet.resx">
       <DependentUpon>Packing_ProdWeightSet.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Query\BadItem.resx">
+      <DependentUpon>BadItem.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Query\Query_ExeProgress.resx">
       <DependentUpon>Query_ExeProgress.cs</DependentUpon>
     </EmbeddedResource>