Browse Source

Merge branch 'master' of ssh://10.10.100.21/source/mes-client

Hcsy 8 years ago
parent
commit
2cfade5eb1
34 changed files with 3538 additions and 739 deletions
  1. 123 0
      UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.resx
  2. 123 0
      UAS-MES/CustomControl/TextBoxWithIcon/SourceStepCount.resx
  3. 3 8
      UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs
  4. 3 9
      UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs
  5. 6 12
      UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs
  6. 3 9
      UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs
  7. 6 6
      UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs
  8. 3 8
      UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs
  9. 4 10
      UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs
  10. 202 105
      UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs
  11. 76 56
      UAS-MES/FunctionCode/Make/Make_PackageCollection.cs
  12. 150 53
      UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.Designer.cs
  13. 74 56
      UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs
  14. 0 18
      UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.resx
  15. 174 99
      UAS-MES/FunctionCode/Make/Make_PalletCollection.Designer.cs
  16. 44 12
      UAS-MES/FunctionCode/Make/Make_PalletCollection.cs
  17. 101 92
      UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs
  18. 2 7
      UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs
  19. 24 24
      UAS-MES/FunctionCode/Make/Make_RePrintLabel.Designer.cs
  20. 7 8
      UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs
  21. 3 3
      UAS-MES/FunctionCode/Make/Make_RePrintLabel.resx
  22. 16 7
      UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs
  23. 15 6
      UAS-MES/FunctionCode/Make/Make_SeqTransform.cs
  24. 3 7
      UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs
  25. 0 48
      UAS-MES/FunctionCode/Query/Quert_RealTime.Designer.cs
  26. 0 24
      UAS-MES/FunctionCode/Query/Quert_RealTime.cs
  27. 1 1
      UAS-MES/FunctionCode/Query/Query_ExeProgress.cs
  28. 1820 0
      UAS-MES/FunctionCode/Query/Query_MakeInf.Designer.cs
  29. 161 0
      UAS-MES/FunctionCode/Query/Query_MakeInf.cs
  30. 375 0
      UAS-MES/FunctionCode/Query/Query_MakeInf.resx
  31. 2 29
      UAS-MES/PublicMethod/LogicHandler.cs
  32. 2 1
      UAS-MES/PublicMethod/Print.cs
  33. 1 1
      UAS-MES/PublicMethod/ftpOperater.cs
  34. 11 20
      UAS-出货标签管理/UAS_出货标签管理.cs

+ 123 - 0
UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.resx

@@ -0,0 +1,123 @@
+<?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="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+</root>

+ 123 - 0
UAS-MES/CustomControl/TextBoxWithIcon/SourceStepCount.resx

@@ -0,0 +1,123 @@
+<?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="CountRefresh.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

+ 3 - 8
UAS-MES/FunctionCode/Make/Make_CartonBoxWeigh.cs

@@ -222,7 +222,7 @@ namespace UAS_MES.Make
         //确认打印
         private void Confirm_Click(object sender, EventArgs e)
         {
-            doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+            doc = lbl.Documents.Open(PrintLabel.Text);
             string ErrorMessage = "";
             if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, outboxcode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
             {
@@ -280,15 +280,10 @@ namespace UAS_MES.Make
 
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void PrintLabel_SelectedValueChanged(object sender, EventArgs e)

+ 3 - 9
UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -237,7 +237,7 @@ namespace UAS_MES.Make
                                     //提示正确返回时传递的信息
                                     if (ErrorMessage.Contains("AFTERSUCCESS"))
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n");
-                                    doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                                    doc = lbl.Documents.Open(PrintLabel.Text);
                                     if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, pr_code.Text, "彩盒标", "0", out ErrorMessage))
                                     {
                                         //提示用户打印成功
@@ -305,16 +305,10 @@ namespace UAS_MES.Make
         //根据产品编号获取打印模板
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            indate = new System.DateTime[_dt.Rows.Count];
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
             pr_change = true;
         }
 

+ 6 - 12
UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -140,8 +140,8 @@ namespace UAS_MES.Make
                             sql.Append("sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,max(sp_prefix)sp_prefix,max(sp_regex)");
                             sql.Append("sp_regex,max(pr_detail)pr_detail from stepproduct left join product on pr_code=sp_fsoncode where ");
                             sql.Append("sp_bomversion='" + ma_bomversion.Text + "' and sp_craftcode='" + ms_craftcode.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' ");
-                            sql.Append("And sp_mothercode ='" + pr_code.Text + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where (cm_sncode='" + ms_firstsn + "' or ");
-                            sql.Append("cm_sncode in (select sn from makesnrelation where firstsn='" + ms_firstsn + "')) and cm_makecode='" + ma_code.Text + "' and cm_soncode=");
+                            sql.Append("And sp_mothercode ='" + pr_code.Text + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where  ");
+                            sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ma_code.Text + "' and cm_soncode=");
                             sql.Append("sp_soncode and cm_status=0) group by sp_fsoncode order by SP_DETNO asc");
                             ListA = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                             //获取对应 产品的机身标的打印模板
@@ -154,7 +154,7 @@ namespace UAS_MES.Make
                             }
                             else
                             {
-                                OperateResult.AppendText(">>当前序列号" + ms_sncode.Text + "没有需要采集的内容,请采集其他序列号\n", Color.Red);
+                                OperateResult.AppendText(">>当前序列号" + ms_sncode.Text + "已完成上料,请采集其他序列号\n", Color.Black);
                                 if (!LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                                 else
@@ -275,7 +275,7 @@ namespace UAS_MES.Make
                                 BaseUtil.CleanDataTableData(ListA);
                             }
                             else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, code);
-                            doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                            doc = lbl.Documents.Open(PrintLabel.Text);
                             if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, ms_sncode.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "彩盒标", "0", out ErrorMessage))
                             {
                                 OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
@@ -295,16 +295,10 @@ namespace UAS_MES.Make
 
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            indate = new System.DateTime[_dt.Rows.Count];
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void LoadCollectNum()

+ 3 - 9
UAS-MES/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -253,7 +253,7 @@ namespace UAS_MES.Make
         {
             if (PrintLabel.Items.Count != 0)
             {
-                doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                doc = lbl.Documents.Open(PrintLabel.Text);
                 string oErrorMessage;
                 if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sncode.Text, int.Parse(PrintNum.Text), ms_makecode.Text, pr_code.Text, "彩盒标", "0", out oErrorMessage))
                 {
@@ -300,16 +300,10 @@ namespace UAS_MES.Make
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
             LoadCheckQTY();
-            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='彩盒标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            indate = new System.DateTime[_dt.Rows.Count];
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void SendCheck_Click(object sender, EventArgs e)

+ 6 - 6
UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -133,7 +133,7 @@ namespace UAS_MES.Make
                             //索引超出长度表示内容均已提醒
                             if (RemainIndex >= RemainList.Length)
                             {
-                                OperateResult.AppendText(">>当前序列号" + sn_code.Text + "没有需要采集的内容,请采集其他序列号\n", Color.Red);
+                                OperateResult.AppendText(">>当前序列号" + sn_code.Text + "已完成上料,请采集其他序列号\n", Color.Black);
                                 sn_code.Text = "";
                                 code.Text = "";
                                 return;
@@ -331,8 +331,8 @@ namespace UAS_MES.Make
             sql.Append("sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,max(sp_prefix)sp_prefix,max(sp_regex)");
             sql.Append("sp_regex,max(pr_detail)pr_detail from stepproduct left join product on pr_code=sp_fsoncode where ");
             sql.Append("sp_bomversion='" + ma_bomversion.Text + "' and sp_craftcode='" + ms_craftcode.Text + "' and sp_stepcode='" + User.CurrentStepCode + "' ");
-            sql.Append("And sp_mothercode ='" + ma_prodcode.Text + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where (cm_sncode='" + ms_firstsn + "' or ");
-            sql.Append("cm_sncode in (select sn from makesnrelation where firstsn='" + ms_firstsn + "')) and cm_makecode='" + ma_code.Text + "' and cm_fsoncode=");
+            sql.Append("And sp_mothercode ='" + ma_prodcode.Text + "' and sp_tracekind=1 and not exists(select 1 from craftmaterial where ");
+            sql.Append("cm_sncode in (select '" + ms_firstsn + "' from dual union select sn from makesnrelation where firstsn='" + ms_firstsn + "') and cm_makecode='" + ma_code.Text + "' and cm_fsoncode=");
             sql.Append("sp_fsoncode and cm_status=0) group by sp_fsoncode order by SP_DETNO asc");
             dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             code.Clear();
@@ -361,7 +361,7 @@ namespace UAS_MES.Make
             }
             else
             {
-                OperateResult.AppendText(">>序列号" + sn_code.Text + "没有需要采集的内容,请采集其他序列号\n", Color.Red);
+                OperateResult.AppendText(">>序列号" + sn_code.Text + "已完成上料,请采集其他序列号\n", Color.Black);
                 if (!LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                 else
@@ -410,10 +410,10 @@ namespace UAS_MES.Make
                     string softversionText = ma_softversion_label.Checked ? ma_softversion.Text : "";
                     sql.Clear();
                     sql.Append("insert into SNRELATIONINFORECORD(SIR_ID,SIR_SNCODE,SIR_MSCODE,SIR_ECNCODE,SIR_SOFTVER,");
-                    sql.Append("SIR_LINECODE,SIR_SOURCECODE,SIR_STEPCODE,SIR_MACODE,SIR_PRODCODE,SIR_INMAN,SIR_INDATE) select ");
+                    sql.Append("SIR_LINECODE,SIR_SOURCECODE,SIR_STEPCODE,SIR_MACODE,SIR_PRODCODE,SIR_INMAN,SIR_INDATE,sir_firstsn) select ");
                     sql.Append("SNRELATIONINFORECORD_SEQ.nextval,'" + sn_code.Text + "',ms_code,'" + ecnText + "','" + softversionText + "',");
                     sql.Append("'" + User.UserLineCode + "','" + User.UserSourceCode + "','" + User.CurrentStepCode + "','" + ma_code + "','" + ma_prodcode.Text + "',");
-                    sql.Append("'" + User.UserCode + "',sysdate from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ma_code + "'");
+                    sql.Append("'" + User.UserCode + "',sysdate,ms_firstsn from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ma_code + "'");
                     dh.ExecuteSql(sql.GetString(), "insert");
                 }
                 CollectData.Clear();

+ 3 - 8
UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -148,7 +148,7 @@ namespace UAS_MES.Make
                             }
                             OperateResult.AppendText("<<序列号:" + sncode.Text + "\n", Color.Black);
                             //按照打印张数打印
-                            doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                            doc = lbl.Documents.Open(PrintLabel.Text);
                             if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
                             {
                                 //提示用户打印成功
@@ -211,19 +211,14 @@ namespace UAS_MES.Make
         }
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + ma_prodcode.Text + "' and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + ma_prodcode.Text + "' and la_templatetype='机身标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             if (dt.Rows.Count == 0)
             {
                 return;
             }
             PrintLabel.DataSource = dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftp = new ftpOperater();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
-            }
             pr_change = true;
         }
 

+ 4 - 10
UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -89,16 +89,10 @@ namespace UAS_MES.Make
 
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
-            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='SN标签' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='SN标签' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            indate = new System.DateTime[_dt.Rows.Count];
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void sn_code_KeyDown(object sender, KeyEventArgs e)
@@ -297,8 +291,8 @@ namespace UAS_MES.Make
                                     if (PrintLabel.Items.Count != 0)
                                     {
                                         OperateResult.AppendText(">>打印序列号" + sn_code.Text + "\n", Color.Black);
-                                        doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text.Split(':')[1]);
-                                        if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "SN标签", "0", out ErrMessage))
+                                        doc = lbl.Documents.Open(PrintLabel.Text);
+                                        if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, sn_code.Text, int.Parse(PrintNum.Text), ma_code.Text, pr_code.Text, "SN标签", "0", out ErrMessage))
                                         {
                                             OperateResult.AppendText(ErrMessage + "\n", Color.Red);
                                             return;

+ 202 - 105
UAS-MES/FunctionCode/Make/Make_PackageCollection.Designer.cs

@@ -39,9 +39,17 @@
             this.pa_checkno = new System.Windows.Forms.Label();
             this.pa_downstatus = new System.Windows.Forms.Label();
             this.pa_standardqty = new System.Windows.Forms.Label();
+            this.pr_sendchecktype = new System.Windows.Forms.Label();
+            this.mcd_remainqty_label = new System.Windows.Forms.Label();
+            this.mcd_remainqty = new System.Windows.Forms.Label();
+            this.mcd_inqty_label = new System.Windows.Forms.Label();
+            this.mcd_inqty = new System.Windows.Forms.Label();
+            this.pa_remark_label = new System.Windows.Forms.Label();
+            this.pa_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label1 = new System.Windows.Forms.Label();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.checkweightlabel = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.ob_nowcheckqty = new System.Windows.Forms.Label();
             this.ob_batchqty = new System.Windows.Forms.Label();
@@ -58,7 +66,9 @@
             this.PrintList_label = new System.Windows.Forms.Label();
             this.PrintNum_label = new System.Windows.Forms.Label();
             this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.locksalecode = new System.Windows.Forms.CheckBox();
+            this.PreFix_label = new System.Windows.Forms.Label();
+            this.PreFix = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.pa_salecode_label = new System.Windows.Forms.Label();
             this.ma_code_label = new System.Windows.Forms.Label();
             this.ms_salecode = new System.Windows.Forms.Label();
@@ -87,11 +97,7 @@
             this.pd_innerqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_indate = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_sendchecktype = new System.Windows.Forms.Label();
-            this.mcd_remainqty_label = new System.Windows.Forms.Label();
-            this.mcd_remainqty = new System.Windows.Forms.Label();
-            this.mcd_inqty_label = new System.Windows.Forms.Label();
-            this.mcd_inqty = new System.Windows.Forms.Label();
+            this.CollecRemark = new System.Windows.Forms.CheckBox();
             this.groupBoxWithBorder2.SuspendLayout();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
@@ -113,7 +119,7 @@
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label13.ForeColor = System.Drawing.Color.Black;
-            this.label13.Location = new System.Drawing.Point(9, 693);
+            this.label13.Location = new System.Drawing.Point(9, 692);
             this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(72, 27);
@@ -209,11 +215,93 @@
             this.pa_standardqty.TabIndex = 180;
             this.pa_standardqty.Visible = false;
             // 
+            // pr_sendchecktype
+            // 
+            this.pr_sendchecktype.AutoSize = true;
+            this.pr_sendchecktype.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pr_sendchecktype.Location = new System.Drawing.Point(945, 546);
+            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_sendchecktype.Name = "pr_sendchecktype";
+            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 27);
+            this.pr_sendchecktype.TabIndex = 182;
+            this.pr_sendchecktype.Visible = false;
+            // 
+            // mcd_remainqty_label
+            // 
+            this.mcd_remainqty_label.AutoSize = true;
+            this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty_label.Location = new System.Drawing.Point(629, 588);
+            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty_label.Name = "mcd_remainqty_label";
+            this.mcd_remainqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_remainqty_label.TabIndex = 196;
+            this.mcd_remainqty_label.Text = "待采集数";
+            // 
+            // mcd_remainqty
+            // 
+            this.mcd_remainqty.AutoSize = true;
+            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_remainqty.Location = new System.Drawing.Point(739, 588);
+            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_remainqty.Name = "mcd_remainqty";
+            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_remainqty.TabIndex = 197;
+            // 
+            // mcd_inqty_label
+            // 
+            this.mcd_inqty_label.AutoSize = true;
+            this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty_label.Location = new System.Drawing.Point(629, 548);
+            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty_label.Name = "mcd_inqty_label";
+            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
+            this.mcd_inqty_label.TabIndex = 194;
+            this.mcd_inqty_label.Text = "已采集数";
+            // 
+            // mcd_inqty
+            // 
+            this.mcd_inqty.AutoSize = true;
+            this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.mcd_inqty.Location = new System.Drawing.Point(739, 548);
+            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.mcd_inqty.Name = "mcd_inqty";
+            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
+            this.mcd_inqty.TabIndex = 195;
+            // 
+            // pa_remark_label
+            // 
+            this.pa_remark_label.AutoSize = true;
+            this.pa_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_remark_label.Location = new System.Drawing.Point(629, 625);
+            this.pa_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_remark_label.Name = "pa_remark_label";
+            this.pa_remark_label.Size = new System.Drawing.Size(52, 27);
+            this.pa_remark_label.TabIndex = 198;
+            this.pa_remark_label.Text = "备注";
+            // 
+            // pa_remark
+            // 
+            this.pa_remark.AllPower = null;
+            this.pa_remark.BackColor = System.Drawing.Color.White;
+            this.pa_remark.ID = null;
+            this.pa_remark.Location = new System.Drawing.Point(689, 628);
+            this.pa_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pa_remark.Multiline = true;
+            this.pa_remark.Name = "pa_remark";
+            this.pa_remark.Power = null;
+            this.pa_remark.Size = new System.Drawing.Size(196, 56);
+            this.pa_remark.Str = null;
+            this.pa_remark.Str1 = null;
+            this.pa_remark.Str2 = null;
+            this.pa_remark.TabIndex = 200;
+            this.pa_remark.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_remark_KeyDown);
+            // 
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
             this.groupBoxWithBorder2.Controls.Add(this.PrintNum);
             this.groupBoxWithBorder2.Controls.Add(this.label1);
+            this.groupBoxWithBorder2.Controls.Add(this.StepCount);
             this.groupBoxWithBorder2.Controls.Add(this.checkweightlabel);
             this.groupBoxWithBorder2.Controls.Add(this.ob_nowcheckqty);
             this.groupBoxWithBorder2.Controls.Add(this.ob_batchqty);
@@ -247,7 +335,7 @@
             this.PrintNum.Enabled = false;
             this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(340, 155);
+            this.PrintNum.Location = new System.Drawing.Point(340, 160);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
@@ -261,19 +349,30 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(361, 15);
+            this.label1.Location = new System.Drawing.Point(360, 16);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
             this.label1.TabIndex = 181;
             this.label1.Text = "当前批号";
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(163, 25);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(4, 9, 4, 9);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(84, 29);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 193;
+            // 
             // checkweightlabel
             // 
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Red;
-            this.checkweightlabel.Location = new System.Drawing.Point(157, 12);
+            this.checkweightlabel.Location = new System.Drawing.Point(156, 7);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(267, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -284,7 +383,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(469, 108);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(468, 108);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
@@ -294,7 +393,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(469, 63);
+            this.ob_batchqty.Location = new System.Drawing.Point(468, 63);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
@@ -304,7 +403,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(361, 108);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(360, 108);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(92, 27);
@@ -315,7 +414,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(361, 64);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(360, 64);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(92, 27);
@@ -326,7 +425,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(469, 15);
+            this.ob_checkno.Location = new System.Drawing.Point(468, 16);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 27);
@@ -342,7 +441,7 @@
             this.SendCheck.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.SendCheck.Image = null;
             this.SendCheck.IsShowBorder = true;
-            this.SendCheck.Location = new System.Drawing.Point(494, 154);
+            this.SendCheck.Location = new System.Drawing.Point(493, 159);
             this.SendCheck.Margin = new System.Windows.Forms.Padding(4);
             this.SendCheck.MoveImage = ((System.Drawing.Image)(resources.GetObject("SendCheck.MoveImage")));
             this.SendCheck.Name = "SendCheck";
@@ -363,7 +462,7 @@
             this.Packing.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.Packing.Image = null;
             this.Packing.IsShowBorder = true;
-            this.Packing.Location = new System.Drawing.Point(20, 154);
+            this.Packing.Location = new System.Drawing.Point(20, 159);
             this.Packing.Margin = new System.Windows.Forms.Padding(4);
             this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
             this.Packing.Name = "Packing";
@@ -380,7 +479,7 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(160, 109);
+            this.PrintLabel.Location = new System.Drawing.Point(163, 114);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(183, 28);
@@ -391,7 +490,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(12, 107);
+            this.label3.Location = new System.Drawing.Point(11, 108);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
@@ -401,7 +500,7 @@
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(111, 155);
+            this.AutoPrint.Location = new System.Drawing.Point(111, 160);
             this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.AutoPrint.Name = "AutoPrint";
             this.AutoPrint.Size = new System.Drawing.Size(111, 29);
@@ -410,7 +509,7 @@
             // PrintList
             // 
             this.PrintList.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintList.Location = new System.Drawing.Point(160, 65);
+            this.PrintList.Location = new System.Drawing.Point(163, 70);
             this.PrintList.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.PrintList.Name = "PrintList";
             this.PrintList.Size = new System.Drawing.Size(181, 28);
@@ -424,7 +523,7 @@
             this.Printing.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.Printing.Image = null;
             this.Printing.IsShowBorder = true;
-            this.Printing.Location = new System.Drawing.Point(415, 154);
+            this.Printing.Location = new System.Drawing.Point(415, 159);
             this.Printing.Margin = new System.Windows.Forms.Padding(4);
             this.Printing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printing.MoveImage")));
             this.Printing.Name = "Printing";
@@ -441,7 +540,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(12, 63);
+            this.PrintList_label.Location = new System.Drawing.Point(11, 63);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(112, 27);
@@ -452,7 +551,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(280, 155);
+            this.PrintNum_label.Location = new System.Drawing.Point(280, 160);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
@@ -462,7 +561,9 @@
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder1.Controls.Add(this.StepCount);
+            this.groupBoxWithBorder1.Controls.Add(this.locksalecode);
+            this.groupBoxWithBorder1.Controls.Add(this.PreFix_label);
+            this.groupBoxWithBorder1.Controls.Add(this.PreFix);
             this.groupBoxWithBorder1.Controls.Add(this.pa_salecode_label);
             this.groupBoxWithBorder1.Controls.Add(this.ma_code_label);
             this.groupBoxWithBorder1.Controls.Add(this.ms_salecode);
@@ -492,22 +593,51 @@
             this.groupBoxWithBorder1.Text = "装箱信息";
             this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
             // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(336, 15);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
-            this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(86, 28);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 193;
+            // locksalecode
+            // 
+            this.locksalecode.AutoSize = true;
+            this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.locksalecode.Location = new System.Drawing.Point(396, 21);
+            this.locksalecode.Margin = new System.Windows.Forms.Padding(4);
+            this.locksalecode.Name = "locksalecode";
+            this.locksalecode.Size = new System.Drawing.Size(119, 19);
+            this.locksalecode.TabIndex = 196;
+            this.locksalecode.Text = "当前订单锁定";
+            this.locksalecode.UseVisualStyleBackColor = true;
+            // 
+            // PreFix_label
+            // 
+            this.PreFix_label.AutoSize = true;
+            this.PreFix_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PreFix_label.Location = new System.Drawing.Point(246, 19);
+            this.PreFix_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PreFix_label.Name = "PreFix_label";
+            this.PreFix_label.Size = new System.Drawing.Size(46, 24);
+            this.PreFix_label.TabIndex = 195;
+            this.PreFix_label.Text = "前缀";
+            // 
+            // PreFix
+            // 
+            this.PreFix.AllPower = null;
+            this.PreFix.BackColor = System.Drawing.Color.White;
+            this.PreFix.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.PreFix.ID = null;
+            this.PreFix.Location = new System.Drawing.Point(306, 19);
+            this.PreFix.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.PreFix.Name = "PreFix";
+            this.PreFix.Power = null;
+            this.PreFix.Size = new System.Drawing.Size(49, 27);
+            this.PreFix.Str = null;
+            this.PreFix.Str1 = null;
+            this.PreFix.Str2 = null;
+            this.PreFix.TabIndex = 194;
+            this.PreFix.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PreFix_KeyDown);
             // 
             // pa_salecode_label
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(284, 169);
+            this.pa_salecode_label.Location = new System.Drawing.Point(280, 168);
             this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
             this.pa_salecode_label.Size = new System.Drawing.Size(92, 27);
@@ -518,7 +648,7 @@
             // 
             this.ma_code_label.AutoSize = true;
             this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(12, 169);
+            this.ma_code_label.Location = new System.Drawing.Point(8, 168);
             this.ma_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_code_label.Name = "ma_code_label";
             this.ma_code_label.Size = new System.Drawing.Size(72, 27);
@@ -529,7 +659,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(393, 169);
+            this.ms_salecode.Location = new System.Drawing.Point(389, 168);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 27);
@@ -539,7 +669,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(128, 169);
+            this.ms_makecode.Location = new System.Drawing.Point(124, 168);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -550,7 +680,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(129, 16);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(115, 19);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(46, 24);
@@ -563,7 +693,7 @@
             this.OutBoxLength.BackColor = System.Drawing.Color.White;
             this.OutBoxLength.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.OutBoxLength.ID = null;
-            this.OutBoxLength.Location = new System.Drawing.Point(208, 19);
+            this.OutBoxLength.Location = new System.Drawing.Point(173, 19);
             this.OutBoxLength.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.OutBoxLength.Name = "OutBoxLength";
             this.OutBoxLength.Power = null;
@@ -581,7 +711,7 @@
             this.pr_outboxinnerqty.Enabled = false;
             this.pr_outboxinnerqty.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_outboxinnerqty.ID = null;
-            this.pr_outboxinnerqty.Location = new System.Drawing.Point(121, 92);
+            this.pr_outboxinnerqty.Location = new System.Drawing.Point(120, 92);
             this.pr_outboxinnerqty.Margin = new System.Windows.Forms.Padding(4);
             this.pr_outboxinnerqty.Name = "pr_outboxinnerqty";
             this.pr_outboxinnerqty.Power = null;
@@ -599,7 +729,7 @@
             this.DeleteAll.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.DeleteAll.Image = null;
             this.DeleteAll.IsShowBorder = true;
-            this.DeleteAll.Location = new System.Drawing.Point(475, 52);
+            this.DeleteAll.Location = new System.Drawing.Point(473, 52);
             this.DeleteAll.Margin = new System.Windows.Forms.Padding(4);
             this.DeleteAll.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteAll.MoveImage")));
             this.DeleteAll.Name = "DeleteAll";
@@ -614,7 +744,7 @@
             // AutoGenBoxCode
             // 
             this.AutoGenBoxCode.AutoSize = true;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(336, 47);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(332, 48);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(114, 31);
@@ -626,7 +756,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(284, 88);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(280, 91);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(92, 27);
@@ -637,7 +767,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(284, 129);
+            this.pr_detail_label.Location = new System.Drawing.Point(280, 128);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -650,7 +780,7 @@
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(121, 53);
+            this.pa_outboxcode.Location = new System.Drawing.Point(120, 52);
             this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = null;
@@ -665,7 +795,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(393, 88);
+            this.pa_currentqty.Location = new System.Drawing.Point(389, 91);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
@@ -675,7 +805,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(12, 129);
+            this.pr_code_label.Location = new System.Drawing.Point(8, 128);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
@@ -686,7 +816,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(393, 129);
+            this.pr_detail.Location = new System.Drawing.Point(389, 128);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -696,7 +826,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(12, 88);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(8, 91);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(92, 27);
@@ -707,7 +837,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(128, 129);
+            this.pr_code.Location = new System.Drawing.Point(124, 128);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
@@ -719,7 +849,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(12, 47);
+            this.pa_code_label.Location = new System.Drawing.Point(8, 48);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(52, 27);
@@ -760,7 +890,7 @@
             this.sn_code.AllPower = "ifall";
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(99, 693);
+            this.sn_code.Location = new System.Drawing.Point(99, 692);
             this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = "ifread";
@@ -847,64 +977,25 @@
             this.pd_id.ReadOnly = true;
             this.pd_id.Visible = false;
             // 
-            // pr_sendchecktype
-            // 
-            this.pr_sendchecktype.AutoSize = true;
-            this.pr_sendchecktype.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_sendchecktype.Location = new System.Drawing.Point(945, 546);
-            this.pr_sendchecktype.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.pr_sendchecktype.Name = "pr_sendchecktype";
-            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 27);
-            this.pr_sendchecktype.TabIndex = 182;
-            this.pr_sendchecktype.Visible = false;
-            // 
-            // mcd_remainqty_label
-            // 
-            this.mcd_remainqty_label.AutoSize = true;
-            this.mcd_remainqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty_label.Location = new System.Drawing.Point(630, 588);
-            this.mcd_remainqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_remainqty_label.Name = "mcd_remainqty_label";
-            this.mcd_remainqty_label.Size = new System.Drawing.Size(92, 27);
-            this.mcd_remainqty_label.TabIndex = 196;
-            this.mcd_remainqty_label.Text = "待采集数";
-            // 
-            // mcd_remainqty
-            // 
-            this.mcd_remainqty.AutoSize = true;
-            this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(739, 588);
-            this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_remainqty.Name = "mcd_remainqty";
-            this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
-            this.mcd_remainqty.TabIndex = 197;
-            // 
-            // mcd_inqty_label
-            // 
-            this.mcd_inqty_label.AutoSize = true;
-            this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(630, 548);
-            this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_inqty_label.Name = "mcd_inqty_label";
-            this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
-            this.mcd_inqty_label.TabIndex = 194;
-            this.mcd_inqty_label.Text = "已采集数";
-            // 
-            // mcd_inqty
+            // CollecRemark
             // 
-            this.mcd_inqty.AutoSize = true;
-            this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(739, 548);
-            this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.mcd_inqty.Name = "mcd_inqty";
-            this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
-            this.mcd_inqty.TabIndex = 195;
+            this.CollecRemark.AutoSize = true;
+            this.CollecRemark.Location = new System.Drawing.Point(689, 696);
+            this.CollecRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollecRemark.Name = "CollecRemark";
+            this.CollecRemark.Size = new System.Drawing.Size(119, 19);
+            this.CollecRemark.TabIndex = 201;
+            this.CollecRemark.Text = "采集备注信息";
+            this.CollecRemark.UseVisualStyleBackColor = true;
             // 
             // Make_PackageCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1172, 730);
+            this.Controls.Add(this.CollecRemark);
+            this.Controls.Add(this.pa_remark);
+            this.Controls.Add(this.pa_remark_label);
             this.Controls.Add(this.mcd_remainqty_label);
             this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.pr_sendchecktype);
@@ -1010,5 +1101,11 @@
         private System.Windows.Forms.Label mcd_remainqty;
         private System.Windows.Forms.Label mcd_inqty_label;
         private System.Windows.Forms.Label mcd_inqty;
+        private System.Windows.Forms.Label pa_remark_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_remark;
+        private System.Windows.Forms.Label PreFix_label;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox PreFix;
+        private System.Windows.Forms.CheckBox CollecRemark;
+        private System.Windows.Forms.CheckBox locksalecode;
     }
 }

+ 76 - 56
UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -64,6 +64,7 @@ namespace UAS_MES.Make
             try
             {
                 OutBoxLength.Text = BaseUtil.GetCacheData("OutBoxLength").ToString();
+                PreFix.Text = BaseUtil.GetCacheData("PreFix").ToString();
             }
             catch (Exception) { }
             sn_code.Focus();
@@ -90,14 +91,14 @@ namespace UAS_MES.Make
         {
             //加载表单数据
             sql.Clear();
-            sql.Append("select pr_code,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,pa_outboxcode,pa_prodcode,pa_salecode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,pr_detail,pa_packageqty,nvl(pa_standardqty,0) pa_standardqty,nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
+            sql.Append("select pr_code,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,pa_remark,pa_outboxcode,pa_prodcode,pa_salecode,pa_makecode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,pa_status,pr_packrule,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,pr_detail,pa_packageqty,nvl(pa_standardqty,0) pa_standardqty,nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,pa_currentqty from package left join product on pa_prodcode=");
             sql.Append("pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
                 //记录该数据保证在修改不被允许的前提下能偶回复之前的值
                 StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
-                ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
+                //ms_salecode.Text = dt.Rows[0]["pa_salecode"].ToString();
                 BaseUtil.SetFormValue(this.Controls, dt);
                 if (pa_standardqty.Text != "0")
                 {
@@ -128,7 +129,7 @@ namespace UAS_MES.Make
                 if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
                 {
                     dh.ExecuteSql("update package set pa_printcount=pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
-                    doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                    doc = lbl.Documents.Open(PrintLabel.Text);
                     if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), oMakeCode == "" ? pa_makecode.Text : oMakeCode, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
@@ -187,6 +188,7 @@ namespace UAS_MES.Make
                         string ms_prodcode = "";
                         string ms_iostatus = "";
                         string ms_outno = "";
+                        string ms_salecode_text = "";
                         if (dt.Rows.Count > 0)
                         {
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
@@ -194,6 +196,12 @@ namespace UAS_MES.Make
                             ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
                             ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
                             ms_outno = dt.Rows[0]["ms_outno"].ToString();
+                            ms_salecode_text = dt.Rows[0]["ms_salecode"].ToString();
+                            if (locksalecode.Checked && ms_salecode.Text != "" && ms_salecode.Text != ms_salecode_text)
+                            {
+                                OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号" + ms_salecode_text + "与界面订单号" + ms_salecode.Text + "不同,无法采集\n", Color.Red, sn_code);
+                                return;
+                            }
                             BaseUtil.SetFormValue(this.Controls, dt);
                         }
                         if (dt.Rows[0]["ms_outno"].ToString() != "")
@@ -233,45 +241,6 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱号不能为空\n", Color.Red, sn_code);
                             return;
                         }
-                        if (pa_status.Text != "1")
-                        {
-                            //按工单核对装箱
-                            switch (pr_packrule.Text.ToUpper())
-                            {
-                                case "MAKE":
-                                    if (ms_makecode != pa_makecode.Text && pa_makecode.Text != "")
-                                    {
-                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "所属工单和当前箱号工单不相等\n", Color.Red, sn_code);
-                                        return;
-                                    }
-                                    break;
-                                case "SALE":
-                                    if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
-                                    {
-                                        sql.Clear();
-                                        sql.Append("select 1 from package left join make on pa_salecode=ma_salecode and pa_prodcode=ma_prodcode left join makeserial ");
-                                        sql.Append("on ma_code=ms_makecode where pa_outboxcode='" + pa_outboxcode.Text + "' and ms_id='" + oMsID + "'");
-                                        DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                        if (dt.Rows.Count == 0)
-                                        {
-                                            OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等或者订单产品不相等\n", Color.Red, sn_code);
-                                            return;
-                                        }
-                                    }
-                                    break;
-                                case "PROD":
-                                    if (ms_prodcode != pr_code.Text && pr_code.Text != "")
-                                    {
-                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "对应产品和该箱所装产品不同\n", Color.Red, sn_code);
-                                        return;
-                                    }
-                                    break;
-                                case "MIX":
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
                         //判断箱内总数必须大于0
                         if (pr_outboxinnerqty.Text == "" || pr_outboxinnerqty.Text == "0")
                         {
@@ -360,8 +329,16 @@ namespace UAS_MES.Make
                                         pa_standardqty.Text = "";
                                         if (AutoPrint.Checked)
                                             Print_Click(new object(), new EventArgs());
-                                        pa_outboxcode.SelectAll();
-                                        pa_outboxcode.Focus();
+                                        if (!CollecRemark.Checked)
+                                        {
+                                            pa_outboxcode.SelectAll();
+                                            pa_outboxcode.Focus();
+                                        }
+                                        else
+                                        {
+                                            pa_remark.SelectAll();
+                                            pa_remark.Focus();
+                                        }
                                         if (PR_CHECKCARTONW != "0")
                                         {
                                             OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "满箱处于称重工序,请在卡通箱称重界面进行称重打印\n", Color.Black, sn_code);
@@ -416,15 +393,10 @@ namespace UAS_MES.Make
         private void pr_code_TextChanged(object sender, EventArgs e)
         {
             LoadCheckQTY();
-            dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
+            dt = (DataTable)dh.ExecuteSql("select la_id,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void PackCollection_FormClosing(object sender, FormClosingEventArgs e)
@@ -445,8 +417,16 @@ namespace UAS_MES.Make
                     pa_status.Text = "1";
                     pa_standardqty.Text = "";
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "装箱采集", "封箱成功", pa_outboxcode.Text, "");
-                    pa_outboxcode.SelectAll();
-                    pa_outboxcode.Focus();
+                    if (!CollecRemark.Checked)
+                    {
+                        pa_outboxcode.SelectAll();
+                        pa_outboxcode.Focus();
+                    }
+                    else
+                    {
+                        pa_remark.SelectAll();
+                        pa_remark.Focus();
+                    }
                     if (PR_CHECKCARTONW != "0")
                     {
                         OperateResult.AppendText(">>卡通箱" + pa_outboxcode.Text + "处于称重工序,请在卡通箱称重界面进行操作\n", Color.Black, sn_code);
@@ -508,7 +488,7 @@ namespace UAS_MES.Make
             {
                 condition = "and ob_status='ENTERING' ";
             }
-            if (pr_sendchecktype.Text=="SaleCode")
+            if (pr_sendchecktype.Text == "SaleCode")
             {
                 condition += " and ob_salecode='" + ms_salecode.Text + "'";
             }
@@ -686,7 +666,7 @@ namespace UAS_MES.Make
                                 }
                                 List<string> SQLS2 = new List<string>();
                                 ////置空原箱
-                                SQLS2.Add("update package set pa_checkno='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                                SQLS2.Add("update package set pa_checkno='',pa_prodcode='',pa_packtype='',pa_salecode='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'");
                                 pa_status.Text = "0";
                                 //删除箱的明细
                                 SQLS2.Add("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'");
@@ -746,7 +726,22 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>箱号长度错误,请重新输入箱号\n", Color.Red);
                     return false;
                 }
-                else return true;
+            }
+            if (PreFix.Text != "")
+            {
+                try
+                {
+                    if (pa_outboxcode.Text.Substring(0, PreFix.Text.Length) != PreFix.Text)
+                    {
+                        OperateResult.AppendText(">>箱号前缀不匹配,请重新输入箱号\n", Color.Red);
+                        return false;
+                    }
+                }
+                catch (Exception)
+                {
+                    OperateResult.AppendText(">>箱号前缀不匹配,请重新输入箱号\n", Color.Red);
+                    return false;
+                }
             }
             return true;
         }
@@ -756,5 +751,30 @@ namespace UAS_MES.Make
             dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
             BaseUtil.SetFormValue(Controls, dt);
         }
+
+        private void pa_remark_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (Keys.Enter == e.KeyCode)
+            {
+                if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
+                {
+                    dh.UpdateByCondition("package", "pa_remark='" + pa_remark.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                    OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "关联信息" + pa_remark.Text + "采集成功\n", Color.Green);
+                    pa_remark.Text = "";
+                    pa_outboxcode.SelectAll();
+                    pa_outboxcode.Focus();
+                }
+                else OperateResult.AppendText(">>请先采集箱内数据\n", Color.Red);
+            }
+        }
+
+        private void PreFix_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                BaseUtil.SetCacheData("PreFix", PreFix.Text);
+                pa_outboxcode.Focus();
+            }
+        }
     }
 }

+ 150 - 53
UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.Designer.cs

@@ -53,7 +53,9 @@
             this.pd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.AutoPrint = new UAS_MES.CustomControl.CustomCheckBox.AutoPrintCheckBox();
             this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.PreFix_label = new System.Windows.Forms.Label();
+            this.PreFix = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.locksalecode = new System.Windows.Forms.CheckBox();
             this.label5 = new System.Windows.Forms.Label();
             this.ms_makecode_label = new System.Windows.Forms.Label();
             this.ms_salecode = new System.Windows.Forms.Label();
@@ -70,6 +72,7 @@
             this.pr_outboxinnerqty_label = new System.Windows.Forms.Label();
             this.pr_code = new System.Windows.Forms.Label();
             this.AutoGenBoxCode = new System.Windows.Forms.CheckBox();
+            this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
             this.groupBoxWithBorder2 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.PrintNum = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.label1 = new System.Windows.Forms.Label();
@@ -108,6 +111,9 @@
             this.mcd_remainqty = new System.Windows.Forms.Label();
             this.mcd_inqty_label = new System.Windows.Forms.Label();
             this.mcd_inqty = new System.Windows.Forms.Label();
+            this.pa_remark_label = new System.Windows.Forms.Label();
+            this.pa_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.CollecRemark = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.PackageDetail)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             this.groupBoxWithBorder2.SuspendLayout();
@@ -141,7 +147,7 @@
             // 
             this.pa_code_label.AutoSize = true;
             this.pa_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_code_label.Location = new System.Drawing.Point(17, 53);
+            this.pa_code_label.Location = new System.Drawing.Point(13, 53);
             this.pa_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_code_label.Name = "pa_code_label";
             this.pa_code_label.Size = new System.Drawing.Size(52, 27);
@@ -152,7 +158,7 @@
             // 
             this.PrintList_label.AutoSize = true;
             this.PrintList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintList_label.Location = new System.Drawing.Point(9, 55);
+            this.PrintList_label.Location = new System.Drawing.Point(5, 57);
             this.PrintList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintList_label.Name = "PrintList_label";
             this.PrintList_label.Size = new System.Drawing.Size(112, 27);
@@ -163,7 +169,7 @@
             // 
             this.PrintNum_label.AutoSize = true;
             this.PrintNum_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintNum_label.Location = new System.Drawing.Point(262, 152);
+            this.PrintNum_label.Location = new System.Drawing.Point(260, 154);
             this.PrintNum_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintNum_label.Name = "PrintNum_label";
             this.PrintNum_label.Size = new System.Drawing.Size(52, 27);
@@ -198,7 +204,7 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(147, 103);
+            this.PrintLabel.Location = new System.Drawing.Point(147, 105);
             this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintLabel.Name = "PrintLabel";
             this.PrintLabel.Size = new System.Drawing.Size(199, 28);
@@ -209,7 +215,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(9, 102);
+            this.label3.Location = new System.Drawing.Point(5, 103);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
@@ -236,7 +242,7 @@
             // PrintList
             // 
             this.PrintList.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.PrintList.Location = new System.Drawing.Point(147, 56);
+            this.PrintList.Location = new System.Drawing.Point(147, 59);
             this.PrintList.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.PrintList.Name = "PrintList";
             this.PrintList.Size = new System.Drawing.Size(199, 28);
@@ -301,7 +307,7 @@
             this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = "ifread";
-            this.sn_code.Size = new System.Drawing.Size(226, 25);
+            this.sn_code.Size = new System.Drawing.Size(225, 25);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -396,7 +402,9 @@
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
-            this.groupBoxWithBorder1.Controls.Add(this.StepCount);
+            this.groupBoxWithBorder1.Controls.Add(this.PreFix_label);
+            this.groupBoxWithBorder1.Controls.Add(this.PreFix);
+            this.groupBoxWithBorder1.Controls.Add(this.locksalecode);
             this.groupBoxWithBorder1.Controls.Add(this.label5);
             this.groupBoxWithBorder1.Controls.Add(this.ms_makecode_label);
             this.groupBoxWithBorder1.Controls.Add(this.ms_salecode);
@@ -426,22 +434,51 @@
             this.groupBoxWithBorder1.Text = "装箱信息";
             this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
             // 
-            // StepCount
-            // 
-            this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(330, 18);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(118, 28);
-            this.StepCount.Source = null;
-            this.StepCount.StepCode = null;
-            this.StepCount.TabIndex = 192;
+            // PreFix_label
+            // 
+            this.PreFix_label.AutoSize = true;
+            this.PreFix_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PreFix_label.Location = new System.Drawing.Point(239, 19);
+            this.PreFix_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PreFix_label.Name = "PreFix_label";
+            this.PreFix_label.Size = new System.Drawing.Size(46, 24);
+            this.PreFix_label.TabIndex = 205;
+            this.PreFix_label.Text = "前缀";
+            // 
+            // PreFix
+            // 
+            this.PreFix.AllPower = null;
+            this.PreFix.BackColor = System.Drawing.Color.White;
+            this.PreFix.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.PreFix.ID = null;
+            this.PreFix.Location = new System.Drawing.Point(297, 19);
+            this.PreFix.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.PreFix.Name = "PreFix";
+            this.PreFix.Power = null;
+            this.PreFix.Size = new System.Drawing.Size(52, 27);
+            this.PreFix.Str = null;
+            this.PreFix.Str1 = null;
+            this.PreFix.Str2 = null;
+            this.PreFix.TabIndex = 204;
+            this.PreFix.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PreFix_KeyDown);
+            // 
+            // locksalecode
+            // 
+            this.locksalecode.AutoSize = true;
+            this.locksalecode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.locksalecode.Location = new System.Drawing.Point(400, 22);
+            this.locksalecode.Margin = new System.Windows.Forms.Padding(4);
+            this.locksalecode.Name = "locksalecode";
+            this.locksalecode.Size = new System.Drawing.Size(119, 19);
+            this.locksalecode.TabIndex = 203;
+            this.locksalecode.Text = "当前订单锁定";
+            this.locksalecode.UseVisualStyleBackColor = true;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(292, 169);
+            this.label5.Location = new System.Drawing.Point(288, 169);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(92, 27);
@@ -452,7 +489,7 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(17, 169);
+            this.ms_makecode_label.Location = new System.Drawing.Point(13, 167);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(72, 27);
@@ -463,7 +500,7 @@
             // 
             this.ms_salecode.AutoSize = true;
             this.ms_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_salecode.Location = new System.Drawing.Point(404, 169);
+            this.ms_salecode.Location = new System.Drawing.Point(400, 169);
             this.ms_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_salecode.Name = "ms_salecode";
             this.ms_salecode.Size = new System.Drawing.Size(0, 27);
@@ -473,7 +510,7 @@
             // 
             this.ms_makecode.AutoSize = true;
             this.ms_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode.Location = new System.Drawing.Point(126, 169);
+            this.ms_makecode.Location = new System.Drawing.Point(121, 167);
             this.ms_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.ms_makecode.Name = "ms_makecode";
@@ -484,7 +521,7 @@
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(137, 15);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(117, 18);
             this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
             this.OutBoxLength_label.Size = new System.Drawing.Size(46, 24);
@@ -497,7 +534,7 @@
             this.OutBoxLength.BackColor = System.Drawing.Color.White;
             this.OutBoxLength.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.OutBoxLength.ID = null;
-            this.OutBoxLength.Location = new System.Drawing.Point(213, 17);
+            this.OutBoxLength.Location = new System.Drawing.Point(175, 19);
             this.OutBoxLength.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.OutBoxLength.Name = "OutBoxLength";
             this.OutBoxLength.Power = null;
@@ -549,7 +586,7 @@
             // 
             this.pa_currentqty_label.AutoSize = true;
             this.pa_currentqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty_label.Location = new System.Drawing.Point(292, 95);
+            this.pa_currentqty_label.Location = new System.Drawing.Point(288, 96);
             this.pa_currentqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty_label.Name = "pa_currentqty_label";
             this.pa_currentqty_label.Size = new System.Drawing.Size(92, 27);
@@ -560,7 +597,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(292, 131);
+            this.pr_detail_label.Location = new System.Drawing.Point(288, 132);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -571,7 +608,7 @@
             // 
             this.pa_currentqty.AutoSize = true;
             this.pa_currentqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_currentqty.Location = new System.Drawing.Point(404, 92);
+            this.pa_currentqty.Location = new System.Drawing.Point(400, 96);
             this.pa_currentqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_currentqty.Name = "pa_currentqty";
             this.pa_currentqty.Size = new System.Drawing.Size(0, 27);
@@ -581,7 +618,7 @@
             // 
             this.pr_code_label.AutoSize = true;
             this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code_label.Location = new System.Drawing.Point(17, 131);
+            this.pr_code_label.Location = new System.Drawing.Point(13, 130);
             this.pr_code_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code_label.Name = "pr_code_label";
             this.pr_code_label.Size = new System.Drawing.Size(92, 27);
@@ -592,7 +629,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(404, 131);
+            this.pr_detail.Location = new System.Drawing.Point(400, 132);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -602,7 +639,7 @@
             // 
             this.pr_outboxinnerqty_label.AutoSize = true;
             this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(17, 94);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(13, 92);
             this.pr_outboxinnerqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
             this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(92, 27);
@@ -613,7 +650,7 @@
             // 
             this.pr_code.AutoSize = true;
             this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_code.Location = new System.Drawing.Point(126, 131);
+            this.pr_code.Location = new System.Drawing.Point(121, 130);
             this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_code.MaximumSize = new System.Drawing.Size(200, 0);
             this.pr_code.Name = "pr_code";
@@ -624,7 +661,7 @@
             // AutoGenBoxCode
             // 
             this.AutoGenBoxCode.AutoSize = true;
-            this.AutoGenBoxCode.Location = new System.Drawing.Point(330, 53);
+            this.AutoGenBoxCode.Location = new System.Drawing.Point(330, 55);
             this.AutoGenBoxCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AutoGenBoxCode.Name = "AutoGenBoxCode";
             this.AutoGenBoxCode.Size = new System.Drawing.Size(114, 31);
@@ -632,9 +669,21 @@
             this.AutoGenBoxCode.Text = "自动生成";
             this.AutoGenBoxCode.UseVisualStyleBackColor = true;
             // 
+            // StepCount
+            // 
+            this.StepCount.LineCode = null;
+            this.StepCount.Location = new System.Drawing.Point(148, 20);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.StepCount.Name = "StepCount";
+            this.StepCount.Size = new System.Drawing.Size(117, 29);
+            this.StepCount.Source = null;
+            this.StepCount.StepCode = null;
+            this.StepCount.TabIndex = 192;
+            // 
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder2.Controls.Add(this.StepCount);
             this.groupBoxWithBorder2.Controls.Add(this.PrintNum);
             this.groupBoxWithBorder2.Controls.Add(this.label1);
             this.groupBoxWithBorder2.Controls.Add(this.checkweightlabel);
@@ -670,7 +719,7 @@
             this.PrintNum.Enabled = false;
             this.PrintNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(322, 154);
+            this.PrintNum.Location = new System.Drawing.Point(323, 154);
             this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
@@ -684,7 +733,7 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(371, 13);
+            this.label1.Location = new System.Drawing.Point(367, 14);
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 27);
@@ -696,7 +745,7 @@
             this.checkweightlabel.AutoSize = true;
             this.checkweightlabel.CutLength = null;
             this.checkweightlabel.ForeColor = System.Drawing.Color.Black;
-            this.checkweightlabel.Location = new System.Drawing.Point(147, 16);
+            this.checkweightlabel.Location = new System.Drawing.Point(143, 18);
             this.checkweightlabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.checkweightlabel.MaximumSize = new System.Drawing.Size(267, 0);
             this.checkweightlabel.Name = "checkweightlabel";
@@ -707,7 +756,7 @@
             // 
             this.ob_nowcheckqty.AutoSize = true;
             this.ob_nowcheckqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(479, 102);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(475, 104);
             this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Size = new System.Drawing.Size(0, 27);
@@ -717,7 +766,7 @@
             // 
             this.ob_batchqty.AutoSize = true;
             this.ob_batchqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty.Location = new System.Drawing.Point(479, 55);
+            this.ob_batchqty.Location = new System.Drawing.Point(475, 58);
             this.ob_batchqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty.Name = "ob_batchqty";
             this.ob_batchqty.Size = new System.Drawing.Size(0, 27);
@@ -727,7 +776,7 @@
             // 
             this.ob_nowcheckqty_label.AutoSize = true;
             this.ob_nowcheckqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(371, 102);
+            this.ob_nowcheckqty_label.Location = new System.Drawing.Point(367, 104);
             this.ob_nowcheckqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_nowcheckqty_label.Name = "ob_nowcheckqty_label";
             this.ob_nowcheckqty_label.Size = new System.Drawing.Size(92, 27);
@@ -738,7 +787,7 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(371, 55);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(367, 58);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
             this.ob_batchqty_label.Size = new System.Drawing.Size(92, 27);
@@ -790,7 +839,7 @@
             // 
             this.ob_checkno.AutoSize = true;
             this.ob_checkno.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno.Location = new System.Drawing.Point(479, 13);
+            this.ob_checkno.Location = new System.Drawing.Point(475, 14);
             this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Size = new System.Drawing.Size(0, 27);
@@ -848,13 +897,13 @@
             this.RefreshWeigh.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.RefreshWeigh.Image = null;
             this.RefreshWeigh.IsShowBorder = true;
-            this.RefreshWeigh.Location = new System.Drawing.Point(148, 157);
+            this.RefreshWeigh.Location = new System.Drawing.Point(148, 146);
             this.RefreshWeigh.Margin = new System.Windows.Forms.Padding(4);
             this.RefreshWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.MoveImage")));
             this.RefreshWeigh.Name = "RefreshWeigh";
             this.RefreshWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("RefreshWeigh.NormalImage")));
             this.RefreshWeigh.Power = null;
-            this.RefreshWeigh.Size = new System.Drawing.Size(78, 30);
+            this.RefreshWeigh.Size = new System.Drawing.Size(77, 30);
             this.RefreshWeigh.TabIndex = 185;
             this.RefreshWeigh.Tag = "ifread";
             this.RefreshWeigh.Text = "刷新重量";
@@ -865,7 +914,7 @@
             // 
             this.pr_cartonunit1.AutoSize = true;
             this.pr_cartonunit1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit1.Location = new System.Drawing.Point(115, 154);
+            this.pr_cartonunit1.Location = new System.Drawing.Point(111, 145);
             this.pr_cartonunit1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit1.Name = "pr_cartonunit1";
             this.pr_cartonunit1.Size = new System.Drawing.Size(25, 27);
@@ -878,7 +927,7 @@
             // 
             this.pr_cartonunit.AutoSize = true;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_cartonunit.Location = new System.Drawing.Point(73, 27);
+            this.pr_cartonunit.Location = new System.Drawing.Point(69, 18);
             this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonunit.Name = "pr_cartonunit";
             this.pr_cartonunit.Size = new System.Drawing.Size(25, 27);
@@ -890,7 +939,7 @@
             // 
             this.pr_cartonboxgw.AutoSize = true;
             this.pr_cartonboxgw.Font = new System.Drawing.Font("微软雅黑", 25F);
-            this.pr_cartonboxgw.Location = new System.Drawing.Point(19, 193);
+            this.pr_cartonboxgw.Location = new System.Drawing.Point(15, 184);
             this.pr_cartonboxgw.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_cartonboxgw.Name = "pr_cartonboxgw";
             this.pr_cartonboxgw.Size = new System.Drawing.Size(0, 55);
@@ -900,7 +949,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(17, 154);
+            this.label4.Location = new System.Drawing.Point(13, 145);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 27);
@@ -912,7 +961,7 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 35F);
             this.weight.ForeColor = System.Drawing.Color.DarkGreen;
-            this.weight.Location = new System.Drawing.Point(19, 61);
+            this.weight.Location = new System.Drawing.Point(15, 53);
             this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.weight.Name = "weight";
             this.weight.Size = new System.Drawing.Size(0, 78);
@@ -922,7 +971,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(17, 27);
+            this.label2.Location = new System.Drawing.Point(13, 18);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(52, 27);
@@ -1005,7 +1054,7 @@
             this.Port.Margin = new System.Windows.Forms.Padding(4);
             this.Port.Name = "Port";
             this.Port.Power = null;
-            this.Port.Size = new System.Drawing.Size(150, 27);
+            this.Port.Size = new System.Drawing.Size(151, 27);
             this.Port.Str = null;
             this.Port.Str1 = null;
             this.Port.Str2 = null;
@@ -1028,11 +1077,11 @@
             this.IP.BackColor = System.Drawing.Color.White;
             this.IP.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.IP.ID = null;
-            this.IP.Location = new System.Drawing.Point(1005, 537);
+            this.IP.Location = new System.Drawing.Point(1005, 538);
             this.IP.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.IP.Name = "IP";
             this.IP.Power = null;
-            this.IP.Size = new System.Drawing.Size(150, 27);
+            this.IP.Size = new System.Drawing.Size(151, 27);
             this.IP.Str = null;
             this.IP.Str1 = null;
             this.IP.Str2 = null;
@@ -1042,7 +1091,7 @@
             // 
             this.IP_label.AutoSize = true;
             this.IP_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.IP_label.Location = new System.Drawing.Point(925, 537);
+            this.IP_label.Location = new System.Drawing.Point(925, 538);
             this.IP_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.IP_label.Name = "IP_label";
             this.IP_label.Size = new System.Drawing.Size(30, 27);
@@ -1140,11 +1189,53 @@
             this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
             this.mcd_inqty.TabIndex = 194;
             // 
+            // pa_remark_label
+            // 
+            this.pa_remark_label.AutoSize = true;
+            this.pa_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_remark_label.Location = new System.Drawing.Point(615, 626);
+            this.pa_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_remark_label.Name = "pa_remark_label";
+            this.pa_remark_label.Size = new System.Drawing.Size(52, 27);
+            this.pa_remark_label.TabIndex = 197;
+            this.pa_remark_label.Text = "备注";
+            // 
+            // pa_remark
+            // 
+            this.pa_remark.AllPower = null;
+            this.pa_remark.BackColor = System.Drawing.Color.White;
+            this.pa_remark.ID = null;
+            this.pa_remark.Location = new System.Drawing.Point(679, 626);
+            this.pa_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pa_remark.Multiline = true;
+            this.pa_remark.Name = "pa_remark";
+            this.pa_remark.Power = null;
+            this.pa_remark.Size = new System.Drawing.Size(196, 56);
+            this.pa_remark.Str = null;
+            this.pa_remark.Str1 = null;
+            this.pa_remark.Str2 = null;
+            this.pa_remark.TabIndex = 198;
+            this.pa_remark.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pa_remark_KeyDown);
+            // 
+            // CollecRemark
+            // 
+            this.CollecRemark.AutoSize = true;
+            this.CollecRemark.Location = new System.Drawing.Point(679, 698);
+            this.CollecRemark.Margin = new System.Windows.Forms.Padding(4);
+            this.CollecRemark.Name = "CollecRemark";
+            this.CollecRemark.Size = new System.Drawing.Size(119, 19);
+            this.CollecRemark.TabIndex = 202;
+            this.CollecRemark.Text = "采集备注信息";
+            this.CollecRemark.UseVisualStyleBackColor = true;
+            // 
             // Make_PackageCollectionWeigh
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1172, 728);
+            this.Controls.Add(this.CollecRemark);
+            this.Controls.Add(this.pa_remark);
+            this.Controls.Add(this.pa_remark_label);
             this.Controls.Add(this.mcd_remainqty_label);
             this.Controls.Add(this.mcd_remainqty);
             this.Controls.Add(this.pr_sendchecktype);
@@ -1277,5 +1368,11 @@
         private System.Windows.Forms.Label mcd_remainqty;
         private System.Windows.Forms.Label mcd_inqty_label;
         private System.Windows.Forms.Label mcd_inqty;
+        private System.Windows.Forms.Label pa_remark_label;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pa_remark;
+        private System.Windows.Forms.CheckBox CollecRemark;
+        private System.Windows.Forms.CheckBox locksalecode;
+        private System.Windows.Forms.Label PreFix_label;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox PreFix;
     }
 }

+ 74 - 56
UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -86,6 +86,7 @@ namespace UAS_MES.Make
             try
             {
                 OutBoxLength.Text = BaseUtil.GetCacheData("OutBoxLength").ToString();
+                PreFix.Text= BaseUtil.GetCacheData("PreFix").ToString();
             }
             catch (Exception) { }
             thread = new Thread(getSerialData);
@@ -159,7 +160,7 @@ namespace UAS_MES.Make
             //加载表单数据
             string Err = "";
             sql.Clear();
-            sql.Append("select pa_prodcode,pr_cartonmaxw,pa_salecode,pa_makecode,pr_cartonunit,pr_code,pr_cartonminw,pr_cartongw,pa_outboxcode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,");
+            sql.Append("select pa_prodcode,pr_cartonmaxw,pa_salecode,pa_remark,pa_makecode,pr_cartonunit,pr_code,pr_cartonminw,pr_cartongw,pa_outboxcode,pa_sccode,nvl(pa_downstatus,0) pa_downstatus,pa_checkno,");
             sql.Append("pa_status,pr_packrule,pr_detail,nvl(pr_sendchecktype,'LineCode')pr_sendchecktype,pa_packageqty,nvl(pa_standardqty,0)pa_standardqty,nvl(pr_outboxinnerqty,0)pr_outboxinnerqty,nvl(PR_CHECKCARTONW,'0') PR_CHECKCARTONW,pa_currentqty from package left join ");
             sql.Append("product on pa_prodcode=pr_code where pa_outboxcode='" + pa_outboxcode.Text + "'");
             Err = "箱号";
@@ -190,7 +191,6 @@ namespace UAS_MES.Make
                 else
                     pr_cartonboxgw.Text = MinWeight + "-" + MaxWeight + dt.Rows[0]["pr_cartonunit"].ToString();
             }
-            else sn_code.Focus();
             LoadCheckQTY();
             LoadCollectedNum();
         }
@@ -211,7 +211,7 @@ namespace UAS_MES.Make
                 if (dh.getFieldDataByCondition("package", "pa_status", "pa_outboxcode='" + pa_outboxcode.Text + "'").ToString() == "1")
                 {
                     dh.ExecuteSql("update package set pa_printcount=pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
-                    doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                    doc = lbl.Documents.Open(PrintLabel.Text);
                     if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), oMakeCode == "" ? pa_makecode.Text : oMakeCode, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
@@ -233,10 +233,10 @@ namespace UAS_MES.Make
         {
             if (e.KeyCode == Keys.Enter)
             {
-                LoadData();
-                LoadGridData();
                 if (CheckOutBoxLength())
                 {
+                    LoadData();
+                    LoadGridData();
                     sn_code.Focus();
                 }
             }
@@ -269,6 +269,7 @@ namespace UAS_MES.Make
                         string ms_prodcode = "";
                         string ms_iostatus = "";
                         string ms_outno = "";
+                        string ms_salecode_text = "";
                         if (dt.Rows.Count > 0)
                         {
                             StandardQTY = decimal.Parse(dt.Rows[0]["pr_outboxinnerqty"].ToString());
@@ -276,6 +277,12 @@ namespace UAS_MES.Make
                             ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
                             ms_iostatus = dt.Rows[0]["ms_iostatus"].ToString();
                             ms_outno = dt.Rows[0]["ms_outno"].ToString();
+                            ms_salecode_text = dt.Rows[0]["ms_salecode"].ToString();
+                            if (locksalecode.Checked && ms_salecode.Text != "" && ms_salecode.Text != ms_salecode_text)
+                            {
+                                OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号" + ms_salecode_text + "与界面订单号" + ms_salecode.Text + "不同,无法采集\n", Color.Red, sn_code);
+                                return;
+                            }
                             BaseUtil.SetFormValue(this.Controls, dt);
                         }
                         if (dt.Rows[0]["ms_outno"].ToString() != "")
@@ -311,45 +318,6 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>箱号不能为空\n", Color.Red, sn_code);
                             return;
                         }
-                        if (pa_status.Text != "1")
-                        {
-                            //按工单核对装箱
-                            switch (pr_packrule.Text.ToUpper())
-                            {
-                                case "MAKE":
-                                    if (ms_makecode != pa_makecode.Text && pa_makecode.Text != "")
-                                    {
-                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "所属工单和当前箱号工单不相等\n", Color.Red, sn_code);
-                                        return;
-                                    }
-                                    break;
-                                case "SALE":
-                                    if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
-                                    {
-                                        sql.Clear();
-                                        sql.Append("select 1 from package left join make on pa_salecode=ma_salecode and pa_prodcode=ma_prodcode left join makeserial ");
-                                        sql.Append("on ma_code=ms_makecode where pa_outboxcode='" + pa_outboxcode.Text + "' and ms_id='" + oMsID + "'");
-                                        DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                                        if (dt.Rows.Count == 0)
-                                        {
-                                            OperateResult.AppendText(">>序列号" + sn_code.Text + "所属订单号和当前箱号订单不相等\n", Color.Red, sn_code);
-                                            return;
-                                        }
-                                    }
-                                    break;
-                                case "PROD":
-                                    if (ms_prodcode != pr_code.Text && pr_code.Text != "")
-                                    {
-                                        OperateResult.AppendText(">>序列号" + sn_code.Text + "对应物料和该箱所装物料不同\n", Color.Red, sn_code);
-                                        return;
-                                    }
-                                    break;
-                                case "MIX":
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
                         //判断箱内总数必须大于0
                         if (pr_outboxinnerqty.Text == "" || pr_outboxinnerqty.Text == "0")
                         {
@@ -473,8 +441,16 @@ namespace UAS_MES.Make
                                         OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量完成\n", Color.Green);
                                         if (AutoPrint.Checked)
                                             Print_Click(new object(), new EventArgs());
-                                        pa_outboxcode.SelectAll();
-                                        pa_outboxcode.Focus();
+                                        if (!CollecRemark.Checked)
+                                        {
+                                            pa_outboxcode.SelectAll();
+                                            pa_outboxcode.Focus();
+                                        }
+                                        else
+                                        {
+                                            pa_remark.SelectAll();
+                                            pa_remark.Focus();
+                                        }
                                     }
                                 }
                                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -515,13 +491,8 @@ namespace UAS_MES.Make
             LoadCheckQTY();
             dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void Make_PackageCollectionWeigh_FormClosing(object sender, FormClosingEventArgs e)
@@ -580,8 +551,16 @@ namespace UAS_MES.Make
                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                     }
                     LoadCheckQTY();
-                    pa_outboxcode.SelectAll();
-                    pa_outboxcode.Focus();
+                    if (!CollecRemark.Checked)
+                    {
+                        pa_outboxcode.SelectAll();
+                        pa_outboxcode.Focus();
+                    }
+                    else
+                    {
+                        pa_remark.SelectAll();
+                        pa_remark.Focus();
+                    }
                 }
             }
             else OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "错误或者已封箱\n", Color.Red);
@@ -758,7 +737,7 @@ namespace UAS_MES.Make
                                 }
                                 List<string> SQLS2 = new List<string>();
                                 ////置空原箱
-                                SQLS2.Add("update package set pa_checkno='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'");
+                                SQLS2.Add("update package set pa_checkno='',pa_prodcode='',pa_packtype='',pa_salecode='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'");
                                 pa_status.Text = "0";
                                 //删除箱的明细
                                 SQLS2.Add("delete from packagedetail where pd_outboxcode='" + pa_outboxcode.Text + "'");
@@ -818,7 +797,22 @@ namespace UAS_MES.Make
                     OperateResult.AppendText(">>箱号长度错误,请重新输入箱号\n", Color.Red);
                     return false;
                 }
-                else return true;
+            }
+            if (PreFix.Text != "")
+            {
+                try
+                {
+                    if (pa_outboxcode.Text.Substring(0, PreFix.Text.Length) != PreFix.Text)
+                    {
+                        OperateResult.AppendText(">>箱号前缀不匹配,请重新输入箱号\n", Color.Red);
+                        return false;
+                    }
+                }
+                catch (Exception)
+                {
+                    OperateResult.AppendText(">>箱号前缀不匹配,请重新输入箱号\n", Color.Red);
+                    return false;
+                }
             }
             return true;
         }
@@ -873,5 +867,29 @@ namespace UAS_MES.Make
             dt = (DataTable)dh.ExecuteSql("select mcd_inqty,ma_qty-mcd_inqty mcd_remainqty from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ms_makecode.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
             BaseUtil.SetFormValue(Controls, dt);
         }
+
+        private void pa_remark_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (Keys.Enter == e.KeyCode)
+            {
+                if (dh.CheckExist("package", "pa_outboxcode='" + pa_outboxcode.Text + "'"))
+                {
+                    dh.UpdateByCondition("package", "pa_remark='" + pa_remark.Text + "'", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                    OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "关联信息" + pa_remark.Text + "采集成功\n", Color.Green);
+                    pa_remark.Text = "";
+                    pa_outboxcode.Focus();
+                }
+                else OperateResult.AppendText(">>请先采集箱内数据\n", Color.Red);
+            }
+        }
+
+        private void PreFix_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                BaseUtil.SetCacheData("PreFix", PreFix.Text);
+                pa_outboxcode.Focus();
+            }
+        }
     }
 }

+ 0 - 18
UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.resx

@@ -212,24 +212,6 @@
   <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="pd_barcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_outboxcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_prodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pa_indate.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="pd_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="DeleteAll.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m

+ 174 - 99
UAS-MES/FunctionCode/Make/Make_PalletCollection.Designer.cs

@@ -73,6 +73,8 @@
             this.OutBoxLength_label = new System.Windows.Forms.Label();
             this.OutBoxLength = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.StepCount = new UAS_MES.CustomControl.TextBoxWithIcon.SourceStepCount();
+            this.PalletPreFix_label = new System.Windows.Forms.Label();
+            this.PalletPreFix = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).BeginInit();
             this.SuspendLayout();
             // 
@@ -80,9 +82,10 @@
             // 
             this.pa_outboxcode_label.AutoSize = true;
             this.pa_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode_label.Location = new System.Drawing.Point(4, 42);
+            this.pa_outboxcode_label.Location = new System.Drawing.Point(5, 52);
+            this.pa_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_outboxcode_label.Name = "pa_outboxcode_label";
-            this.pa_outboxcode_label.Size = new System.Drawing.Size(58, 21);
+            this.pa_outboxcode_label.Size = new System.Drawing.Size(72, 27);
             this.pa_outboxcode_label.TabIndex = 102;
             this.pa_outboxcode_label.Text = "栈板号";
             // 
@@ -90,9 +93,10 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(290, 83);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(387, 104);
+            this.pa_totalqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
-            this.pa_totalqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_totalqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_totalqty_label.TabIndex = 104;
             this.pa_totalqty_label.Text = "已装数量";
             // 
@@ -100,9 +104,10 @@
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(290, 42);
+            this.pa_makecode_label.Location = new System.Drawing.Point(387, 52);
+            this.pa_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_makecode_label.Name = "pa_makecode_label";
-            this.pa_makecode_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_makecode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_makecode_label.TabIndex = 108;
             this.pa_makecode_label.Text = "制造单号";
             // 
@@ -110,9 +115,10 @@
             // 
             this.pa_restqty_label.AutoSize = true;
             this.pa_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_restqty_label.Location = new System.Drawing.Point(753, 127);
+            this.pa_restqty_label.Location = new System.Drawing.Point(1004, 159);
+            this.pa_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_restqty_label.Name = "pa_restqty_label";
-            this.pa_restqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_restqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_restqty_label.TabIndex = 154;
             this.pa_restqty_label.Text = "打印张数";
             // 
@@ -120,9 +126,10 @@
             // 
             this.pa_salecode_label.AutoSize = true;
             this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(753, 42);
+            this.pa_salecode_label.Location = new System.Drawing.Point(1004, 52);
+            this.pa_salecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_salecode_label.Name = "pa_salecode_label";
-            this.pa_salecode_label.Size = new System.Drawing.Size(42, 21);
+            this.pa_salecode_label.Size = new System.Drawing.Size(52, 27);
             this.pa_salecode_label.TabIndex = 157;
             this.pa_salecode_label.Text = "合同";
             // 
@@ -130,9 +137,10 @@
             // 
             this.outboxcode_label.AutoSize = true;
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.outboxcode_label.Location = new System.Drawing.Point(713, 261);
+            this.outboxcode_label.Location = new System.Drawing.Point(951, 326);
+            this.outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.outboxcode_label.Name = "outboxcode_label";
-            this.outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.outboxcode_label.Size = new System.Drawing.Size(52, 27);
             this.outboxcode_label.TabIndex = 166;
             this.outboxcode_label.Text = "箱号";
             // 
@@ -140,9 +148,10 @@
             // 
             this.pa_prodcode_label.AutoSize = true;
             this.pa_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode_label.Location = new System.Drawing.Point(482, 42);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(643, 52);
+            this.pa_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_prodcode_label.Name = "pa_prodcode_label";
-            this.pa_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_prodcode_label.Size = new System.Drawing.Size(92, 27);
             this.pa_prodcode_label.TabIndex = 169;
             this.pa_prodcode_label.Text = "产品编号";
             // 
@@ -150,10 +159,10 @@
             // 
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(845, 83);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.PrintLabel.Location = new System.Drawing.Point(1127, 104);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(119, 20);
+            this.PrintLabel.Size = new System.Drawing.Size(157, 23);
             this.PrintLabel.TabIndex = 172;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -161,9 +170,10 @@
             // 
             this.PrintLabel_label.AutoSize = true;
             this.PrintLabel_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintLabel_label.Location = new System.Drawing.Point(753, 83);
+            this.PrintLabel_label.Location = new System.Drawing.Point(1004, 104);
+            this.PrintLabel_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrintLabel_label.Name = "PrintLabel_label";
-            this.PrintLabel_label.Size = new System.Drawing.Size(74, 21);
+            this.PrintLabel_label.Size = new System.Drawing.Size(92, 27);
             this.PrintLabel_label.TabIndex = 174;
             this.PrintLabel_label.Text = "标签文件";
             // 
@@ -171,9 +181,10 @@
             // 
             this.PrinterList_label.AutoSize = true;
             this.PrinterList_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrinterList_label.Location = new System.Drawing.Point(482, 83);
+            this.PrinterList_label.Location = new System.Drawing.Point(643, 104);
+            this.PrinterList_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.PrinterList_label.Name = "PrinterList_label";
-            this.PrinterList_label.Size = new System.Drawing.Size(90, 21);
+            this.PrinterList_label.Size = new System.Drawing.Size(112, 27);
             this.PrinterList_label.TabIndex = 173;
             this.PrinterList_label.Text = "打印机列表";
             // 
@@ -181,9 +192,10 @@
             // 
             this.pa_packageqty_label.AutoSize = true;
             this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_packageqty_label.Location = new System.Drawing.Point(4, 83);
+            this.pa_packageqty_label.Location = new System.Drawing.Point(5, 104);
+            this.pa_packageqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_packageqty_label.Name = "pa_packageqty_label";
-            this.pa_packageqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_packageqty_label.Size = new System.Drawing.Size(92, 27);
             this.pa_packageqty_label.TabIndex = 176;
             this.pa_packageqty_label.Text = "栈板容量";
             // 
@@ -191,9 +203,10 @@
             // 
             this.AutoOutBoxCode.AutoSize = true;
             this.AutoOutBoxCode.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.AutoOutBoxCode.Location = new System.Drawing.Point(192, 16);
+            this.AutoOutBoxCode.Location = new System.Drawing.Point(10, 20);
+            this.AutoOutBoxCode.Margin = new System.Windows.Forms.Padding(4);
             this.AutoOutBoxCode.Name = "AutoOutBoxCode";
-            this.AutoOutBoxCode.Size = new System.Drawing.Size(84, 24);
+            this.AutoOutBoxCode.Size = new System.Drawing.Size(100, 27);
             this.AutoOutBoxCode.TabIndex = 180;
             this.AutoOutBoxCode.Text = "自动生成";
             this.AutoOutBoxCode.UseVisualStyleBackColor = true;
@@ -202,9 +215,10 @@
             // 
             this.pa_status.AutoSize = true;
             this.pa_status.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_status.Location = new System.Drawing.Point(868, 174);
+            this.pa_status.Location = new System.Drawing.Point(1157, 218);
+            this.pa_status.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_status.Name = "pa_status";
-            this.pa_status.Size = new System.Drawing.Size(0, 21);
+            this.pa_status.Size = new System.Drawing.Size(0, 27);
             this.pa_status.TabIndex = 181;
             this.pa_status.Visible = false;
             // 
@@ -212,9 +226,10 @@
             // 
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.Cancel.Location = new System.Drawing.Point(912, 259);
+            this.Cancel.Location = new System.Drawing.Point(1216, 324);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(4);
             this.Cancel.Name = "Cancel";
-            this.Cancel.Size = new System.Drawing.Size(84, 24);
+            this.Cancel.Size = new System.Drawing.Size(100, 27);
             this.Cancel.TabIndex = 185;
             this.Cancel.Text = "取消采集";
             this.Cancel.UseVisualStyleBackColor = true;
@@ -222,9 +237,10 @@
             // pr_packrule
             // 
             this.pr_packrule.AutoSize = true;
-            this.pr_packrule.Location = new System.Drawing.Point(749, 521);
+            this.pr_packrule.Location = new System.Drawing.Point(999, 651);
+            this.pr_packrule.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_packrule.Name = "pr_packrule";
-            this.pr_packrule.Size = new System.Drawing.Size(0, 12);
+            this.pr_packrule.Size = new System.Drawing.Size(0, 15);
             this.pr_packrule.TabIndex = 186;
             this.pr_packrule.Visible = false;
             // 
@@ -232,36 +248,39 @@
             // 
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode.Location = new System.Drawing.Point(844, 42);
+            this.pa_salecode.Location = new System.Drawing.Point(1125, 52);
+            this.pa_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 21);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 27);
             this.pa_salecode.TabIndex = 187;
-            this.pa_salecode.Visible = false;
             // 
             // pd_makecode
             // 
             this.pd_makecode.AutoSize = true;
-            this.pd_makecode.Location = new System.Drawing.Point(798, 300);
+            this.pd_makecode.Location = new System.Drawing.Point(1064, 375);
+            this.pd_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pd_makecode.Name = "pd_makecode";
-            this.pd_makecode.Size = new System.Drawing.Size(0, 12);
+            this.pd_makecode.Size = new System.Drawing.Size(0, 15);
             this.pd_makecode.TabIndex = 188;
             this.pd_makecode.Visible = false;
             // 
             // pd_prodcode
             // 
             this.pd_prodcode.AutoSize = true;
-            this.pd_prodcode.Location = new System.Drawing.Point(749, 299);
+            this.pd_prodcode.Location = new System.Drawing.Point(999, 374);
+            this.pd_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pd_prodcode.Name = "pd_prodcode";
-            this.pd_prodcode.Size = new System.Drawing.Size(0, 12);
+            this.pd_prodcode.Size = new System.Drawing.Size(0, 15);
             this.pd_prodcode.TabIndex = 189;
             this.pd_prodcode.Visible = false;
             // 
             // pd_salecode
             // 
             this.pd_salecode.AutoSize = true;
-            this.pd_salecode.Location = new System.Drawing.Point(916, 298);
+            this.pd_salecode.Location = new System.Drawing.Point(1221, 372);
+            this.pd_salecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pd_salecode.Name = "pd_salecode";
-            this.pd_salecode.Size = new System.Drawing.Size(0, 12);
+            this.pd_salecode.Size = new System.Drawing.Size(0, 15);
             this.pd_salecode.TabIndex = 190;
             this.pd_salecode.Visible = false;
             // 
@@ -270,11 +289,11 @@
             this.pa_standardqty.AllPower = null;
             this.pa_standardqty.BackColor = System.Drawing.Color.White;
             this.pa_standardqty.ID = null;
-            this.pa_standardqty.Location = new System.Drawing.Point(85, 84);
-            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.pa_standardqty.Location = new System.Drawing.Point(113, 105);
+            this.pa_standardqty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pa_standardqty.Name = "pa_standardqty";
             this.pa_standardqty.Power = null;
-            this.pa_standardqty.Size = new System.Drawing.Size(114, 21);
+            this.pa_standardqty.Size = new System.Drawing.Size(151, 25);
             this.pa_standardqty.Str = null;
             this.pa_standardqty.Str1 = null;
             this.pa_standardqty.Str2 = null;
@@ -287,10 +306,11 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.Enabled = false;
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(845, 129);
+            this.PrintNum.Location = new System.Drawing.Point(1127, 161);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(119, 21);
+            this.PrintNum.Size = new System.Drawing.Size(157, 25);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -303,12 +323,13 @@
             this.Packing.DownImage = ((System.Drawing.Image)(resources.GetObject("Packing.DownImage")));
             this.Packing.Image = ((System.Drawing.Image)(resources.GetObject("Packing.Image")));
             this.Packing.IsShowBorder = true;
-            this.Packing.Location = new System.Drawing.Point(902, 213);
+            this.Packing.Location = new System.Drawing.Point(1203, 266);
+            this.Packing.Margin = new System.Windows.Forms.Padding(4);
             this.Packing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Packing.MoveImage")));
             this.Packing.Name = "Packing";
             this.Packing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Packing.NormalImage")));
             this.Packing.Power = null;
-            this.Packing.Size = new System.Drawing.Size(56, 24);
+            this.Packing.Size = new System.Drawing.Size(75, 30);
             this.Packing.TabIndex = 178;
             this.Packing.Text = "封栈板";
             this.Packing.UseVisualStyleBackColor = true;
@@ -316,10 +337,10 @@
             // 
             // PrinterList
             // 
-            this.PrinterList.Location = new System.Drawing.Point(592, 83);
-            this.PrinterList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrinterList.Location = new System.Drawing.Point(789, 104);
+            this.PrinterList.Margin = new System.Windows.Forms.Padding(5);
             this.PrinterList.Name = "PrinterList";
-            this.PrinterList.Size = new System.Drawing.Size(132, 20);
+            this.PrinterList.Size = new System.Drawing.Size(176, 25);
             this.PrinterList.TabIndex = 171;
             // 
             // pa_prodcode
@@ -327,10 +348,11 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(588, 42);
-            this.pa_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_prodcode.Location = new System.Drawing.Point(784, 52);
+            this.pa_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_prodcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 21);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
             this.pa_prodcode.TabIndex = 170;
             this.pa_prodcode.Tag = "1";
             this.pa_prodcode.TextChanged += new System.EventHandler(this.pa_prodcode_TextChanged);
@@ -342,12 +364,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(829, 510);
+            this.Clean.Location = new System.Drawing.Point(1105, 638);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(60, 24);
+            this.Clean.Size = new System.Drawing.Size(80, 30);
             this.Clean.TabIndex = 168;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -356,9 +379,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(715, 300);
+            this.OperateResult.Location = new System.Drawing.Point(953, 375);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(277, 204);
+            this.OperateResult.Size = new System.Drawing.Size(368, 254);
             this.OperateResult.TabIndex = 167;
             this.OperateResult.Text = "";
             // 
@@ -367,10 +391,11 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(764, 261);
+            this.outboxcode.Location = new System.Drawing.Point(1019, 326);
+            this.outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifread";
-            this.outboxcode.Size = new System.Drawing.Size(132, 21);
+            this.outboxcode.Size = new System.Drawing.Size(175, 25);
             this.outboxcode.Str = null;
             this.outboxcode.Str1 = null;
             this.outboxcode.Str2 = null;
@@ -383,10 +408,11 @@
             this.pa_outboxcode.AllPower = "ifall";
             this.pa_outboxcode.BackColor = System.Drawing.Color.White;
             this.pa_outboxcode.ID = null;
-            this.pa_outboxcode.Location = new System.Drawing.Point(85, 44);
+            this.pa_outboxcode.Location = new System.Drawing.Point(113, 55);
+            this.pa_outboxcode.Margin = new System.Windows.Forms.Padding(4);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Power = "ifread";
-            this.pa_outboxcode.Size = new System.Drawing.Size(173, 21);
+            this.pa_outboxcode.Size = new System.Drawing.Size(229, 25);
             this.pa_outboxcode.Str = null;
             this.pa_outboxcode.Str1 = null;
             this.pa_outboxcode.Str2 = null;
@@ -401,12 +427,13 @@
             this.Printlab.DownImage = ((System.Drawing.Image)(resources.GetObject("Printlab.DownImage")));
             this.Printlab.Image = ((System.Drawing.Image)(resources.GetObject("Printlab.Image")));
             this.Printlab.IsShowBorder = true;
-            this.Printlab.Location = new System.Drawing.Point(826, 213);
+            this.Printlab.Location = new System.Drawing.Point(1101, 266);
+            this.Printlab.Margin = new System.Windows.Forms.Padding(4);
             this.Printlab.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printlab.MoveImage")));
             this.Printlab.Name = "Printlab";
             this.Printlab.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printlab.NormalImage")));
             this.Printlab.Power = null;
-            this.Printlab.Size = new System.Drawing.Size(45, 24);
+            this.Printlab.Size = new System.Drawing.Size(60, 30);
             this.Printlab.TabIndex = 161;
             this.Printlab.Text = "打印";
             this.Printlab.UseVisualStyleBackColor = true;
@@ -419,12 +446,13 @@
             this.ReleasePallet.DownImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.DownImage")));
             this.ReleasePallet.Image = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.Image")));
             this.ReleasePallet.IsShowBorder = true;
-            this.ReleasePallet.Location = new System.Drawing.Point(740, 213);
+            this.ReleasePallet.Location = new System.Drawing.Point(987, 266);
+            this.ReleasePallet.Margin = new System.Windows.Forms.Padding(4);
             this.ReleasePallet.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.MoveImage")));
             this.ReleasePallet.Name = "ReleasePallet";
             this.ReleasePallet.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReleasePallet.NormalImage")));
             this.ReleasePallet.Power = null;
-            this.ReleasePallet.Size = new System.Drawing.Size(56, 24);
+            this.ReleasePallet.Size = new System.Drawing.Size(75, 30);
             this.ReleasePallet.TabIndex = 160;
             this.ReleasePallet.Text = "解除栈板";
             this.ReleasePallet.UseVisualStyleBackColor = true;
@@ -437,12 +465,13 @@
             this.NewPalletCode.DownImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.DownImage")));
             this.NewPalletCode.Image = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.Image")));
             this.NewPalletCode.IsShowBorder = true;
-            this.NewPalletCode.Location = new System.Drawing.Point(916, 16);
+            this.NewPalletCode.Location = new System.Drawing.Point(1221, 20);
+            this.NewPalletCode.Margin = new System.Windows.Forms.Padding(4);
             this.NewPalletCode.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.MoveImage")));
             this.NewPalletCode.Name = "NewPalletCode";
             this.NewPalletCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewPalletCode.NormalImage")));
             this.NewPalletCode.Power = "ifread";
-            this.NewPalletCode.Size = new System.Drawing.Size(60, 24);
+            this.NewPalletCode.Size = new System.Drawing.Size(80, 30);
             this.NewPalletCode.TabIndex = 159;
             this.NewPalletCode.Text = "新增栈板";
             this.NewPalletCode.UseVisualStyleBackColor = true;
@@ -454,10 +483,11 @@
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
             this.pa_custcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode.Location = new System.Drawing.Point(724, 174);
-            this.pa_custcode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_custcode.Location = new System.Drawing.Point(965, 218);
+            this.pa_custcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_custcode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_custcode.Name = "pa_custcode";
-            this.pa_custcode.Size = new System.Drawing.Size(0, 21);
+            this.pa_custcode.Size = new System.Drawing.Size(0, 27);
             this.pa_custcode.TabIndex = 158;
             this.pa_custcode.Tag = "1";
             // 
@@ -472,18 +502,21 @@
             this.Column4,
             this.Column5});
             this.PackageInf.EnableContentClick = true;
-            this.PackageInf.Location = new System.Drawing.Point(3, 129);
+            this.PackageInf.Location = new System.Drawing.Point(4, 161);
+            this.PackageInf.Margin = new System.Windows.Forms.Padding(4);
             this.PackageInf.Name = "PackageInf";
             this.PackageInf.RowTemplate.Height = 23;
-            this.PackageInf.Size = new System.Drawing.Size(706, 415);
+            this.PackageInf.Size = new System.Drawing.Size(941, 519);
             this.PackageInf.TabIndex = 156;
             // 
             // pd_outboxcode
             // 
             this.pd_outboxcode.DataPropertyName = "code";
             this.pd_outboxcode.HeaderText = "箱号";
+            this.pd_outboxcode.MinimumWidth = 200;
             this.pd_outboxcode.Name = "pd_outboxcode";
             this.pd_outboxcode.ReadOnly = true;
+            this.pd_outboxcode.Width = 200;
             // 
             // pd_innerqty
             // 
@@ -491,38 +524,45 @@
             this.pd_innerqty.HeaderText = "数量";
             this.pd_innerqty.Name = "pd_innerqty";
             this.pd_innerqty.ReadOnly = true;
+            this.pd_innerqty.Width = 70;
             // 
             // Column3
             // 
             this.Column3.DataPropertyName = "pd_prodcode";
             this.Column3.HeaderText = "产品编号";
+            this.Column3.MinimumWidth = 150;
             this.Column3.Name = "Column3";
             this.Column3.ReadOnly = true;
+            this.Column3.Width = 150;
             // 
             // Column4
             // 
             this.Column4.DataPropertyName = "pd_makecode";
             this.Column4.HeaderText = "工单号";
+            this.Column4.MinimumWidth = 150;
             this.Column4.Name = "Column4";
             this.Column4.ReadOnly = true;
+            this.Column4.Width = 150;
             // 
             // Column5
             // 
-            this.Column5.DataPropertyName = "pa_custcode";
-            this.Column5.HeaderText = "客户";
-            this.Column5.MinimumWidth = 100;
+            this.Column5.DataPropertyName = "pa_salecode";
+            this.Column5.HeaderText = "合同";
+            this.Column5.MinimumWidth = 150;
             this.Column5.Name = "Column5";
             this.Column5.ReadOnly = true;
+            this.Column5.Width = 150;
             // 
             // pa_makecode
             // 
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(374, 42);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(499, 52);
+            this.pa_makecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 21);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
@@ -531,29 +571,31 @@
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(374, 83);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(499, 104);
+            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(200, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 21);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 27);
             this.pa_totalqty.TabIndex = 105;
             this.pa_totalqty.Tag = "1";
             // 
             // AutoPrint
             // 
             this.AutoPrint.Checked = false;
-            this.AutoPrint.Location = new System.Drawing.Point(757, 174);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.AutoPrint.Location = new System.Drawing.Point(1009, 218);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.AutoPrint.Name = "AutoPrint";
-            this.AutoPrint.Size = new System.Drawing.Size(84, 22);
+            this.AutoPrint.Size = new System.Drawing.Size(112, 28);
             this.AutoPrint.TabIndex = 191;
             // 
             // OutBoxLength_label
             // 
             this.OutBoxLength_label.AutoSize = true;
             this.OutBoxLength_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLength_label.Location = new System.Drawing.Point(82, 16);
+            this.OutBoxLength_label.Location = new System.Drawing.Point(122, 21);
+            this.OutBoxLength_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.OutBoxLength_label.Name = "OutBoxLength_label";
-            this.OutBoxLength_label.Size = new System.Drawing.Size(37, 20);
+            this.OutBoxLength_label.Size = new System.Drawing.Size(46, 24);
             this.OutBoxLength_label.TabIndex = 193;
             this.OutBoxLength_label.Text = "长度";
             // 
@@ -563,11 +605,11 @@
             this.OutBoxLength.BackColor = System.Drawing.Color.White;
             this.OutBoxLength.Font = new System.Drawing.Font("微软雅黑", 9F);
             this.OutBoxLength.ID = null;
-            this.OutBoxLength.Location = new System.Drawing.Point(125, 16);
-            this.OutBoxLength.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
+            this.OutBoxLength.Location = new System.Drawing.Point(179, 20);
+            this.OutBoxLength.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
             this.OutBoxLength.Name = "OutBoxLength";
             this.OutBoxLength.Power = null;
-            this.OutBoxLength.Size = new System.Drawing.Size(38, 23);
+            this.OutBoxLength.Size = new System.Drawing.Size(49, 27);
             this.OutBoxLength.Str = null;
             this.OutBoxLength.Str1 = null;
             this.OutBoxLength.Str2 = null;
@@ -577,19 +619,49 @@
             // StepCount
             // 
             this.StepCount.LineCode = null;
-            this.StepCount.Location = new System.Drawing.Point(486, 11);
-            this.StepCount.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.StepCount.Location = new System.Drawing.Point(643, 14);
+            this.StepCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.StepCount.Name = "StepCount";
-            this.StepCount.Size = new System.Drawing.Size(88, 22);
+            this.StepCount.Size = new System.Drawing.Size(117, 28);
             this.StepCount.Source = null;
             this.StepCount.StepCode = null;
             this.StepCount.TabIndex = 194;
             // 
+            // PalletPreFix_label
+            // 
+            this.PalletPreFix_label.AutoSize = true;
+            this.PalletPreFix_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PalletPreFix_label.Location = new System.Drawing.Point(242, 21);
+            this.PalletPreFix_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.PalletPreFix_label.Name = "PalletPreFix_label";
+            this.PalletPreFix_label.Size = new System.Drawing.Size(46, 24);
+            this.PalletPreFix_label.TabIndex = 196;
+            this.PalletPreFix_label.Text = "前缀";
+            // 
+            // PalletPreFix
+            // 
+            this.PalletPreFix.AllPower = null;
+            this.PalletPreFix.BackColor = System.Drawing.Color.White;
+            this.PalletPreFix.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.PalletPreFix.ID = null;
+            this.PalletPreFix.Location = new System.Drawing.Point(293, 20);
+            this.PalletPreFix.Margin = new System.Windows.Forms.Padding(8, 9, 8, 9);
+            this.PalletPreFix.Name = "PalletPreFix";
+            this.PalletPreFix.Power = null;
+            this.PalletPreFix.Size = new System.Drawing.Size(49, 27);
+            this.PalletPreFix.Str = null;
+            this.PalletPreFix.Str1 = null;
+            this.PalletPreFix.Str2 = null;
+            this.PalletPreFix.TabIndex = 195;
+            this.PalletPreFix.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PalletPreFix_KeyDown);
+            // 
             // Make_PalletCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(997, 552);
+            this.ClientSize = new System.Drawing.Size(1329, 690);
+            this.Controls.Add(this.PalletPreFix_label);
+            this.Controls.Add(this.PalletPreFix);
             this.Controls.Add(this.StepCount);
             this.Controls.Add(this.OutBoxLength_label);
             this.Controls.Add(this.OutBoxLength);
@@ -630,6 +702,7 @@
             this.Controls.Add(this.pa_totalqty_label);
             this.Controls.Add(this.pa_outboxcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Make_PalletCollection";
             this.Tag = "Make!BigBoxCollection";
             this.Text = " ";
@@ -675,11 +748,6 @@
         private System.Windows.Forms.CheckBox Cancel;
         private System.Windows.Forms.Label pr_packrule;
         private System.Windows.Forms.Label pa_salecode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outboxcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_innerqty;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
         private System.Windows.Forms.Label pd_makecode;
         private System.Windows.Forms.Label pd_prodcode;
         private System.Windows.Forms.Label pd_salecode;
@@ -687,5 +755,12 @@
         private System.Windows.Forms.Label OutBoxLength_label;
         private CustomControl.TextBoxWithIcon.SnCollectionBox OutBoxLength;
         private CustomControl.TextBoxWithIcon.SourceStepCount StepCount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outboxcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_innerqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private System.Windows.Forms.Label PalletPreFix_label;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox PalletPreFix;
     }
 }

+ 44 - 12
UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -70,6 +70,7 @@ namespace UAS_MES.Make
             BaseUtil.SetFormCenter(stw);
             stw.ShowDialog();
             OutBoxLength.Text = BaseUtil.GetCacheData("PalletLength").ToString();
+            PalletPreFix.Text = BaseUtil.GetCacheData("PalletPreFix").ToString();
             dh = new DataHelper();
             StepCount.StepCode = User.CurrentStepCode;
             StepCount.Source = User.UserSourceCode;
@@ -94,9 +95,9 @@ namespace UAS_MES.Make
                 if (dt.Rows.Count > 0)
                 {
                     BaseUtil.SetFormValue(Controls, dt);
-                    LoadGridData();
                     pa_id = dt.Rows[0]["pa_id"].ToString();
                 }
+                LoadGridData();
                 if (CheckOutBoxLength())
                 {
                     if (pa_standardqty.Text == "")
@@ -205,7 +206,7 @@ namespace UAS_MES.Make
                                 pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PALLET", "", pa_prodcode.Text, User.UserCode);
                             }
                         }
-                        else if (pa_outboxcode.Text == "" || pa_status.Text == "1" && AutoOutBoxCode.Checked)
+                        else if (pa_outboxcode.Text != "" && pa_status.Text == "1" && AutoOutBoxCode.Checked)
                         {
                             pa_outboxcode.Text = LogicHandler.GetOutBoxCode("PALLET", "", pa_prodcode.Text, User.UserCode);
                         }
@@ -232,10 +233,13 @@ namespace UAS_MES.Make
                         {
                             pa_id = dt.Rows[0]["pa_id"].ToString();
                         }
-                        if (!LogicHandler.CheckPackRule(pr_packrule.Text, pa_outboxcode.Text, outboxcode.Text, pa_makecode.Text, pa_salecode.Text, pa_prodcode.Text, out ErrorMessage))
+                        if (int.Parse(pa_totalqty.Text == "" ? "0" : pa_totalqty.Text) > 0)
                         {
-                            OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, outboxcode);
-                            return;
+                            if (!LogicHandler.CheckPackRule(pr_packrule.Text, pa_outboxcode.Text, outboxcode.Text, pa_makecode.Text, pa_salecode.Text, pa_prodcode.Text, out ErrorMessage))
+                            {
+                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, outboxcode);
+                                return;
+                            }
                         }
                         dt = (DataTable)dh.ExecuteSql("select pa_totalqty,pa_mothercode,nvl(pa_status,0) pa_status from package where pa_outboxcode='" + outboxcode.Text + "'", "select");
                         if (dt.Rows.Count > 0)
@@ -343,6 +347,14 @@ namespace UAS_MES.Make
             sql.Append(",pd_makecode,pa_prodcode,pa_custcode,pa_packageqty from packagedetail left join package on pd_paid=pa_id left ");
             sql.Append("join product on pr_code=pa_prodcode where pa_outboxcode ='" + pa_outboxcode.Text + "' and pa_type=3");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count == 0)
+            {
+                dh.ExecuteSql("update package set pa_checkno='',pa_prodcode='',pa_packtype='',pa_salecode='',pa_makecode='',pa_packageqty=0,pa_totalqty=0,pa_currentqty=0,pa_status=0 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+            }
+            else if (dt.Rows.Count == 1)
+            {
+                dh.ExecuteSql("update package set pa_prodcode='" + pd_prodcode.Text + "',pa_salecode='" + pd_salecode.Text + "',pa_makecode='" + pd_makecode.Text + "' where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
+            }
             BaseUtil.FillDgvWithDataTable(PackageInf, dt);
         }
 
@@ -350,13 +362,8 @@ namespace UAS_MES.Make
         {
             DataTable _dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pa_prodcode.Text + "' and la_templatetype='栈板标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = _dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < _dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(_dt.Rows[i]["la_name"].ToString(), _dt.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void LoadCollectNum()
@@ -395,7 +402,7 @@ namespace UAS_MES.Make
                         pa_outboxcode.Focus();
                         pa_outboxcode.SelectAll();
                     }
-                    doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                    doc = lbl.Documents.Open(PrintLabel.Text);
                     if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(">>打印栈板" + pa_outboxcode.Text + "\n", Color.Black);
@@ -550,6 +557,22 @@ namespace UAS_MES.Make
                 }
                 else return true;
             }
+            if (PalletPreFix.Text != "")
+            {
+                try
+                {
+                    if (pa_outboxcode.Text.Substring(0, PalletPreFix.Text.Length) != PalletPreFix.Text)
+                    {
+                        OperateResult.AppendText(">>箱号前缀不匹配,请重新输入箱号\n", Color.Red);
+                        return false;
+                    }
+                }
+                catch (Exception)
+                {
+                    OperateResult.AppendText(">>箱号前缀不匹配,请重新输入箱号\n", Color.Red);
+                    return false;
+                }
+            }
             return true;
         }
 
@@ -573,5 +596,14 @@ namespace UAS_MES.Make
                 }
             }
         }
+
+        private void PalletPreFix_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                BaseUtil.SetCacheData("PalletPreFix", PalletPreFix.Text);
+                pa_outboxcode.Focus();
+            }
+        }
     }
 }

+ 101 - 92
UAS-MES/FunctionCode/Make/Make_PalletWeigh.Designer.cs

@@ -75,10 +75,10 @@
             this.panel4.Controls.Add(this.pr_cartonunit);
             this.panel4.Controls.Add(this.label22);
             this.panel4.Controls.Add(this.weight);
-            this.panel4.Location = new System.Drawing.Point(46, 94);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.panel4.Location = new System.Drawing.Point(31, 63);
+            this.panel4.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(552, 184);
+            this.panel4.Size = new System.Drawing.Size(369, 123);
             this.panel4.TabIndex = 92;
             // 
             // pr_cartonunit
@@ -87,10 +87,9 @@
             this.pr_cartonunit.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.pr_cartonunit.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.pr_cartonunit.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.pr_cartonunit.Location = new System.Drawing.Point(460, 74);
-            this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_cartonunit.Location = new System.Drawing.Point(307, 49);
             this.pr_cartonunit.Name = "pr_cartonunit";
-            this.pr_cartonunit.Size = new System.Drawing.Size(46, 38);
+            this.pr_cartonunit.Size = new System.Drawing.Size(31, 25);
             this.pr_cartonunit.TabIndex = 42;
             this.pr_cartonunit.Text = "克";
             this.pr_cartonunit.Visible = false;
@@ -101,10 +100,9 @@
             this.label22.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.label22.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label22.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label22.Location = new System.Drawing.Point(22, 74);
-            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label22.Location = new System.Drawing.Point(15, 49);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(75, 38);
+            this.label22.Size = new System.Drawing.Size(50, 25);
             this.label22.TabIndex = 20;
             this.label22.Text = "重量";
             // 
@@ -116,20 +114,18 @@
             this.weight.AutoSize = true;
             this.weight.Font = new System.Drawing.Font("微软雅黑", 22.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.weight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0)))));
-            this.weight.Location = new System.Drawing.Point(156, 62);
-            this.weight.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.weight.Location = new System.Drawing.Point(104, 41);
             this.weight.Name = "weight";
-            this.weight.Size = new System.Drawing.Size(0, 58);
+            this.weight.Size = new System.Drawing.Size(0, 39);
             this.weight.TabIndex = 41;
             // 
             // label15
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(46, 14);
-            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Location = new System.Drawing.Point(31, 9);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(128, 46);
+            this.label15.Size = new System.Drawing.Size(86, 31);
             this.label15.TabIndex = 93;
             this.label15.Text = "栈板号";
             // 
@@ -137,10 +133,9 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label1.Location = new System.Drawing.Point(978, 94);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(652, 63);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(110, 31);
+            this.label1.Size = new System.Drawing.Size(74, 21);
             this.label1.TabIndex = 165;
             this.label1.Text = "打印标签";
             // 
@@ -148,10 +143,9 @@
             // 
             this.Printer_label.AutoSize = true;
             this.Printer_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.Printer_label.Location = new System.Drawing.Point(978, 22);
-            this.Printer_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.Printer_label.Location = new System.Drawing.Point(652, 15);
             this.Printer_label.Name = "Printer_label";
-            this.Printer_label.Size = new System.Drawing.Size(134, 31);
+            this.Printer_label.Size = new System.Drawing.Size(90, 21);
             this.Printer_label.TabIndex = 164;
             this.Printer_label.Text = "打印机列表";
             // 
@@ -160,10 +154,10 @@
             this.PrintLabel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.PrintLabel.Font = new System.Drawing.Font("宋体", 9F);
             this.PrintLabel.FormattingEnabled = true;
-            this.PrintLabel.Location = new System.Drawing.Point(1125, 98);
-            this.PrintLabel.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.PrintLabel.Location = new System.Drawing.Point(750, 65);
+            this.PrintLabel.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.PrintLabel.Name = "PrintLabel";
-            this.PrintLabel.Size = new System.Drawing.Size(196, 26);
+            this.PrintLabel.Size = new System.Drawing.Size(132, 20);
             this.PrintLabel.TabIndex = 162;
             this.PrintLabel.SelectedValueChanged += new System.EventHandler(this.PrintLabel_SelectedValueChanged);
             // 
@@ -171,9 +165,10 @@
             // 
             this.printNum_label.AutoSize = true;
             this.printNum_label.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.printNum_label.Location = new System.Drawing.Point(978, 170);
+            this.printNum_label.Location = new System.Drawing.Point(652, 113);
+            this.printNum_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.printNum_label.Name = "printNum_label";
-            this.printNum_label.Size = new System.Drawing.Size(62, 31);
+            this.printNum_label.Size = new System.Drawing.Size(42, 21);
             this.printNum_label.TabIndex = 167;
             this.printNum_label.Text = "份数";
             // 
@@ -181,9 +176,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label2.Location = new System.Drawing.Point(39, 314);
+            this.label2.Location = new System.Drawing.Point(26, 209);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(107, 39);
+            this.label2.Size = new System.Drawing.Size(72, 27);
             this.label2.TabIndex = 169;
             this.label2.Text = "工单号";
             // 
@@ -191,9 +187,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label3.Location = new System.Drawing.Point(39, 378);
+            this.label3.Location = new System.Drawing.Point(26, 252);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(137, 39);
+            this.label3.Size = new System.Drawing.Size(92, 27);
             this.label3.TabIndex = 170;
             this.label3.Text = "栈内总数";
             // 
@@ -201,9 +198,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label4.Location = new System.Drawing.Point(39, 446);
+            this.label4.Location = new System.Drawing.Point(26, 297);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(137, 39);
+            this.label4.Size = new System.Drawing.Size(92, 27);
             this.label4.TabIndex = 171;
             this.label4.Text = "产品编号";
             // 
@@ -211,9 +209,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label5.Location = new System.Drawing.Point(39, 514);
+            this.label5.Location = new System.Drawing.Point(26, 343);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(137, 39);
+            this.label5.Size = new System.Drawing.Size(92, 27);
             this.label5.TabIndex = 172;
             this.label5.Text = "产品名称";
             // 
@@ -221,9 +220,10 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label6.Location = new System.Drawing.Point(429, 314);
+            this.label6.Location = new System.Drawing.Point(286, 209);
+            this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(137, 39);
+            this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.TabIndex = 173;
             this.label6.Text = "订单编号";
             // 
@@ -231,9 +231,10 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.label7.Location = new System.Drawing.Point(429, 378);
+            this.label7.Location = new System.Drawing.Point(286, 252);
+            this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(137, 39);
+            this.label7.Size = new System.Drawing.Size(92, 27);
             this.label7.TabIndex = 174;
             this.label7.Text = "栈内件数";
             // 
@@ -241,9 +242,10 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(978, 250);
+            this.label8.Location = new System.Drawing.Point(652, 167);
+            this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(62, 31);
+            this.label8.Size = new System.Drawing.Size(42, 21);
             this.label8.TabIndex = 176;
             this.label8.Text = "已称";
             // 
@@ -255,10 +257,10 @@
             this.columnHeader3,
             this.columnHeader4});
             this.showResult.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.showResult.Location = new System.Drawing.Point(770, 378);
-            this.showResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.showResult.Location = new System.Drawing.Point(513, 252);
+            this.showResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.showResult.Name = "showResult";
-            this.showResult.Size = new System.Drawing.Size(584, 506);
+            this.showResult.Size = new System.Drawing.Size(391, 339);
             this.showResult.TabIndex = 190;
             this.showResult.UseCompatibleStateImageBehavior = false;
             this.showResult.View = System.Windows.Forms.View.Details;
@@ -288,21 +290,20 @@
             // autoPrint
             // 
             this.autoPrint.Checked = false;
-            this.autoPrint.Location = new System.Drawing.Point(984, 314);
-            this.autoPrint.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.autoPrint.Location = new System.Drawing.Point(656, 209);
+            this.autoPrint.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.autoPrint.Name = "autoPrint";
-            this.autoPrint.Size = new System.Drawing.Size(141, 41);
+            this.autoPrint.Size = new System.Drawing.Size(94, 27);
             this.autoPrint.TabIndex = 193;
             // 
             // ComList
             // 
             this.ComList.AutoSize = true;
             this.ComList.CutLength = null;
-            this.ComList.Location = new System.Drawing.Point(669, 182);
-            this.ComList.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.ComList.MaximumSize = new System.Drawing.Size(225, 0);
+            this.ComList.Location = new System.Drawing.Point(446, 121);
+            this.ComList.MaximumSize = new System.Drawing.Size(150, 0);
             this.ComList.Name = "ComList";
-            this.ComList.Size = new System.Drawing.Size(71, 18);
+            this.ComList.Size = new System.Drawing.Size(47, 12);
             this.ComList.TabIndex = 191;
             this.ComList.Text = "ComList";
             this.ComList.Visible = false;
@@ -312,12 +313,12 @@
             this.BaudRate.AllPower = null;
             this.BaudRate.BackColor = System.Drawing.Color.White;
             this.BaudRate.ID = null;
-            this.BaudRate.Location = new System.Drawing.Point(670, 134);
-            this.BaudRate.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.BaudRate.Location = new System.Drawing.Point(447, 89);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.BaudRate.Name = "BaudRate";
             this.BaudRate.Negative = false;
             this.BaudRate.Power = null;
-            this.BaudRate.Size = new System.Drawing.Size(178, 28);
+            this.BaudRate.Size = new System.Drawing.Size(120, 21);
             this.BaudRate.Str = null;
             this.BaudRate.Str1 = null;
             this.BaudRate.Str2 = null;
@@ -331,13 +332,13 @@
             this.stopWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.DownImage")));
             this.stopWeigh.Image = null;
             this.stopWeigh.IsShowBorder = true;
-            this.stopWeigh.Location = new System.Drawing.Point(770, 22);
-            this.stopWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.stopWeigh.Location = new System.Drawing.Point(513, 15);
+            this.stopWeigh.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.stopWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.MoveImage")));
             this.stopWeigh.Name = "stopWeigh";
             this.stopWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("stopWeigh.NormalImage")));
             this.stopWeigh.Power = null;
-            this.stopWeigh.Size = new System.Drawing.Size(108, 38);
+            this.stopWeigh.Size = new System.Drawing.Size(72, 25);
             this.stopWeigh.TabIndex = 187;
             this.stopWeigh.Text = "停止称重";
             this.stopWeigh.UseVisualStyleBackColor = false;
@@ -350,13 +351,13 @@
             this.startWeigh.DownImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.DownImage")));
             this.startWeigh.Image = null;
             this.startWeigh.IsShowBorder = true;
-            this.startWeigh.Location = new System.Drawing.Point(651, 22);
-            this.startWeigh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.startWeigh.Location = new System.Drawing.Point(434, 15);
+            this.startWeigh.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.startWeigh.MoveImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.MoveImage")));
             this.startWeigh.Name = "startWeigh";
             this.startWeigh.NormalImage = ((System.Drawing.Image)(resources.GetObject("startWeigh.NormalImage")));
             this.startWeigh.Power = null;
-            this.startWeigh.Size = new System.Drawing.Size(93, 38);
+            this.startWeigh.Size = new System.Drawing.Size(62, 25);
             this.startWeigh.TabIndex = 186;
             this.startWeigh.Text = "开始称重";
             this.startWeigh.UseVisualStyleBackColor = false;
@@ -367,10 +368,11 @@
             this.PA_PACKAGEQTY.AutoSize = true;
             this.PA_PACKAGEQTY.CutLength = null;
             this.PA_PACKAGEQTY.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(561, 378);
-            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(201, 0);
+            this.PA_PACKAGEQTY.Location = new System.Drawing.Point(374, 252);
+            this.PA_PACKAGEQTY.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.PA_PACKAGEQTY.MaximumSize = new System.Drawing.Size(134, 0);
             this.PA_PACKAGEQTY.Name = "PA_PACKAGEQTY";
-            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 39);
+            this.PA_PACKAGEQTY.Size = new System.Drawing.Size(0, 27);
             this.PA_PACKAGEQTY.TabIndex = 184;
             // 
             // pa_salecode
@@ -378,10 +380,11 @@
             this.pa_salecode.AutoSize = true;
             this.pa_salecode.CutLength = null;
             this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_salecode.Location = new System.Drawing.Point(561, 314);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(201, 0);
+            this.pa_salecode.Location = new System.Drawing.Point(374, 209);
+            this.pa_salecode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pa_salecode.MaximumSize = new System.Drawing.Size(134, 0);
             this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_salecode.Size = new System.Drawing.Size(0, 27);
             this.pa_salecode.TabIndex = 183;
             // 
             // pa_totalqty
@@ -389,10 +392,11 @@
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_totalqty.Location = new System.Drawing.Point(176, 378);
-            this.pa_totalqty.MaximumSize = new System.Drawing.Size(201, 0);
+            this.pa_totalqty.Location = new System.Drawing.Point(117, 252);
+            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pa_totalqty.MaximumSize = new System.Drawing.Size(134, 0);
             this.pa_totalqty.Name = "pa_totalqty";
-            this.pa_totalqty.Size = new System.Drawing.Size(0, 39);
+            this.pa_totalqty.Size = new System.Drawing.Size(0, 27);
             this.pa_totalqty.TabIndex = 180;
             // 
             // pa_makecode
@@ -400,10 +404,11 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.pa_makecode.Location = new System.Drawing.Point(176, 314);
-            this.pa_makecode.MaximumSize = new System.Drawing.Size(201, 0);
+            this.pa_makecode.Location = new System.Drawing.Point(117, 209);
+            this.pa_makecode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.pa_makecode.MaximumSize = new System.Drawing.Size(134, 0);
             this.pa_makecode.Name = "pa_makecode";
-            this.pa_makecode.Size = new System.Drawing.Size(0, 39);
+            this.pa_makecode.Size = new System.Drawing.Size(0, 27);
             this.pa_makecode.TabIndex = 179;
             // 
             // PrintNum
@@ -413,12 +418,12 @@
             this.PrintNum.Enabled = false;
             this.PrintNum.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.PrintNum.ID = null;
-            this.PrintNum.Location = new System.Drawing.Point(1122, 170);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.PrintNum.Location = new System.Drawing.Point(748, 113);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
-            this.PrintNum.Size = new System.Drawing.Size(196, 28);
+            this.PrintNum.Size = new System.Drawing.Size(132, 21);
             this.PrintNum.Str = null;
             this.PrintNum.Str1 = null;
             this.PrintNum.Str2 = null;
@@ -428,20 +433,20 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(33, 574);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.OperateResult.Location = new System.Drawing.Point(22, 383);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(662, 310);
+            this.OperateResult.Size = new System.Drawing.Size(443, 208);
             this.OperateResult.TabIndex = 175;
             this.OperateResult.Text = "";
             // 
             // Printer
             // 
             this.Printer.Font = new System.Drawing.Font("宋体", 9F);
-            this.Printer.Location = new System.Drawing.Point(1122, 24);
-            this.Printer.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Printer.Location = new System.Drawing.Point(748, 16);
+            this.Printer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Printer.Name = "Printer";
-            this.Printer.Size = new System.Drawing.Size(195, 34);
+            this.Printer.Size = new System.Drawing.Size(130, 23);
             this.Printer.TabIndex = 163;
             // 
             // palletcode
@@ -450,11 +455,11 @@
             this.palletcode.BackColor = System.Drawing.Color.White;
             this.palletcode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(183, 14);
-            this.palletcode.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
+            this.palletcode.Location = new System.Drawing.Point(122, 9);
+            this.palletcode.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = null;
-            this.palletcode.Size = new System.Drawing.Size(415, 55);
+            this.palletcode.Size = new System.Drawing.Size(278, 39);
             this.palletcode.Str = null;
             this.palletcode.Str1 = null;
             this.palletcode.Str2 = null;
@@ -465,35 +470,39 @@
             // 
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(176, 446);
+            this.pa_prodcode.Location = new System.Drawing.Point(117, 297);
+            this.pa_prodcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pa_prodcode.Name = "pa_prodcode";
-            this.pa_prodcode.Size = new System.Drawing.Size(0, 39);
+            this.pa_prodcode.Size = new System.Drawing.Size(0, 27);
             this.pa_prodcode.TabIndex = 194;
+            this.pa_prodcode.TextChanged += new System.EventHandler(this.pa_prodcode_TextChanged);
             // 
             // pr_detail
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(176, 514);
+            this.pr_detail.Location = new System.Drawing.Point(117, 343);
+            this.pr_detail.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Size = new System.Drawing.Size(0, 39);
+            this.pr_detail.Size = new System.Drawing.Size(0, 27);
             this.pr_detail.TabIndex = 195;
             // 
             // weightedNum
             // 
             this.weightedNum.AutoSize = true;
             this.weightedNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.weightedNum.Location = new System.Drawing.Point(1116, 250);
+            this.weightedNum.Location = new System.Drawing.Point(744, 167);
+            this.weightedNum.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.weightedNum.Name = "weightedNum";
-            this.weightedNum.Size = new System.Drawing.Size(28, 31);
+            this.weightedNum.Size = new System.Drawing.Size(19, 21);
             this.weightedNum.TabIndex = 196;
             this.weightedNum.Text = "0";
             // 
             // Make_PalletWeigh
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1401, 902);
+            this.ClientSize = new System.Drawing.Size(934, 601);
             this.Controls.Add(this.weightedNum);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pa_prodcode);
@@ -525,7 +534,7 @@
             this.Controls.Add(this.label15);
             this.Controls.Add(this.panel4);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.Name = "Make_PalletWeigh";
             this.Tag = "Make!PalletWeigh";
             this.Text = "栈板称重";

+ 2 - 7
UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -170,7 +170,7 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>产品:" + pa_prodcode.Text + "未维护栈板标签模板\n", Color.Red, palletcode);
                                     return;
                                 }
-                                doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                                doc = lbl.Documents.Open(PrintLabel.Text);
                                 string ErrorMessage = "";
                                 if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, palletcode.Text, int.Parse(PrintNum.Text), pa_makecode.Text, pa_prodcode.Text, "栈板标", "0", out ErrorMessage))
                                 {
@@ -213,13 +213,8 @@ namespace UAS_MES.Make
                 OperateResult.AppendText(">>产品:" + pa_prodcode.Text + "未维护栈板标签模板\n", Color.Red);
             }
             PrintLabel.DataSource = listc;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < listc.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(listc.Rows[i]["la_name"].ToString(), listc.Rows[i]["la_url"].ToString());
-            }
         }
 
         private void startWeigh_Click(object sender, EventArgs e)

+ 24 - 24
UAS-MES/FunctionCode/Make/Make_RePrintLabel.Designer.cs

@@ -48,7 +48,7 @@
             this.pr_detail = new System.Windows.Forms.Label();
             this.rePrintCheck = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.normalButton1 = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.printBtn = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.printNum = new UAS_MES.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
             this.inputText = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.Printer = new UAS_MES.CustomControl.ComBoxWithFocus.PrinterCombox();
@@ -61,7 +61,7 @@
             this.giftBox.AutoSize = true;
             this.giftBox.Checked = true;
             this.giftBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.giftBox.Location = new System.Drawing.Point(83, 51);
+            this.giftBox.Location = new System.Drawing.Point(83, 52);
             this.giftBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.giftBox.Name = "giftBox";
             this.giftBox.Size = new System.Drawing.Size(135, 35);
@@ -75,7 +75,7 @@
             // 
             this.CartonBox.AutoSize = true;
             this.CartonBox.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.CartonBox.Location = new System.Drawing.Point(431, 51);
+            this.CartonBox.Location = new System.Drawing.Point(431, 52);
             this.CartonBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CartonBox.Name = "CartonBox";
             this.CartonBox.Size = new System.Drawing.Size(164, 35);
@@ -88,7 +88,7 @@
             // 
             this.fuselagel.AutoSize = true;
             this.fuselagel.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.fuselagel.Location = new System.Drawing.Point(845, 51);
+            this.fuselagel.Location = new System.Drawing.Point(845, 52);
             this.fuselagel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.fuselagel.Name = "fuselagel";
             this.fuselagel.Size = new System.Drawing.Size(159, 35);
@@ -262,24 +262,24 @@
             this.OperateResult.TabIndex = 195;
             this.OperateResult.Text = "";
             // 
-            // normalButton1
-            // 
-            this.normalButton1.AllPower = null;
-            this.normalButton1.BackColor = System.Drawing.Color.Transparent;
-            this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
-            this.normalButton1.Image = null;
-            this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(923, 267);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
-            this.normalButton1.Name = "normalButton1";
-            this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
-            this.normalButton1.Power = null;
-            this.normalButton1.Size = new System.Drawing.Size(75, 36);
-            this.normalButton1.TabIndex = 194;
-            this.normalButton1.Text = "打印";
-            this.normalButton1.UseVisualStyleBackColor = false;
-            this.normalButton1.Click += new System.EventHandler(this.print_Click);
+            // printBtn
+            // 
+            this.printBtn.AllPower = null;
+            this.printBtn.BackColor = System.Drawing.Color.Transparent;
+            this.printBtn.DownImage = ((System.Drawing.Image)(resources.GetObject("printBtn.DownImage")));
+            this.printBtn.Image = null;
+            this.printBtn.IsShowBorder = true;
+            this.printBtn.Location = new System.Drawing.Point(923, 267);
+            this.printBtn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.printBtn.MoveImage = ((System.Drawing.Image)(resources.GetObject("printBtn.MoveImage")));
+            this.printBtn.Name = "printBtn";
+            this.printBtn.NormalImage = ((System.Drawing.Image)(resources.GetObject("printBtn.NormalImage")));
+            this.printBtn.Power = null;
+            this.printBtn.Size = new System.Drawing.Size(75, 36);
+            this.printBtn.TabIndex = 194;
+            this.printBtn.Text = "打印";
+            this.printBtn.UseVisualStyleBackColor = false;
+            this.printBtn.Click += new System.EventHandler(this.print_Click);
             // 
             // printNum
             // 
@@ -352,7 +352,7 @@
             this.Controls.Add(this.rePrintCheck);
             this.Controls.Add(this.label10);
             this.Controls.Add(this.OperateResult);
-            this.Controls.Add(this.normalButton1);
+            this.Controls.Add(this.printBtn);
             this.Controls.Add(this.printNum);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.inputText);
@@ -396,7 +396,7 @@
         private CustomControl.TextBoxWithIcon.SnCollectionBox inputText;
         private System.Windows.Forms.Label label9;
         private CustomControl.TextBoxWithIcon.NumOnlyTextBox printNum;
-        private CustomControl.ButtonUtil.NormalButton normalButton1;
+        private CustomControl.ButtonUtil.NormalButton printBtn;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private System.Windows.Forms.Label label10;
         private CustomControl.TextBoxWithIcon.SnCollectionBox rePrintCheck;

+ 7 - 8
UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -188,13 +188,8 @@ namespace UAS_MES.Make
                 OperateResult.AppendText("<<产品:" + pr_code.Text + "未维护" + type + "模板\n", Color.Red);
             }
             PrintLabel.DataSource = listA;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftp = new ftpOperater();
-            for (int i = 0; i < listA.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(listA.Rows[i]["la_name"].ToString(), listA.Rows[i]["la_url"].ToString());
-            }
         }
         private void print_Click(object sender, EventArgs e)
         {
@@ -226,11 +221,12 @@ namespace UAS_MES.Make
                     return;
                 }
                 //判定通过进行打印
-                doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                doc = lbl.Documents.Open(PrintLabel.Text);
                 if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, inputValue.Text, int.Parse(printNum.Text),ms_makecode.Text,pr_code.Text,giftBox.Checked?"彩盒标":"机身标","-1",out errorMessage))
                 {
                     //按照打印张数打印
                     OperateResult.AppendText("<<打印成功\n", Color.Green);
+                    printBtn.Enabled = false;
                 }
                 else
                 {
@@ -257,11 +253,12 @@ namespace UAS_MES.Make
                     OperateResult.AppendText("<<箱号:" + inputValue.Text + "错误,不存在\n", Color.Red);
                     return;
                 }
-                doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                doc = lbl.Documents.Open(PrintLabel.Text);
                 if (Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, inputValue.Text, int.Parse(printNum.Text),ms_makecode.Text,pr_code.Text,"卡通箱标","-1",out errorMessage))
                 {
                     //判断通过,打印
                     OperateResult.AppendText("<<打印成功\n", Color.Green);
+                    printBtn.Enabled = false;
                 }
                 else
                 {
@@ -366,6 +363,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update makeserial set ms_downstatus='0' where ms_id='" + re_ms_id + "'", sql.GetString());
                                 }
                             }
+                            printBtn.Enabled = true;
                             //记录操作日志commandlog , 补打核对,核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["ms_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对", "核对成功", TSN, "");
                         }
@@ -415,6 +413,7 @@ namespace UAS_MES.Make
                                     dh.ExecuteSQLTran("update package set pa_downstatus='0' where pa_outboxcode='" + TSN + "'", sql.GetString());
                                 }
                             }
+                            printBtn.Enabled = true;
                             //记录操作日志commandlog , 补打核对,核对成功
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, infoc.Rows[0]["pa_makecode"].ToString(), User.UserLineCode, User.UserSourceCode, "标签补打核对,卡通箱号:" + TSN, "核对成功", TSN, "");
                         }

+ 3 - 3
UAS-MES/FunctionCode/Make/Make_RePrintLabel.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="normalButton1.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="printBtn.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
@@ -130,7 +130,7 @@
         oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="normalButton1.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="printBtn.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
@@ -143,7 +143,7 @@
         gg==
 </value>
   </data>
-  <data name="normalButton1.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="printBtn.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
         dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE

+ 16 - 7
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -200,13 +200,22 @@ namespace UAS_MES.Make
                                     //修改转换结果时,输入两次SN直接过站
                                     if (dh.CheckExist("MakeSerial", "ms_id='" + oMsid + "' and ms_sncode='" + code.Text + "' and ms_beforesn is not null"))
                                     {
-                                        step = 1;
-                                        TSN = code.Text;
-                                        //显示序列号
-                                        show_sncode.Text = TSN;
-                                        OperateResult.AppendText(">>请输入SN\n", Color.Green, code);
-                                        ChangeResult.Enabled = false;
-                                        onlyPass = true;
+                                        string nextstepcode=dh.getFieldDataByCondition("makeserial","ms_nextstepcode","ms_id='"+oMsid+"'").ToString();
+                                        if ( nextstepcode==User.CurrentStepCode)
+                                        {
+                                            step = 1;
+                                            TSN = code.Text;
+                                            //显示序列号
+                                            show_sncode.Text = TSN;
+                                            OperateResult.AppendText(">>请输入SN\n", Color.Green, code);
+                                            ChangeResult.Enabled = false;
+                                            onlyPass = true;
+                                        }
+                                        else
+                                        {
+                                            OperateResult.AppendText("<<序列号:" + code.Text + "下一工序是"+nextstepcode+",不是当前岗位的工序\n", Color.Red, code);
+                                            OperateResult.AppendText(">>请重新输入TSN\n", Color.Black);
+                                        }
                                     }
                                     else
                                     {

+ 15 - 6
UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -159,12 +159,21 @@ namespace UAS_MES.Make
                                         //修改转换结果时,输入两次SN直接过站
                                         if (dh.CheckExist("MakeSerial", "ms_id='" + oMsId + "' and  ms_sncode='" + sncode.Text + "' and ms_beforesn is not null"))
                                         {
-                                            bsncode = sncode.Text;
-                                            //显示序列号
-                                            show_sncode.Text = bsncode;
-                                            OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
-                                            ChangeResult.Enabled = false;
-                                            onlyPass = true;
+                                            string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_id='" + oMsId + "'").ToString();
+                                            if (nextstepcode == User.CurrentStepCode)
+                                            {
+                                                bsncode = sncode.Text;
+                                                //显示序列号
+                                                show_sncode.Text = bsncode;
+                                                OperateResult.AppendText(">>请输入SN号\n", Color.Green, sncode);
+                                                ChangeResult.Enabled = false;
+                                                onlyPass = true;
+                                            }
+                                            else
+                                            {
+                                                OperateResult.AppendText("<<序列号:" + sncode.Text + "下一工序是" + nextstepcode + ",不是当前岗位的工序\n", Color.Red, sncode);
+                                                OperateResult.AppendText(">>请重新输入TSN号\n", Color.Black);
+                                            }
                                         }
                                         else
                                         {

+ 3 - 7
UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -191,7 +191,7 @@ namespace UAS_MES.Make
                 {
                     dh.ExecuteSql("update package set pa_printcount=pa_printcount+1 where pa_outboxcode='" + pa_outboxcode.Text + "'", "update");
                     OperateResult.AppendText(">>开始打印箱号" + pa_outboxcode.Text + "\n", Color.Black);
-                    doc = lbl.Documents.Open(ftpOperater.DownLoadTo + PrintLabel.Text);
+                    doc = lbl.Documents.Open(PrintLabel.Text);
                     if (!Print.CodeSoft(Tag.ToString(), doc, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), ms_makecode.Text, pr_code.Text, "卡通箱标", "0", out ErrorMessage))
                     {
                         OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
@@ -658,13 +658,9 @@ namespace UAS_MES.Make
             LoadCheckQTY();
             dt = (DataTable)dh.ExecuteSql("select la_id,substr(la_url,instr(la_url,'\\',-1)+1)la_name,la_url,la_isdefault from label where la_prodcode='" + pr_code.Text + "' and la_templatetype='卡通箱标' and la_statuscode='AUDITED' order by la_isdefault", "select");
             PrintLabel.DataSource = dt;
-            PrintLabel.DisplayMember = "la_name";
+            PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";
-            ftpOperater ftp = new ftpOperater();
-            for (int i = 0; i < dt.Rows.Count; i++)
-            {
-                BaseUtil.GetPrintLabel(dt.Rows[i]["la_name"].ToString(), dt.Rows[i]["la_url"].ToString());
-            }
+       
         }
     }
 }

+ 0 - 48
UAS-MES/FunctionCode/Query/Quert_RealTime.Designer.cs

@@ -1,48 +0,0 @@
-namespace UAS_MES.Query
-{
-    partial class Quert_RealTime
-    {
-        /// <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.SuspendLayout();
-            // 
-            // 车间执行实监
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(982, 566);
-            this.Name = "车间执行实监";
-            this.Tag = "Quert!RealTime";
-            this.Text = "车间执行实监";
-            this.Load += new System.EventHandler(this.车间执行实监_Load);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-    }
-}

+ 0 - 24
UAS-MES/FunctionCode/Query/Quert_RealTime.cs

@@ -1,24 +0,0 @@
-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;
-
-namespace UAS_MES.Query
-{
-    public partial class Quert_RealTime : Form
-    {
-        public Quert_RealTime()
-        {
-            InitializeComponent();
-        }
-
-        private void 车间执行实监_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}

+ 1 - 1
UAS-MES/FunctionCode/Query/Query_ExeProgress.cs

@@ -212,7 +212,7 @@ namespace UAS_MES.Query
                                 else
                                 {
                                     //通过加绿色
-                                    if (passed)
+                                    if (PastStep.Contains(dt.Rows[i]["CD_STEPCODE"].ToString()))
                                     {
                                         PaintColor.Add(Brushes.Green);
                                     }

+ 1820 - 0
UAS-MES/FunctionCode/Query/Query_MakeInf.Designer.cs

@@ -0,0 +1,1820 @@
+namespace UAS_MES.Query
+{
+    partial class Query_MakeInf
+    {
+        /// <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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Query_MakeInf));
+            this.label1_lll_ = new System.Windows.Forms.Label();
+            this.Carft = new System.Windows.Forms.DataGridView();
+            this.BOM = new System.Windows.Forms.DataGridView();
+            this.SP_MOTHERCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_SONCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_STEPCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_REPCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_TYPE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_DESCRIPTION = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_DETNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_PREFIX = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_TRACEKIND = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_LENGTH = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_ONEUSEQTY = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_UPDATEMAN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SP_UPDATEDATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Label = new System.Windows.Forms.DataGridView();
+            this.LA_CODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_STATUS = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_INDATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_INMAN = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_PRINTNOS = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_URL = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_ISDEFAULT = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_TEMPLATETYPE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_SOFTTYPE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.LA_PRODCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.label16_lll_ = new System.Windows.Forms.Label();
+            this.label17_ll_ = new System.Windows.Forms.Label();
+            this.label18_la_ll = new System.Windows.Forms.Label();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn3 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn4 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn5 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn6 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn7 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn8 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn9 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn10 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn11 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn12 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn13 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn14 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn15 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn16 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn17 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewCheckBoxColumn18 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn18 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn21 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn22 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn23 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn25 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn26 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn27 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn28 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn29 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn30 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn31 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.aftersn_qty = new System.Windows.Forms.Label();
+            this.aftersnqty_label_ = new System.Windows.Forms.Label();
+            this.AfterSn_Range = new System.Windows.Forms.Label();
+            this.AfterSnRange_label_ = new System.Windows.Forms.Label();
+            this.beforesn_qty = new System.Windows.Forms.Label();
+            this.beforesnqty_label_ = new System.Windows.Forms.Label();
+            this.Before_SnRange = new System.Windows.Forms.Label();
+            this.BeforeSnRange_label_label = new System.Windows.Forms.Label();
+            this.IMEI_Num = new System.Windows.Forms.Label();
+            this.label3_label_label = new System.Windows.Forms.Label();
+            this.BT_Num = new System.Windows.Forms.Label();
+            this.label13_label_label = new System.Windows.Forms.Label();
+            this.Mac_Num = new System.Windows.Forms.Label();
+            this.Mac_label_label = new System.Windows.Forms.Label();
+            this.Product = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.sn_relation = new System.Windows.Forms.Label();
+            this.sn_relation_label = new System.Windows.Forms.Label();
+            this.pr_cartonweight = new System.Windows.Forms.Label();
+            this.pr_cartonweight_label = new System.Windows.Forms.Label();
+            this.pr_colorboxweight = new System.Windows.Forms.Label();
+            this.pr_colorboxweight_label = new System.Windows.Forms.Label();
+            this.pr_agingtime = new System.Windows.Forms.Label();
+            this.pr_agingtime_label = new System.Windows.Forms.Label();
+            this.pr_outboxinnerqty = new System.Windows.Forms.Label();
+            this.pr_outboxinnerqty_label = new System.Windows.Forms.Label();
+            this.pr_sendchecktype = new System.Windows.Forms.Label();
+            this.pr_sendchecktype_label = new System.Windows.Forms.Label();
+            this.pr_detail = new System.Windows.Forms.Label();
+            this.pr_detail_label = new System.Windows.Forms.Label();
+            this.pr_code = new System.Windows.Forms.Label();
+            this.pr_code_label = new System.Windows.Forms.Label();
+            this.MakeInf = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.ma_unlimitageqty = new System.Windows.Forms.Label();
+            this.ma_unlimitageqty_label = new System.Windows.Forms.Label();
+            this.ma_bomversion = new System.Windows.Forms.Label();
+            this.ma_bomversion_label = new System.Windows.Forms.Label();
+            this.ma_qty = new System.Windows.Forms.Label();
+            this.ma_qty_label = new System.Windows.Forms.Label();
+            this.ma_softversion = new System.Windows.Forms.Label();
+            this.ma_softversion_label = new System.Windows.Forms.Label();
+            this.ma_wccode = new System.Windows.Forms.Label();
+            this.ma_wccode_label = new System.Windows.Forms.Label();
+            this.ma_custname = new System.Windows.Forms.Label();
+            this.ma_custname_label = new System.Windows.Forms.Label();
+            this.ma_salecode = new System.Windows.Forms.Label();
+            this.ma_salecode_label = new System.Windows.Forms.Label();
+            this.Search = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.MakeCode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.CD_STEPNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CD_STEPNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CD_STEPCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CD_NEXTSTEPNAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CD_NEXTSTEPCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CD_IFINPUT = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFOUTPUT = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFTEST = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFBURNIN = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFWEIGH = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFSNCHANGE = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFOQC = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFPACK = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFREPAIR = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFOUTLINE = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFSMTINOUT = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFSPC = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFREDUCE = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFMIDFINISH = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFMIDINPUT = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_FIRSTSTEP = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_IFOFFLINE = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.CD_DETNO = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CD_TABLE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.Carft)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.BOM)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Label)).BeginInit();
+            this.groupBoxWithBorder1.SuspendLayout();
+            this.Product.SuspendLayout();
+            this.MakeInf.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label1_lll_
+            // 
+            this.label1_lll_.AutoSize = true;
+            this.label1_lll_.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1_lll_.Location = new System.Drawing.Point(45, 9);
+            this.label1_lll_.Name = "label1_lll_";
+            this.label1_lll_.Size = new System.Drawing.Size(72, 27);
+            this.label1_lll_.TabIndex = 0;
+            this.label1_lll_.Text = "工单号";
+            // 
+            // Carft
+            // 
+            this.Carft.AllowUserToAddRows = false;
+            this.Carft.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.Carft.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.CD_STEPNO,
+            this.CD_STEPNAME,
+            this.CD_STEPCODE,
+            this.CD_NEXTSTEPNAME,
+            this.CD_NEXTSTEPCODE,
+            this.CD_IFINPUT,
+            this.CD_IFOUTPUT,
+            this.CD_IFTEST,
+            this.CD_IFBURNIN,
+            this.CD_IFWEIGH,
+            this.CD_IFSNCHANGE,
+            this.CD_IFOQC,
+            this.CD_IFPACK,
+            this.CD_IFREPAIR,
+            this.CD_IFOUTLINE,
+            this.CD_IFSMTINOUT,
+            this.CD_IFSPC,
+            this.CD_IFREDUCE,
+            this.CD_IFMIDFINISH,
+            this.CD_IFMIDINPUT,
+            this.CD_FIRSTSTEP,
+            this.CD_IFOFFLINE,
+            this.CD_DETNO,
+            this.CD_TABLE});
+            this.Carft.Location = new System.Drawing.Point(41, 391);
+            this.Carft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Carft.Name = "Carft";
+            this.Carft.ReadOnly = true;
+            this.Carft.RowTemplate.Height = 27;
+            this.Carft.Size = new System.Drawing.Size(1181, 278);
+            this.Carft.TabIndex = 20;
+            // 
+            // BOM
+            // 
+            this.BOM.AllowUserToAddRows = false;
+            this.BOM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.BOM.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.SP_MOTHERCODE,
+            this.SP_SONCODE,
+            this.SP_STEPCODE,
+            this.SP_REPCODE,
+            this.SP_TYPE,
+            this.SP_DESCRIPTION,
+            this.SP_DETNO,
+            this.SP_PREFIX,
+            this.SP_TRACEKIND,
+            this.SP_LENGTH,
+            this.SP_ONEUSEQTY,
+            this.SP_UPDATEMAN,
+            this.SP_UPDATEDATE});
+            this.BOM.Location = new System.Drawing.Point(41, 675);
+            this.BOM.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.BOM.Name = "BOM";
+            this.BOM.ReadOnly = true;
+            this.BOM.RowTemplate.Height = 27;
+            this.BOM.Size = new System.Drawing.Size(1181, 218);
+            this.BOM.TabIndex = 21;
+            // 
+            // SP_MOTHERCODE
+            // 
+            this.SP_MOTHERCODE.DataPropertyName = "SP_MOTHERCODE";
+            this.SP_MOTHERCODE.HeaderText = "母件编号";
+            this.SP_MOTHERCODE.Name = "SP_MOTHERCODE";
+            this.SP_MOTHERCODE.ReadOnly = true;
+            // 
+            // SP_SONCODE
+            // 
+            this.SP_SONCODE.DataPropertyName = "SP_SONCODE";
+            this.SP_SONCODE.HeaderText = "物料编号";
+            this.SP_SONCODE.Name = "SP_SONCODE";
+            this.SP_SONCODE.ReadOnly = true;
+            // 
+            // SP_STEPCODE
+            // 
+            this.SP_STEPCODE.DataPropertyName = "SP_STEPCODE";
+            this.SP_STEPCODE.HeaderText = "工序编号";
+            this.SP_STEPCODE.Name = "SP_STEPCODE";
+            this.SP_STEPCODE.ReadOnly = true;
+            // 
+            // SP_REPCODE
+            // 
+            this.SP_REPCODE.DataPropertyName = "SP_REPCODE";
+            this.SP_REPCODE.HeaderText = "替代料编号";
+            this.SP_REPCODE.Name = "SP_REPCODE";
+            this.SP_REPCODE.ReadOnly = true;
+            this.SP_REPCODE.Width = 150;
+            // 
+            // SP_TYPE
+            // 
+            this.SP_TYPE.DataPropertyName = "SP_TYPE";
+            this.SP_TYPE.HeaderText = "采集类型";
+            this.SP_TYPE.Name = "SP_TYPE";
+            this.SP_TYPE.ReadOnly = true;
+            // 
+            // SP_DESCRIPTION
+            // 
+            this.SP_DESCRIPTION.DataPropertyName = "SP_DESCRIPTION";
+            this.SP_DESCRIPTION.HeaderText = "描述";
+            this.SP_DESCRIPTION.Name = "SP_DESCRIPTION";
+            this.SP_DESCRIPTION.ReadOnly = true;
+            // 
+            // SP_DETNO
+            // 
+            this.SP_DETNO.DataPropertyName = "SP_DETNO";
+            this.SP_DETNO.HeaderText = "采集顺序";
+            this.SP_DETNO.Name = "SP_DETNO";
+            this.SP_DETNO.ReadOnly = true;
+            // 
+            // SP_PREFIX
+            // 
+            this.SP_PREFIX.DataPropertyName = "SP_PREFIX";
+            this.SP_PREFIX.HeaderText = "前缀码";
+            this.SP_PREFIX.Name = "SP_PREFIX";
+            this.SP_PREFIX.ReadOnly = true;
+            // 
+            // SP_TRACEKIND
+            // 
+            this.SP_TRACEKIND.DataPropertyName = "SP_TRACEKIND";
+            this.SP_TRACEKIND.HeaderText = "管控类型";
+            this.SP_TRACEKIND.Name = "SP_TRACEKIND";
+            this.SP_TRACEKIND.ReadOnly = true;
+            // 
+            // SP_LENGTH
+            // 
+            this.SP_LENGTH.DataPropertyName = "SP_LENGTH";
+            this.SP_LENGTH.HeaderText = "长度";
+            this.SP_LENGTH.Name = "SP_LENGTH";
+            this.SP_LENGTH.ReadOnly = true;
+            // 
+            // SP_ONEUSEQTY
+            // 
+            this.SP_ONEUSEQTY.DataPropertyName = "SP_ONEUSEQTY";
+            this.SP_ONEUSEQTY.HeaderText = "单位用量";
+            this.SP_ONEUSEQTY.Name = "SP_ONEUSEQTY";
+            this.SP_ONEUSEQTY.ReadOnly = true;
+            // 
+            // SP_UPDATEMAN
+            // 
+            this.SP_UPDATEMAN.DataPropertyName = "SP_UPDATEMAN";
+            this.SP_UPDATEMAN.HeaderText = "更新人";
+            this.SP_UPDATEMAN.Name = "SP_UPDATEMAN";
+            this.SP_UPDATEMAN.ReadOnly = true;
+            // 
+            // SP_UPDATEDATE
+            // 
+            this.SP_UPDATEDATE.DataPropertyName = "SP_UPDATEDATE";
+            this.SP_UPDATEDATE.HeaderText = "更新日期";
+            this.SP_UPDATEDATE.Name = "SP_UPDATEDATE";
+            this.SP_UPDATEDATE.ReadOnly = true;
+            // 
+            // Label
+            // 
+            this.Label.AllowUserToAddRows = false;
+            this.Label.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.Label.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.LA_CODE,
+            this.LA_NAME,
+            this.LA_STATUS,
+            this.LA_INDATE,
+            this.LA_INMAN,
+            this.LA_PRINTNOS,
+            this.LA_URL,
+            this.LA_ISDEFAULT,
+            this.LA_TEMPLATETYPE,
+            this.LA_SOFTTYPE,
+            this.LA_PRODCODE});
+            this.Label.Location = new System.Drawing.Point(41, 901);
+            this.Label.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Label.Name = "Label";
+            this.Label.ReadOnly = true;
+            this.Label.RowTemplate.Height = 27;
+            this.Label.Size = new System.Drawing.Size(1181, 174);
+            this.Label.TabIndex = 22;
+            // 
+            // LA_CODE
+            // 
+            this.LA_CODE.DataPropertyName = "LA_CODE";
+            this.LA_CODE.HeaderText = "模板编号";
+            this.LA_CODE.Name = "LA_CODE";
+            this.LA_CODE.ReadOnly = true;
+            // 
+            // LA_NAME
+            // 
+            this.LA_NAME.DataPropertyName = "LA_NAME";
+            this.LA_NAME.HeaderText = "模板名称";
+            this.LA_NAME.Name = "LA_NAME";
+            this.LA_NAME.ReadOnly = true;
+            // 
+            // LA_STATUS
+            // 
+            this.LA_STATUS.DataPropertyName = "LA_STATUS";
+            this.LA_STATUS.HeaderText = "状态";
+            this.LA_STATUS.Name = "LA_STATUS";
+            this.LA_STATUS.ReadOnly = true;
+            // 
+            // LA_INDATE
+            // 
+            this.LA_INDATE.DataPropertyName = "LA_INDATE";
+            this.LA_INDATE.HeaderText = "录入日期";
+            this.LA_INDATE.Name = "LA_INDATE";
+            this.LA_INDATE.ReadOnly = true;
+            // 
+            // LA_INMAN
+            // 
+            this.LA_INMAN.DataPropertyName = "LA_INMAN";
+            this.LA_INMAN.HeaderText = "录入人";
+            this.LA_INMAN.Name = "LA_INMAN";
+            this.LA_INMAN.ReadOnly = true;
+            // 
+            // LA_PRINTNOS
+            // 
+            this.LA_PRINTNOS.DataPropertyName = "LA_PRINTNOS";
+            this.LA_PRINTNOS.HeaderText = "打印份数";
+            this.LA_PRINTNOS.Name = "LA_PRINTNOS";
+            this.LA_PRINTNOS.ReadOnly = true;
+            // 
+            // LA_URL
+            // 
+            this.LA_URL.DataPropertyName = "LA_URL";
+            this.LA_URL.HeaderText = "模板路径";
+            this.LA_URL.Name = "LA_URL";
+            this.LA_URL.ReadOnly = true;
+            // 
+            // LA_ISDEFAULT
+            // 
+            this.LA_ISDEFAULT.DataPropertyName = "LA_ISDEFAULT";
+            this.LA_ISDEFAULT.HeaderText = "是否默认";
+            this.LA_ISDEFAULT.Name = "LA_ISDEFAULT";
+            this.LA_ISDEFAULT.ReadOnly = true;
+            // 
+            // LA_TEMPLATETYPE
+            // 
+            this.LA_TEMPLATETYPE.DataPropertyName = "LA_TEMPLATETYPE";
+            this.LA_TEMPLATETYPE.HeaderText = "模板类型";
+            this.LA_TEMPLATETYPE.Name = "LA_TEMPLATETYPE";
+            this.LA_TEMPLATETYPE.ReadOnly = true;
+            // 
+            // LA_SOFTTYPE
+            // 
+            this.LA_SOFTTYPE.DataPropertyName = "LA_SOFTTYPE";
+            this.LA_SOFTTYPE.HeaderText = "模板软件";
+            this.LA_SOFTTYPE.Name = "LA_SOFTTYPE";
+            this.LA_SOFTTYPE.ReadOnly = true;
+            // 
+            // LA_PRODCODE
+            // 
+            this.LA_PRODCODE.DataPropertyName = "LA_PRODCODE";
+            this.LA_PRODCODE.HeaderText = "产品编号";
+            this.LA_PRODCODE.Name = "LA_PRODCODE";
+            this.LA_PRODCODE.ReadOnly = true;
+            // 
+            // label16_lll_
+            // 
+            this.label16_lll_.AutoSize = true;
+            this.label16_lll_.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label16_lll_.Location = new System.Drawing.Point(3, 486);
+            this.label16_lll_.MaximumSize = new System.Drawing.Size(35, 0);
+            this.label16_lll_.Name = "label16_lll_";
+            this.label16_lll_.Size = new System.Drawing.Size(32, 108);
+            this.label16_lll_.TabIndex = 23;
+            this.label16_lll_.Text = "产品途程";
+            // 
+            // label17_ll_
+            // 
+            this.label17_ll_.AutoSize = true;
+            this.label17_ll_.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label17_ll_.Location = new System.Drawing.Point(3, 712);
+            this.label17_ll_.MaximumSize = new System.Drawing.Size(35, 0);
+            this.label17_ll_.Name = "label17_ll_";
+            this.label17_ll_.Size = new System.Drawing.Size(32, 135);
+            this.label17_ll_.TabIndex = 24;
+            this.label17_ll_.Text = "工序BOM";
+            // 
+            // label18_la_ll
+            // 
+            this.label18_la_ll.AutoSize = true;
+            this.label18_la_ll.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label18_la_ll.Location = new System.Drawing.Point(3, 928);
+            this.label18_la_ll.MaximumSize = new System.Drawing.Size(35, 0);
+            this.label18_la_ll.Name = "label18_la_ll";
+            this.label18_la_ll.Size = new System.Drawing.Size(32, 108);
+            this.label18_la_ll.TabIndex = 25;
+            this.label18_la_ll.Text = "标签信息";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "CD_STEPNO";
+            this.dataGridViewTextBoxColumn1.HeaderText = "执行顺序";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            // 
+            // dataGridViewCheckBoxColumn1
+            // 
+            this.dataGridViewCheckBoxColumn1.DataPropertyName = "CD_IFINPUT";
+            this.dataGridViewCheckBoxColumn1.HeaderText = "上料工序";
+            this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
+            this.dataGridViewCheckBoxColumn1.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn2
+            // 
+            this.dataGridViewCheckBoxColumn2.DataPropertyName = "CD_IFOUTPUT";
+            this.dataGridViewCheckBoxColumn2.HeaderText = "下料工序";
+            this.dataGridViewCheckBoxColumn2.Name = "dataGridViewCheckBoxColumn2";
+            this.dataGridViewCheckBoxColumn2.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn3
+            // 
+            this.dataGridViewCheckBoxColumn3.DataPropertyName = "CD_IFTEST";
+            this.dataGridViewCheckBoxColumn3.HeaderText = "测试工序";
+            this.dataGridViewCheckBoxColumn3.Name = "dataGridViewCheckBoxColumn3";
+            this.dataGridViewCheckBoxColumn3.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn4
+            // 
+            this.dataGridViewCheckBoxColumn4.DataPropertyName = "CD_IFSNCHANGE";
+            this.dataGridViewCheckBoxColumn4.HeaderText = "序号转换工序";
+            this.dataGridViewCheckBoxColumn4.Name = "dataGridViewCheckBoxColumn4";
+            this.dataGridViewCheckBoxColumn4.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn4.Width = 150;
+            // 
+            // dataGridViewCheckBoxColumn5
+            // 
+            this.dataGridViewCheckBoxColumn5.DataPropertyName = "CD_IFOQC";
+            this.dataGridViewCheckBoxColumn5.HeaderText = "OQC工序";
+            this.dataGridViewCheckBoxColumn5.Name = "dataGridViewCheckBoxColumn5";
+            this.dataGridViewCheckBoxColumn5.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn6
+            // 
+            this.dataGridViewCheckBoxColumn6.DataPropertyName = "CD_IFPACK";
+            this.dataGridViewCheckBoxColumn6.HeaderText = "包装工序";
+            this.dataGridViewCheckBoxColumn6.Name = "dataGridViewCheckBoxColumn6";
+            this.dataGridViewCheckBoxColumn6.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn7
+            // 
+            this.dataGridViewCheckBoxColumn7.DataPropertyName = "CD_IFREPAIR";
+            this.dataGridViewCheckBoxColumn7.HeaderText = "维修工序";
+            this.dataGridViewCheckBoxColumn7.Name = "dataGridViewCheckBoxColumn7";
+            this.dataGridViewCheckBoxColumn7.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn7.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn8
+            // 
+            this.dataGridViewCheckBoxColumn8.DataPropertyName = "CD_IFOUTLINE";
+            this.dataGridViewCheckBoxColumn8.HeaderText = "线外工序";
+            this.dataGridViewCheckBoxColumn8.Name = "dataGridViewCheckBoxColumn8";
+            this.dataGridViewCheckBoxColumn8.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn9
+            // 
+            this.dataGridViewCheckBoxColumn9.DataPropertyName = "CD_IFSMTINOUT";
+            this.dataGridViewCheckBoxColumn9.HeaderText = "SMT防呆工序";
+            this.dataGridViewCheckBoxColumn9.Name = "dataGridViewCheckBoxColumn9";
+            this.dataGridViewCheckBoxColumn9.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn9.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn9.Width = 150;
+            // 
+            // dataGridViewCheckBoxColumn10
+            // 
+            this.dataGridViewCheckBoxColumn10.DataPropertyName = "CD_IFSPC";
+            this.dataGridViewCheckBoxColumn10.HeaderText = "SPC工序";
+            this.dataGridViewCheckBoxColumn10.Name = "dataGridViewCheckBoxColumn10";
+            this.dataGridViewCheckBoxColumn10.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn10.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn11
+            // 
+            this.dataGridViewCheckBoxColumn11.DataPropertyName = "CD_IFREDUCE";
+            this.dataGridViewCheckBoxColumn11.HeaderText = "扣料工序";
+            this.dataGridViewCheckBoxColumn11.Name = "dataGridViewCheckBoxColumn11";
+            this.dataGridViewCheckBoxColumn11.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn11.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn12
+            // 
+            this.dataGridViewCheckBoxColumn12.DataPropertyName = "CD_IFMIDFINISH";
+            this.dataGridViewCheckBoxColumn12.HeaderText = "中间产量工序";
+            this.dataGridViewCheckBoxColumn12.Name = "dataGridViewCheckBoxColumn12";
+            this.dataGridViewCheckBoxColumn12.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn12.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn12.Width = 150;
+            // 
+            // dataGridViewCheckBoxColumn13
+            // 
+            this.dataGridViewCheckBoxColumn13.DataPropertyName = "CD_IFMIDINPUT";
+            this.dataGridViewCheckBoxColumn13.HeaderText = "中间投入工序";
+            this.dataGridViewCheckBoxColumn13.Name = "dataGridViewCheckBoxColumn13";
+            this.dataGridViewCheckBoxColumn13.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn13.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn13.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn13.Width = 150;
+            // 
+            // dataGridViewCheckBoxColumn14
+            // 
+            this.dataGridViewCheckBoxColumn14.DataPropertyName = "CD_IFBURNIN";
+            this.dataGridViewCheckBoxColumn14.HeaderText = "BURNIN工序";
+            this.dataGridViewCheckBoxColumn14.Name = "dataGridViewCheckBoxColumn14";
+            this.dataGridViewCheckBoxColumn14.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn14.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn14.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn14.Width = 150;
+            // 
+            // dataGridViewCheckBoxColumn15
+            // 
+            this.dataGridViewCheckBoxColumn15.DataPropertyName = "CD_IFBURNOUT";
+            this.dataGridViewCheckBoxColumn15.HeaderText = "BURNOUT工序";
+            this.dataGridViewCheckBoxColumn15.Name = "dataGridViewCheckBoxColumn15";
+            this.dataGridViewCheckBoxColumn15.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn15.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn15.Width = 150;
+            // 
+            // dataGridViewCheckBoxColumn16
+            // 
+            this.dataGridViewCheckBoxColumn16.DataPropertyName = "CD_IFWEIGH";
+            this.dataGridViewCheckBoxColumn16.HeaderText = "是否称重";
+            this.dataGridViewCheckBoxColumn16.Name = "dataGridViewCheckBoxColumn16";
+            this.dataGridViewCheckBoxColumn16.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn16.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn16.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewCheckBoxColumn17
+            // 
+            this.dataGridViewCheckBoxColumn17.DataPropertyName = "CD_FIRSTSTEP";
+            this.dataGridViewCheckBoxColumn17.HeaderText = "是否第一道工序";
+            this.dataGridViewCheckBoxColumn17.Name = "dataGridViewCheckBoxColumn17";
+            this.dataGridViewCheckBoxColumn17.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn17.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn17.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn17.Width = 150;
+            // 
+            // dataGridViewCheckBoxColumn18
+            // 
+            this.dataGridViewCheckBoxColumn18.DataPropertyName = "CD_IFOFFLINE";
+            this.dataGridViewCheckBoxColumn18.HeaderText = "下线工序";
+            this.dataGridViewCheckBoxColumn18.Name = "dataGridViewCheckBoxColumn18";
+            this.dataGridViewCheckBoxColumn18.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn18.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn18.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "CD_DETNO";
+            this.dataGridViewTextBoxColumn2.HeaderText = "序号";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "CD_STEPCODE";
+            this.dataGridViewTextBoxColumn3.HeaderText = "工序编号";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "CD_STEPNAME";
+            this.dataGridViewTextBoxColumn4.HeaderText = "工序名称";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.DataPropertyName = "CD_NEXTSTEPCODE";
+            this.dataGridViewTextBoxColumn5.HeaderText = "下一工序编号";
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.DataPropertyName = "CD_NEXTSTEPNAME";
+            this.dataGridViewTextBoxColumn6.HeaderText = "下一工序名称";
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.DataPropertyName = "CD_TABLE";
+            this.dataGridViewTextBoxColumn7.HeaderText = "板面";
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.DataPropertyName = "SP_MOTHERCODE";
+            this.dataGridViewTextBoxColumn8.HeaderText = "母件编号";
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.DataPropertyName = "SP_SONCODE";
+            this.dataGridViewTextBoxColumn9.HeaderText = "物料编号";
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn10
+            // 
+            this.dataGridViewTextBoxColumn10.DataPropertyName = "SP_STEPCODE";
+            this.dataGridViewTextBoxColumn10.HeaderText = "工序编号";
+            this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10";
+            this.dataGridViewTextBoxColumn10.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn11
+            // 
+            this.dataGridViewTextBoxColumn11.DataPropertyName = "SP_REPCODE";
+            this.dataGridViewTextBoxColumn11.HeaderText = "替代料编号";
+            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
+            this.dataGridViewTextBoxColumn11.ReadOnly = true;
+            this.dataGridViewTextBoxColumn11.Width = 150;
+            // 
+            // dataGridViewTextBoxColumn12
+            // 
+            this.dataGridViewTextBoxColumn12.DataPropertyName = "SP_TYPE";
+            this.dataGridViewTextBoxColumn12.HeaderText = "采集类型";
+            this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12";
+            this.dataGridViewTextBoxColumn12.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn13
+            // 
+            this.dataGridViewTextBoxColumn13.DataPropertyName = "SP_DESCRIPTION";
+            this.dataGridViewTextBoxColumn13.HeaderText = "描述";
+            this.dataGridViewTextBoxColumn13.Name = "dataGridViewTextBoxColumn13";
+            this.dataGridViewTextBoxColumn13.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn14
+            // 
+            this.dataGridViewTextBoxColumn14.DataPropertyName = "SP_DETNO";
+            this.dataGridViewTextBoxColumn14.HeaderText = "采集顺序";
+            this.dataGridViewTextBoxColumn14.Name = "dataGridViewTextBoxColumn14";
+            this.dataGridViewTextBoxColumn14.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn15
+            // 
+            this.dataGridViewTextBoxColumn15.DataPropertyName = "SP_PREFIX";
+            this.dataGridViewTextBoxColumn15.HeaderText = "前缀码";
+            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
+            this.dataGridViewTextBoxColumn15.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn16
+            // 
+            this.dataGridViewTextBoxColumn16.DataPropertyName = "SP_TRACEKIND";
+            this.dataGridViewTextBoxColumn16.HeaderText = "管控类型";
+            this.dataGridViewTextBoxColumn16.Name = "dataGridViewTextBoxColumn16";
+            this.dataGridViewTextBoxColumn16.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn17
+            // 
+            this.dataGridViewTextBoxColumn17.DataPropertyName = "SP_LENGTH";
+            this.dataGridViewTextBoxColumn17.HeaderText = "长度";
+            this.dataGridViewTextBoxColumn17.Name = "dataGridViewTextBoxColumn17";
+            this.dataGridViewTextBoxColumn17.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn18
+            // 
+            this.dataGridViewTextBoxColumn18.DataPropertyName = "SP_ONEUSEQTY";
+            this.dataGridViewTextBoxColumn18.HeaderText = "单位用量";
+            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
+            this.dataGridViewTextBoxColumn18.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn19
+            // 
+            this.dataGridViewTextBoxColumn19.DataPropertyName = "SP_UPDATEMAN";
+            this.dataGridViewTextBoxColumn19.HeaderText = "更新人";
+            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
+            this.dataGridViewTextBoxColumn19.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn20
+            // 
+            this.dataGridViewTextBoxColumn20.DataPropertyName = "SP_UPDATEDATE";
+            this.dataGridViewTextBoxColumn20.HeaderText = "更新日期";
+            this.dataGridViewTextBoxColumn20.Name = "dataGridViewTextBoxColumn20";
+            this.dataGridViewTextBoxColumn20.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn21
+            // 
+            this.dataGridViewTextBoxColumn21.DataPropertyName = "LA_CODE";
+            this.dataGridViewTextBoxColumn21.HeaderText = "模板编号";
+            this.dataGridViewTextBoxColumn21.Name = "dataGridViewTextBoxColumn21";
+            this.dataGridViewTextBoxColumn21.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn22
+            // 
+            this.dataGridViewTextBoxColumn22.DataPropertyName = "LA_NAME";
+            this.dataGridViewTextBoxColumn22.HeaderText = "模板名称";
+            this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22";
+            this.dataGridViewTextBoxColumn22.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn23
+            // 
+            this.dataGridViewTextBoxColumn23.DataPropertyName = "LA_STATUS";
+            this.dataGridViewTextBoxColumn23.HeaderText = "状态";
+            this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23";
+            this.dataGridViewTextBoxColumn23.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn24
+            // 
+            this.dataGridViewTextBoxColumn24.DataPropertyName = "LA_INDATE";
+            this.dataGridViewTextBoxColumn24.HeaderText = "录入日期";
+            this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24";
+            this.dataGridViewTextBoxColumn24.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn25
+            // 
+            this.dataGridViewTextBoxColumn25.DataPropertyName = "LA_INMAN";
+            this.dataGridViewTextBoxColumn25.HeaderText = "录入人";
+            this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25";
+            this.dataGridViewTextBoxColumn25.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn26
+            // 
+            this.dataGridViewTextBoxColumn26.DataPropertyName = "LA_PRINTNOS";
+            this.dataGridViewTextBoxColumn26.HeaderText = "打印份数";
+            this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26";
+            this.dataGridViewTextBoxColumn26.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn27
+            // 
+            this.dataGridViewTextBoxColumn27.DataPropertyName = "LA_URL";
+            this.dataGridViewTextBoxColumn27.HeaderText = "模板路径";
+            this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27";
+            this.dataGridViewTextBoxColumn27.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn28
+            // 
+            this.dataGridViewTextBoxColumn28.DataPropertyName = "LA_ISDEFAULT";
+            this.dataGridViewTextBoxColumn28.HeaderText = "是否默认";
+            this.dataGridViewTextBoxColumn28.Name = "dataGridViewTextBoxColumn28";
+            this.dataGridViewTextBoxColumn28.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn29
+            // 
+            this.dataGridViewTextBoxColumn29.DataPropertyName = "LA_TEMPLATETYPE";
+            this.dataGridViewTextBoxColumn29.HeaderText = "模板类型";
+            this.dataGridViewTextBoxColumn29.Name = "dataGridViewTextBoxColumn29";
+            this.dataGridViewTextBoxColumn29.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn30
+            // 
+            this.dataGridViewTextBoxColumn30.DataPropertyName = "LA_SOFTTYPE";
+            this.dataGridViewTextBoxColumn30.HeaderText = "模板软件";
+            this.dataGridViewTextBoxColumn30.Name = "dataGridViewTextBoxColumn30";
+            this.dataGridViewTextBoxColumn30.ReadOnly = true;
+            // 
+            // dataGridViewTextBoxColumn31
+            // 
+            this.dataGridViewTextBoxColumn31.DataPropertyName = "LA_PRODCODE";
+            this.dataGridViewTextBoxColumn31.HeaderText = "产品编号";
+            this.dataGridViewTextBoxColumn31.Name = "dataGridViewTextBoxColumn31";
+            this.dataGridViewTextBoxColumn31.ReadOnly = true;
+            // 
+            // groupBoxWithBorder1
+            // 
+            this.groupBoxWithBorder1.BorderColor = System.Drawing.Color.Black;
+            this.groupBoxWithBorder1.Controls.Add(this.aftersn_qty);
+            this.groupBoxWithBorder1.Controls.Add(this.aftersnqty_label_);
+            this.groupBoxWithBorder1.Controls.Add(this.AfterSn_Range);
+            this.groupBoxWithBorder1.Controls.Add(this.AfterSnRange_label_);
+            this.groupBoxWithBorder1.Controls.Add(this.beforesn_qty);
+            this.groupBoxWithBorder1.Controls.Add(this.beforesnqty_label_);
+            this.groupBoxWithBorder1.Controls.Add(this.Before_SnRange);
+            this.groupBoxWithBorder1.Controls.Add(this.BeforeSnRange_label_label);
+            this.groupBoxWithBorder1.Controls.Add(this.IMEI_Num);
+            this.groupBoxWithBorder1.Controls.Add(this.label3_label_label);
+            this.groupBoxWithBorder1.Controls.Add(this.BT_Num);
+            this.groupBoxWithBorder1.Controls.Add(this.label13_label_label);
+            this.groupBoxWithBorder1.Controls.Add(this.Mac_Num);
+            this.groupBoxWithBorder1.Controls.Add(this.Mac_label_label);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(41, 280);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1181, 105);
+            this.groupBoxWithBorder1.TabIndex = 19;
+            this.groupBoxWithBorder1.TabStop = false;
+            this.groupBoxWithBorder1.Text = "SN关联信息";
+            this.groupBoxWithBorder1.TextColor = System.Drawing.Color.Black;
+            // 
+            // aftersn_qty
+            // 
+            this.aftersn_qty.AutoSize = true;
+            this.aftersn_qty.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.aftersn_qty.Location = new System.Drawing.Point(927, 63);
+            this.aftersn_qty.Name = "aftersn_qty";
+            this.aftersn_qty.Size = new System.Drawing.Size(0, 23);
+            this.aftersn_qty.TabIndex = 17;
+            // 
+            // aftersnqty_label_
+            // 
+            this.aftersnqty_label_.AutoSize = true;
+            this.aftersnqty_label_.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.aftersnqty_label_.Location = new System.Drawing.Point(816, 63);
+            this.aftersnqty_label_.Name = "aftersnqty_label_";
+            this.aftersnqty_label_.Size = new System.Drawing.Size(102, 23);
+            this.aftersnqty_label_.TabIndex = 16;
+            this.aftersnqty_label_.Text = "转换后SN数";
+            // 
+            // AfterSn_Range
+            // 
+            this.AfterSn_Range.AutoSize = true;
+            this.AfterSn_Range.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.AfterSn_Range.Location = new System.Drawing.Point(584, 63);
+            this.AfterSn_Range.Name = "AfterSn_Range";
+            this.AfterSn_Range.Size = new System.Drawing.Size(0, 23);
+            this.AfterSn_Range.TabIndex = 15;
+            // 
+            // AfterSnRange_label_
+            // 
+            this.AfterSnRange_label_.AutoSize = true;
+            this.AfterSnRange_label_.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.AfterSnRange_label_.Location = new System.Drawing.Point(443, 63);
+            this.AfterSnRange_label_.Name = "AfterSnRange_label_";
+            this.AfterSnRange_label_.Size = new System.Drawing.Size(119, 23);
+            this.AfterSnRange_label_.TabIndex = 14;
+            this.AfterSnRange_label_.Text = "转换后SN范围";
+            // 
+            // beforesn_qty
+            // 
+            this.beforesn_qty.AutoSize = true;
+            this.beforesn_qty.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.beforesn_qty.Location = new System.Drawing.Point(927, 23);
+            this.beforesn_qty.Name = "beforesn_qty";
+            this.beforesn_qty.Size = new System.Drawing.Size(0, 23);
+            this.beforesn_qty.TabIndex = 13;
+            // 
+            // beforesnqty_label_
+            // 
+            this.beforesnqty_label_.AutoSize = true;
+            this.beforesnqty_label_.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.beforesnqty_label_.Location = new System.Drawing.Point(816, 23);
+            this.beforesnqty_label_.Name = "beforesnqty_label_";
+            this.beforesnqty_label_.Size = new System.Drawing.Size(102, 23);
+            this.beforesnqty_label_.TabIndex = 12;
+            this.beforesnqty_label_.Text = "转换前SN数";
+            // 
+            // Before_SnRange
+            // 
+            this.Before_SnRange.AutoSize = true;
+            this.Before_SnRange.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.Before_SnRange.Location = new System.Drawing.Point(179, 63);
+            this.Before_SnRange.Name = "Before_SnRange";
+            this.Before_SnRange.Size = new System.Drawing.Size(0, 23);
+            this.Before_SnRange.TabIndex = 11;
+            // 
+            // BeforeSnRange_label_label
+            // 
+            this.BeforeSnRange_label_label.AutoSize = true;
+            this.BeforeSnRange_label_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.BeforeSnRange_label_label.Location = new System.Drawing.Point(37, 63);
+            this.BeforeSnRange_label_label.Name = "BeforeSnRange_label_label";
+            this.BeforeSnRange_label_label.Size = new System.Drawing.Size(119, 23);
+            this.BeforeSnRange_label_label.TabIndex = 10;
+            this.BeforeSnRange_label_label.Text = "转换前SN范围";
+            // 
+            // IMEI_Num
+            // 
+            this.IMEI_Num.AutoSize = true;
+            this.IMEI_Num.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.IMEI_Num.Location = new System.Drawing.Point(696, 23);
+            this.IMEI_Num.Name = "IMEI_Num";
+            this.IMEI_Num.Size = new System.Drawing.Size(0, 23);
+            this.IMEI_Num.TabIndex = 9;
+            // 
+            // label3_label_label
+            // 
+            this.label3_label_label.AutoSize = true;
+            this.label3_label_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.label3_label_label.Location = new System.Drawing.Point(553, 23);
+            this.label3_label_label.Name = "label3_label_label";
+            this.label3_label_label.Size = new System.Drawing.Size(131, 23);
+            this.label3_label_label.TabIndex = 8;
+            this.label3_label_label.Text = "已导入IMEI数量";
+            // 
+            // BT_Num
+            // 
+            this.BT_Num.AutoSize = true;
+            this.BT_Num.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.BT_Num.Location = new System.Drawing.Point(432, 23);
+            this.BT_Num.Name = "BT_Num";
+            this.BT_Num.Size = new System.Drawing.Size(0, 23);
+            this.BT_Num.TabIndex = 7;
+            // 
+            // label13_label_label
+            // 
+            this.label13_label_label.AutoSize = true;
+            this.label13_label_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.label13_label_label.Location = new System.Drawing.Point(300, 23);
+            this.label13_label_label.Name = "label13_label_label";
+            this.label13_label_label.Size = new System.Drawing.Size(116, 23);
+            this.label13_label_label.TabIndex = 6;
+            this.label13_label_label.Text = "已导入BT数量";
+            // 
+            // Mac_Num
+            // 
+            this.Mac_Num.AutoSize = true;
+            this.Mac_Num.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.Mac_Num.Location = new System.Drawing.Point(179, 23);
+            this.Mac_Num.Name = "Mac_Num";
+            this.Mac_Num.Size = new System.Drawing.Size(0, 23);
+            this.Mac_Num.TabIndex = 5;
+            // 
+            // Mac_label_label
+            // 
+            this.Mac_label_label.AutoSize = true;
+            this.Mac_label_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.Mac_label_label.Location = new System.Drawing.Point(37, 23);
+            this.Mac_label_label.Name = "Mac_label_label";
+            this.Mac_label_label.Size = new System.Drawing.Size(130, 23);
+            this.Mac_label_label.TabIndex = 4;
+            this.Mac_label_label.Text = "已导入Mac数量";
+            // 
+            // Product
+            // 
+            this.Product.BorderColor = System.Drawing.Color.Black;
+            this.Product.Controls.Add(this.sn_relation);
+            this.Product.Controls.Add(this.sn_relation_label);
+            this.Product.Controls.Add(this.pr_cartonweight);
+            this.Product.Controls.Add(this.pr_cartonweight_label);
+            this.Product.Controls.Add(this.pr_colorboxweight);
+            this.Product.Controls.Add(this.pr_colorboxweight_label);
+            this.Product.Controls.Add(this.pr_agingtime);
+            this.Product.Controls.Add(this.pr_agingtime_label);
+            this.Product.Controls.Add(this.pr_outboxinnerqty);
+            this.Product.Controls.Add(this.pr_outboxinnerqty_label);
+            this.Product.Controls.Add(this.pr_sendchecktype);
+            this.Product.Controls.Add(this.pr_sendchecktype_label);
+            this.Product.Controls.Add(this.pr_detail);
+            this.Product.Controls.Add(this.pr_detail_label);
+            this.Product.Controls.Add(this.pr_code);
+            this.Product.Controls.Add(this.pr_code_label);
+            this.Product.Location = new System.Drawing.Point(41, 165);
+            this.Product.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Product.Name = "Product";
+            this.Product.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Product.Size = new System.Drawing.Size(1181, 105);
+            this.Product.TabIndex = 18;
+            this.Product.TabStop = false;
+            this.Product.Text = "产品信息";
+            this.Product.TextColor = System.Drawing.Color.Black;
+            // 
+            // sn_relation
+            // 
+            this.sn_relation.AutoSize = true;
+            this.sn_relation.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.sn_relation.Location = new System.Drawing.Point(927, 63);
+            this.sn_relation.Name = "sn_relation";
+            this.sn_relation.Size = new System.Drawing.Size(78, 23);
+            this.sn_relation.TabIndex = 19;
+            this.sn_relation.Text = "采集内容";
+            // 
+            // sn_relation_label
+            // 
+            this.sn_relation_label.AutoSize = true;
+            this.sn_relation_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.sn_relation_label.Location = new System.Drawing.Point(816, 63);
+            this.sn_relation_label.Name = "sn_relation_label";
+            this.sn_relation_label.Size = new System.Drawing.Size(78, 23);
+            this.sn_relation_label.TabIndex = 18;
+            this.sn_relation_label.Text = "采集内容";
+            // 
+            // pr_cartonweight
+            // 
+            this.pr_cartonweight.AutoSize = true;
+            this.pr_cartonweight.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_cartonweight.Location = new System.Drawing.Point(665, 63);
+            this.pr_cartonweight.Name = "pr_cartonweight";
+            this.pr_cartonweight.Size = new System.Drawing.Size(0, 23);
+            this.pr_cartonweight.TabIndex = 17;
+            // 
+            // pr_cartonweight_label
+            // 
+            this.pr_cartonweight_label.AutoSize = true;
+            this.pr_cartonweight_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_cartonweight_label.Location = new System.Drawing.Point(553, 63);
+            this.pr_cartonweight_label.Name = "pr_cartonweight_label";
+            this.pr_cartonweight_label.Size = new System.Drawing.Size(95, 23);
+            this.pr_cartonweight_label.TabIndex = 16;
+            this.pr_cartonweight_label.Text = "卡通箱重量";
+            // 
+            // pr_colorboxweight
+            // 
+            this.pr_colorboxweight.AutoSize = true;
+            this.pr_colorboxweight.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_colorboxweight.Location = new System.Drawing.Point(408, 63);
+            this.pr_colorboxweight.Name = "pr_colorboxweight";
+            this.pr_colorboxweight.Size = new System.Drawing.Size(0, 23);
+            this.pr_colorboxweight.TabIndex = 15;
+            // 
+            // pr_colorboxweight_label
+            // 
+            this.pr_colorboxweight_label.AutoSize = true;
+            this.pr_colorboxweight_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_colorboxweight_label.Location = new System.Drawing.Point(300, 63);
+            this.pr_colorboxweight_label.Name = "pr_colorboxweight_label";
+            this.pr_colorboxweight_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_colorboxweight_label.TabIndex = 14;
+            this.pr_colorboxweight_label.Text = "彩盒重量";
+            // 
+            // pr_agingtime
+            // 
+            this.pr_agingtime.AutoSize = true;
+            this.pr_agingtime.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_agingtime.Location = new System.Drawing.Point(144, 63);
+            this.pr_agingtime.Name = "pr_agingtime";
+            this.pr_agingtime.Size = new System.Drawing.Size(0, 23);
+            this.pr_agingtime.TabIndex = 13;
+            // 
+            // pr_agingtime_label
+            // 
+            this.pr_agingtime_label.AutoSize = true;
+            this.pr_agingtime_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_agingtime_label.Location = new System.Drawing.Point(37, 63);
+            this.pr_agingtime_label.Name = "pr_agingtime_label";
+            this.pr_agingtime_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_agingtime_label.TabIndex = 12;
+            this.pr_agingtime_label.Text = "老化时长";
+            // 
+            // pr_outboxinnerqty
+            // 
+            this.pr_outboxinnerqty.AutoSize = true;
+            this.pr_outboxinnerqty.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_outboxinnerqty.Location = new System.Drawing.Point(927, 24);
+            this.pr_outboxinnerqty.Name = "pr_outboxinnerqty";
+            this.pr_outboxinnerqty.Size = new System.Drawing.Size(0, 23);
+            this.pr_outboxinnerqty.TabIndex = 11;
+            // 
+            // pr_outboxinnerqty_label
+            // 
+            this.pr_outboxinnerqty_label.AutoSize = true;
+            this.pr_outboxinnerqty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_outboxinnerqty_label.Location = new System.Drawing.Point(816, 24);
+            this.pr_outboxinnerqty_label.Name = "pr_outboxinnerqty_label";
+            this.pr_outboxinnerqty_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_outboxinnerqty_label.TabIndex = 10;
+            this.pr_outboxinnerqty_label.Text = "装箱容量";
+            // 
+            // pr_sendchecktype
+            // 
+            this.pr_sendchecktype.AutoSize = true;
+            this.pr_sendchecktype.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_sendchecktype.Location = new System.Drawing.Point(665, 24);
+            this.pr_sendchecktype.Name = "pr_sendchecktype";
+            this.pr_sendchecktype.Size = new System.Drawing.Size(0, 23);
+            this.pr_sendchecktype.TabIndex = 9;
+            // 
+            // pr_sendchecktype_label
+            // 
+            this.pr_sendchecktype_label.AutoSize = true;
+            this.pr_sendchecktype_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_sendchecktype_label.Location = new System.Drawing.Point(553, 24);
+            this.pr_sendchecktype_label.Name = "pr_sendchecktype_label";
+            this.pr_sendchecktype_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_sendchecktype_label.TabIndex = 8;
+            this.pr_sendchecktype_label.Text = "送检类型";
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.AutoSize = true;
+            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_detail.Location = new System.Drawing.Point(408, 24);
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Size = new System.Drawing.Size(0, 23);
+            this.pr_detail.TabIndex = 7;
+            // 
+            // pr_detail_label
+            // 
+            this.pr_detail_label.AutoSize = true;
+            this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_detail_label.Location = new System.Drawing.Point(300, 24);
+            this.pr_detail_label.Name = "pr_detail_label";
+            this.pr_detail_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_detail_label.TabIndex = 6;
+            this.pr_detail_label.Text = "产品名称";
+            // 
+            // pr_code
+            // 
+            this.pr_code.AutoSize = true;
+            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_code.Location = new System.Drawing.Point(144, 24);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(0, 23);
+            this.pr_code.TabIndex = 5;
+            // 
+            // pr_code_label
+            // 
+            this.pr_code_label.AutoSize = true;
+            this.pr_code_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.pr_code_label.Location = new System.Drawing.Point(37, 24);
+            this.pr_code_label.Name = "pr_code_label";
+            this.pr_code_label.Size = new System.Drawing.Size(78, 23);
+            this.pr_code_label.TabIndex = 4;
+            this.pr_code_label.Text = "产品编号";
+            // 
+            // MakeInf
+            // 
+            this.MakeInf.BorderColor = System.Drawing.Color.Black;
+            this.MakeInf.Controls.Add(this.ma_unlimitageqty);
+            this.MakeInf.Controls.Add(this.ma_unlimitageqty_label);
+            this.MakeInf.Controls.Add(this.ma_bomversion);
+            this.MakeInf.Controls.Add(this.ma_bomversion_label);
+            this.MakeInf.Controls.Add(this.ma_qty);
+            this.MakeInf.Controls.Add(this.ma_qty_label);
+            this.MakeInf.Controls.Add(this.ma_softversion);
+            this.MakeInf.Controls.Add(this.ma_softversion_label);
+            this.MakeInf.Controls.Add(this.ma_wccode);
+            this.MakeInf.Controls.Add(this.ma_wccode_label);
+            this.MakeInf.Controls.Add(this.ma_custname);
+            this.MakeInf.Controls.Add(this.ma_custname_label);
+            this.MakeInf.Controls.Add(this.ma_salecode);
+            this.MakeInf.Controls.Add(this.ma_salecode_label);
+            this.MakeInf.Location = new System.Drawing.Point(41, 50);
+            this.MakeInf.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MakeInf.Name = "MakeInf";
+            this.MakeInf.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MakeInf.Size = new System.Drawing.Size(1181, 105);
+            this.MakeInf.TabIndex = 3;
+            this.MakeInf.TabStop = false;
+            this.MakeInf.Text = "工单信息";
+            this.MakeInf.TextColor = System.Drawing.Color.Black;
+            // 
+            // ma_unlimitageqty
+            // 
+            this.ma_unlimitageqty.AutoSize = true;
+            this.ma_unlimitageqty.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_unlimitageqty.Location = new System.Drawing.Point(665, 62);
+            this.ma_unlimitageqty.Name = "ma_unlimitageqty";
+            this.ma_unlimitageqty.Size = new System.Drawing.Size(0, 23);
+            this.ma_unlimitageqty.TabIndex = 17;
+            // 
+            // ma_unlimitageqty_label
+            // 
+            this.ma_unlimitageqty_label.AutoSize = true;
+            this.ma_unlimitageqty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_unlimitageqty_label.Location = new System.Drawing.Point(553, 62);
+            this.ma_unlimitageqty_label.Name = "ma_unlimitageqty_label";
+            this.ma_unlimitageqty_label.Size = new System.Drawing.Size(95, 23);
+            this.ma_unlimitageqty_label.TabIndex = 16;
+            this.ma_unlimitageqty_label.Text = "不限老化数";
+            // 
+            // ma_bomversion
+            // 
+            this.ma_bomversion.AutoSize = true;
+            this.ma_bomversion.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_bomversion.Location = new System.Drawing.Point(408, 62);
+            this.ma_bomversion.Name = "ma_bomversion";
+            this.ma_bomversion.Size = new System.Drawing.Size(0, 23);
+            this.ma_bomversion.TabIndex = 15;
+            // 
+            // ma_bomversion_label
+            // 
+            this.ma_bomversion_label.AutoSize = true;
+            this.ma_bomversion_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_bomversion_label.Location = new System.Drawing.Point(300, 62);
+            this.ma_bomversion_label.Name = "ma_bomversion_label";
+            this.ma_bomversion_label.Size = new System.Drawing.Size(86, 23);
+            this.ma_bomversion_label.TabIndex = 14;
+            this.ma_bomversion_label.Text = "BOM版本";
+            // 
+            // ma_qty
+            // 
+            this.ma_qty.AutoSize = true;
+            this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_qty.Location = new System.Drawing.Point(144, 62);
+            this.ma_qty.Name = "ma_qty";
+            this.ma_qty.Size = new System.Drawing.Size(0, 23);
+            this.ma_qty.TabIndex = 13;
+            // 
+            // ma_qty_label
+            // 
+            this.ma_qty_label.AutoSize = true;
+            this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_qty_label.Location = new System.Drawing.Point(37, 62);
+            this.ma_qty_label.Name = "ma_qty_label";
+            this.ma_qty_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_qty_label.TabIndex = 12;
+            this.ma_qty_label.Text = "工单数量";
+            // 
+            // ma_softversion
+            // 
+            this.ma_softversion.AutoSize = true;
+            this.ma_softversion.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_softversion.Location = new System.Drawing.Point(927, 23);
+            this.ma_softversion.Name = "ma_softversion";
+            this.ma_softversion.Size = new System.Drawing.Size(0, 23);
+            this.ma_softversion.TabIndex = 11;
+            // 
+            // ma_softversion_label
+            // 
+            this.ma_softversion_label.AutoSize = true;
+            this.ma_softversion_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_softversion_label.Location = new System.Drawing.Point(816, 23);
+            this.ma_softversion_label.Name = "ma_softversion_label";
+            this.ma_softversion_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_softversion_label.TabIndex = 10;
+            this.ma_softversion_label.Text = "软件版本";
+            // 
+            // ma_wccode
+            // 
+            this.ma_wccode.AutoSize = true;
+            this.ma_wccode.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_wccode.Location = new System.Drawing.Point(665, 23);
+            this.ma_wccode.Name = "ma_wccode";
+            this.ma_wccode.Size = new System.Drawing.Size(0, 23);
+            this.ma_wccode.TabIndex = 9;
+            // 
+            // ma_wccode_label
+            // 
+            this.ma_wccode_label.AutoSize = true;
+            this.ma_wccode_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_wccode_label.Location = new System.Drawing.Point(553, 23);
+            this.ma_wccode_label.Name = "ma_wccode_label";
+            this.ma_wccode_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_wccode_label.TabIndex = 8;
+            this.ma_wccode_label.Text = "工作中心";
+            // 
+            // ma_custname
+            // 
+            this.ma_custname.AutoSize = true;
+            this.ma_custname.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_custname.Location = new System.Drawing.Point(408, 23);
+            this.ma_custname.Name = "ma_custname";
+            this.ma_custname.Size = new System.Drawing.Size(0, 23);
+            this.ma_custname.TabIndex = 7;
+            // 
+            // ma_custname_label
+            // 
+            this.ma_custname_label.AutoSize = true;
+            this.ma_custname_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_custname_label.Location = new System.Drawing.Point(300, 23);
+            this.ma_custname_label.Name = "ma_custname_label";
+            this.ma_custname_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_custname_label.TabIndex = 6;
+            this.ma_custname_label.Text = "客户名称";
+            // 
+            // ma_salecode
+            // 
+            this.ma_salecode.AutoSize = true;
+            this.ma_salecode.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_salecode.Location = new System.Drawing.Point(144, 23);
+            this.ma_salecode.Name = "ma_salecode";
+            this.ma_salecode.Size = new System.Drawing.Size(0, 23);
+            this.ma_salecode.TabIndex = 5;
+            // 
+            // ma_salecode_label
+            // 
+            this.ma_salecode_label.AutoSize = true;
+            this.ma_salecode_label.Font = new System.Drawing.Font("微软雅黑", 10F);
+            this.ma_salecode_label.Location = new System.Drawing.Point(37, 23);
+            this.ma_salecode_label.Name = "ma_salecode_label";
+            this.ma_salecode_label.Size = new System.Drawing.Size(78, 23);
+            this.ma_salecode_label.TabIndex = 4;
+            this.ma_salecode_label.Text = "销售订单";
+            // 
+            // Search
+            // 
+            this.Search.AllPower = null;
+            this.Search.BackColor = System.Drawing.Color.Transparent;
+            this.Search.DownImage = ((System.Drawing.Image)(resources.GetObject("Search.DownImage")));
+            this.Search.Image = null;
+            this.Search.IsShowBorder = true;
+            this.Search.Location = new System.Drawing.Point(357, 11);
+            this.Search.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Search.MoveImage = ((System.Drawing.Image)(resources.GetObject("Search.MoveImage")));
+            this.Search.Name = "Search";
+            this.Search.NormalImage = ((System.Drawing.Image)(resources.GetObject("Search.NormalImage")));
+            this.Search.Power = null;
+            this.Search.Size = new System.Drawing.Size(75, 28);
+            this.Search.TabIndex = 2;
+            this.Search.Text = "查询";
+            this.Search.UseVisualStyleBackColor = false;
+            this.Search.Click += new System.EventHandler(this.Search_Click);
+            // 
+            // MakeCode
+            // 
+            this.MakeCode.AllPower = null;
+            this.MakeCode.BackColor = System.Drawing.Color.White;
+            this.MakeCode.ID = null;
+            this.MakeCode.Location = new System.Drawing.Point(131, 11);
+            this.MakeCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.MakeCode.Name = "MakeCode";
+            this.MakeCode.Power = null;
+            this.MakeCode.Size = new System.Drawing.Size(196, 25);
+            this.MakeCode.Str = null;
+            this.MakeCode.Str1 = null;
+            this.MakeCode.Str2 = null;
+            this.MakeCode.TabIndex = 1;
+            // 
+            // CD_STEPNO
+            // 
+            this.CD_STEPNO.DataPropertyName = "CD_STEPNO";
+            this.CD_STEPNO.HeaderText = "执行顺序";
+            this.CD_STEPNO.Name = "CD_STEPNO";
+            this.CD_STEPNO.ReadOnly = true;
+            // 
+            // CD_STEPNAME
+            // 
+            this.CD_STEPNAME.DataPropertyName = "CD_STEPNAME";
+            this.CD_STEPNAME.HeaderText = "工序名称";
+            this.CD_STEPNAME.Name = "CD_STEPNAME";
+            this.CD_STEPNAME.ReadOnly = true;
+            // 
+            // CD_STEPCODE
+            // 
+            this.CD_STEPCODE.DataPropertyName = "CD_STEPCODE";
+            this.CD_STEPCODE.HeaderText = "工序编号";
+            this.CD_STEPCODE.Name = "CD_STEPCODE";
+            this.CD_STEPCODE.ReadOnly = true;
+            // 
+            // CD_NEXTSTEPNAME
+            // 
+            this.CD_NEXTSTEPNAME.DataPropertyName = "CD_NEXTSTEPNAME";
+            this.CD_NEXTSTEPNAME.HeaderText = "下一工序名称";
+            this.CD_NEXTSTEPNAME.Name = "CD_NEXTSTEPNAME";
+            this.CD_NEXTSTEPNAME.ReadOnly = true;
+            this.CD_NEXTSTEPNAME.Width = 150;
+            // 
+            // CD_NEXTSTEPCODE
+            // 
+            this.CD_NEXTSTEPCODE.DataPropertyName = "CD_NEXTSTEPCODE";
+            this.CD_NEXTSTEPCODE.HeaderText = "下一工序编号";
+            this.CD_NEXTSTEPCODE.Name = "CD_NEXTSTEPCODE";
+            this.CD_NEXTSTEPCODE.ReadOnly = true;
+            this.CD_NEXTSTEPCODE.Width = 150;
+            // 
+            // CD_IFINPUT
+            // 
+            this.CD_IFINPUT.DataPropertyName = "CD_IFINPUT";
+            this.CD_IFINPUT.HeaderText = "上料工序";
+            this.CD_IFINPUT.Name = "CD_IFINPUT";
+            this.CD_IFINPUT.ReadOnly = true;
+            this.CD_IFINPUT.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFINPUT.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFOUTPUT
+            // 
+            this.CD_IFOUTPUT.DataPropertyName = "CD_IFOUTPUT";
+            this.CD_IFOUTPUT.HeaderText = "下料工序";
+            this.CD_IFOUTPUT.Name = "CD_IFOUTPUT";
+            this.CD_IFOUTPUT.ReadOnly = true;
+            this.CD_IFOUTPUT.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFOUTPUT.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFTEST
+            // 
+            this.CD_IFTEST.DataPropertyName = "CD_IFTEST";
+            this.CD_IFTEST.HeaderText = "测试工序";
+            this.CD_IFTEST.Name = "CD_IFTEST";
+            this.CD_IFTEST.ReadOnly = true;
+            this.CD_IFTEST.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFTEST.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFBURNIN
+            // 
+            this.CD_IFBURNIN.DataPropertyName = "CD_IFBURNIN";
+            this.CD_IFBURNIN.HeaderText = "老化工序";
+            this.CD_IFBURNIN.Name = "CD_IFBURNIN";
+            this.CD_IFBURNIN.ReadOnly = true;
+            this.CD_IFBURNIN.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFBURNIN.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFWEIGH
+            // 
+            this.CD_IFWEIGH.DataPropertyName = "CD_IFWEIGH";
+            this.CD_IFWEIGH.HeaderText = "是否称重";
+            this.CD_IFWEIGH.Name = "CD_IFWEIGH";
+            this.CD_IFWEIGH.ReadOnly = true;
+            this.CD_IFWEIGH.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFWEIGH.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFSNCHANGE
+            // 
+            this.CD_IFSNCHANGE.DataPropertyName = "CD_IFSNCHANGE";
+            this.CD_IFSNCHANGE.HeaderText = "序号转换工序";
+            this.CD_IFSNCHANGE.Name = "CD_IFSNCHANGE";
+            this.CD_IFSNCHANGE.ReadOnly = true;
+            this.CD_IFSNCHANGE.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFSNCHANGE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.CD_IFSNCHANGE.Width = 150;
+            // 
+            // CD_IFOQC
+            // 
+            this.CD_IFOQC.DataPropertyName = "CD_IFOQC";
+            this.CD_IFOQC.HeaderText = "OQC工序";
+            this.CD_IFOQC.Name = "CD_IFOQC";
+            this.CD_IFOQC.ReadOnly = true;
+            this.CD_IFOQC.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFOQC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFPACK
+            // 
+            this.CD_IFPACK.DataPropertyName = "CD_IFPACK";
+            this.CD_IFPACK.HeaderText = "包装工序";
+            this.CD_IFPACK.Name = "CD_IFPACK";
+            this.CD_IFPACK.ReadOnly = true;
+            this.CD_IFPACK.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFPACK.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFREPAIR
+            // 
+            this.CD_IFREPAIR.DataPropertyName = "CD_IFREPAIR";
+            this.CD_IFREPAIR.HeaderText = "维修工序";
+            this.CD_IFREPAIR.Name = "CD_IFREPAIR";
+            this.CD_IFREPAIR.ReadOnly = true;
+            this.CD_IFREPAIR.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFREPAIR.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFOUTLINE
+            // 
+            this.CD_IFOUTLINE.DataPropertyName = "CD_IFOUTLINE";
+            this.CD_IFOUTLINE.HeaderText = "线外工序";
+            this.CD_IFOUTLINE.Name = "CD_IFOUTLINE";
+            this.CD_IFOUTLINE.ReadOnly = true;
+            this.CD_IFOUTLINE.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFOUTLINE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFSMTINOUT
+            // 
+            this.CD_IFSMTINOUT.DataPropertyName = "CD_IFSMTINOUT";
+            this.CD_IFSMTINOUT.HeaderText = "SMT防呆工序";
+            this.CD_IFSMTINOUT.Name = "CD_IFSMTINOUT";
+            this.CD_IFSMTINOUT.ReadOnly = true;
+            this.CD_IFSMTINOUT.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFSMTINOUT.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.CD_IFSMTINOUT.Width = 150;
+            // 
+            // CD_IFSPC
+            // 
+            this.CD_IFSPC.DataPropertyName = "CD_IFSPC";
+            this.CD_IFSPC.HeaderText = "SPC工序";
+            this.CD_IFSPC.Name = "CD_IFSPC";
+            this.CD_IFSPC.ReadOnly = true;
+            this.CD_IFSPC.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFSPC.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFREDUCE
+            // 
+            this.CD_IFREDUCE.DataPropertyName = "CD_IFREDUCE";
+            this.CD_IFREDUCE.HeaderText = "扣料工序";
+            this.CD_IFREDUCE.Name = "CD_IFREDUCE";
+            this.CD_IFREDUCE.ReadOnly = true;
+            this.CD_IFREDUCE.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFREDUCE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_IFMIDFINISH
+            // 
+            this.CD_IFMIDFINISH.DataPropertyName = "CD_IFMIDFINISH";
+            this.CD_IFMIDFINISH.HeaderText = "中间产量工序";
+            this.CD_IFMIDFINISH.Name = "CD_IFMIDFINISH";
+            this.CD_IFMIDFINISH.ReadOnly = true;
+            this.CD_IFMIDFINISH.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFMIDFINISH.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.CD_IFMIDFINISH.Width = 150;
+            // 
+            // CD_IFMIDINPUT
+            // 
+            this.CD_IFMIDINPUT.DataPropertyName = "CD_IFMIDINPUT";
+            this.CD_IFMIDINPUT.HeaderText = "中间投入工序";
+            this.CD_IFMIDINPUT.Name = "CD_IFMIDINPUT";
+            this.CD_IFMIDINPUT.ReadOnly = true;
+            this.CD_IFMIDINPUT.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFMIDINPUT.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.CD_IFMIDINPUT.Width = 150;
+            // 
+            // CD_FIRSTSTEP
+            // 
+            this.CD_FIRSTSTEP.DataPropertyName = "CD_FIRSTSTEP";
+            this.CD_FIRSTSTEP.HeaderText = "是否第一道工序";
+            this.CD_FIRSTSTEP.Name = "CD_FIRSTSTEP";
+            this.CD_FIRSTSTEP.ReadOnly = true;
+            this.CD_FIRSTSTEP.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_FIRSTSTEP.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.CD_FIRSTSTEP.Width = 150;
+            // 
+            // CD_IFOFFLINE
+            // 
+            this.CD_IFOFFLINE.DataPropertyName = "CD_IFOFFLINE";
+            this.CD_IFOFFLINE.HeaderText = "下线工序";
+            this.CD_IFOFFLINE.Name = "CD_IFOFFLINE";
+            this.CD_IFOFFLINE.ReadOnly = true;
+            this.CD_IFOFFLINE.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.CD_IFOFFLINE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // CD_DETNO
+            // 
+            this.CD_DETNO.DataPropertyName = "CD_DETNO";
+            this.CD_DETNO.HeaderText = "序号";
+            this.CD_DETNO.Name = "CD_DETNO";
+            this.CD_DETNO.ReadOnly = true;
+            // 
+            // CD_TABLE
+            // 
+            this.CD_TABLE.DataPropertyName = "CD_TABLE";
+            this.CD_TABLE.HeaderText = "板面";
+            this.CD_TABLE.Name = "CD_TABLE";
+            this.CD_TABLE.ReadOnly = true;
+            // 
+            // Query_MakeInf
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1235, 1084);
+            this.Controls.Add(this.label18_la_ll);
+            this.Controls.Add(this.label17_ll_);
+            this.Controls.Add(this.label16_lll_);
+            this.Controls.Add(this.Label);
+            this.Controls.Add(this.BOM);
+            this.Controls.Add(this.Carft);
+            this.Controls.Add(this.groupBoxWithBorder1);
+            this.Controls.Add(this.Product);
+            this.Controls.Add(this.MakeInf);
+            this.Controls.Add(this.Search);
+            this.Controls.Add(this.MakeCode);
+            this.Controls.Add(this.label1_lll_);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "Query_MakeInf";
+            this.Tag = "Query!MakeInf";
+            this.Text = "Query_MakeInf";
+            this.Load += new System.EventHandler(this.Query_MakeInf_Load);
+            this.SizeChanged += new System.EventHandler(this.Query_MakeInf_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.Carft)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.BOM)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Label)).EndInit();
+            this.groupBoxWithBorder1.ResumeLayout(true);
+            this.groupBoxWithBorder1.PerformLayout();
+            this.Product.ResumeLayout(true);
+            this.Product.PerformLayout();
+            this.MakeInf.ResumeLayout(true);
+            this.MakeInf.PerformLayout();
+            this.ResumeLayout(true);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1_lll_;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox MakeCode;
+        private CustomControl.ButtonUtil.NormalButton Search;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder MakeInf;
+        private System.Windows.Forms.Label ma_softversion;
+        private System.Windows.Forms.Label ma_softversion_label;
+        private System.Windows.Forms.Label ma_wccode;
+        private System.Windows.Forms.Label ma_wccode_label;
+        private System.Windows.Forms.Label ma_custname;
+        private System.Windows.Forms.Label ma_custname_label;
+        private System.Windows.Forms.Label ma_salecode;
+        private System.Windows.Forms.Label ma_salecode_label;
+        private System.Windows.Forms.Label ma_bomversion;
+        private System.Windows.Forms.Label ma_bomversion_label;
+        private System.Windows.Forms.Label ma_qty;
+        private System.Windows.Forms.Label ma_qty_label;
+        private System.Windows.Forms.Label ma_unlimitageqty;
+        private System.Windows.Forms.Label ma_unlimitageqty_label;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder Product;
+        private System.Windows.Forms.Label pr_cartonweight;
+        private System.Windows.Forms.Label pr_cartonweight_label;
+        private System.Windows.Forms.Label pr_colorboxweight;
+        private System.Windows.Forms.Label pr_colorboxweight_label;
+        private System.Windows.Forms.Label pr_agingtime;
+        private System.Windows.Forms.Label pr_agingtime_label;
+        private System.Windows.Forms.Label pr_outboxinnerqty;
+        private System.Windows.Forms.Label pr_outboxinnerqty_label;
+        private System.Windows.Forms.Label pr_sendchecktype;
+        private System.Windows.Forms.Label pr_sendchecktype_label;
+        private System.Windows.Forms.Label pr_detail;
+        private System.Windows.Forms.Label pr_detail_label;
+        private System.Windows.Forms.Label pr_code;
+        private System.Windows.Forms.Label pr_code_label;
+        private CustomControl.GroupBoxWithBorder.GroupBoxWithBorder groupBoxWithBorder1;
+        private System.Windows.Forms.Label BT_Num;
+        private System.Windows.Forms.Label label13_label_label;
+        private System.Windows.Forms.Label Mac_Num;
+        private System.Windows.Forms.Label Mac_label_label;
+        private System.Windows.Forms.DataGridView Carft;
+        private System.Windows.Forms.DataGridView BOM;
+        private System.Windows.Forms.DataGridView Label;
+        private System.Windows.Forms.Label label16_lll_;
+        private System.Windows.Forms.Label label17_ll_;
+        private System.Windows.Forms.Label label18_la_ll;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_MOTHERCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_SONCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_STEPCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_REPCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_TYPE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_DESCRIPTION;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_DETNO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_PREFIX;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_TRACEKIND;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_LENGTH;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_ONEUSEQTY;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_UPDATEMAN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn SP_UPDATEDATE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_CODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_NAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_STATUS;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_INDATE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_INMAN;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_PRINTNOS;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_URL;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_ISDEFAULT;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_TEMPLATETYPE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_SOFTTYPE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn LA_PRODCODE;
+        private System.Windows.Forms.Label IMEI_Num;
+        private System.Windows.Forms.Label label3_label_label;
+        private System.Windows.Forms.Label BeforeSnRange_label_label;
+        private System.Windows.Forms.Label Before_SnRange;
+        private System.Windows.Forms.Label beforesnqty_label_;
+        private System.Windows.Forms.Label beforesn_qty;
+        private System.Windows.Forms.Label AfterSn_Range;
+        private System.Windows.Forms.Label AfterSnRange_label_;
+        private System.Windows.Forms.Label aftersn_qty;
+        private System.Windows.Forms.Label aftersnqty_label_;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn2;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn3;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn4;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn5;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn6;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn7;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn8;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn9;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn10;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn11;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn12;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn13;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn14;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn15;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn16;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn17;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn18;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn16;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn18;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn21;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn22;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn23;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn24;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn25;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn26;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn27;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn28;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn29;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn30;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn31;
+        private System.Windows.Forms.Label sn_relation_label;
+        private System.Windows.Forms.Label sn_relation;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CD_STEPNO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CD_STEPNAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CD_STEPCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CD_NEXTSTEPNAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CD_NEXTSTEPCODE;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFINPUT;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFOUTPUT;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFTEST;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFBURNIN;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFWEIGH;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFSNCHANGE;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFOQC;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFPACK;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFREPAIR;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFOUTLINE;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFSMTINOUT;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFSPC;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFREDUCE;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFMIDFINISH;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFMIDINPUT;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_FIRSTSTEP;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn CD_IFOFFLINE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CD_DETNO;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CD_TABLE;
+    }
+}

+ 161 - 0
UAS-MES/FunctionCode/Query/Query_MakeInf.cs

@@ -0,0 +1,161 @@
+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.CustomControl.TextBoxWithIcon;
+using UAS_MES.DataOperate;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Query
+{
+    public partial class Query_MakeInf : Form
+    {
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+        DataHelper dh;
+
+        public Query_MakeInf()
+        {
+            InitializeComponent();
+        }
+
+        private void Query_MakeInf_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            dh = new DataHelper();
+        }
+
+        private void Query_MakeInf_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void Search_Click(object sender, EventArgs e)
+        {
+            LogStringBuilder sql = new LogStringBuilder();
+            sql.Clear();
+            sql.Append("select ma_prodcode,ma_qty,ma_craftcode,ma_wccode,ma_salecode,ma_custname,ma_unlimitageqty");
+            sql.Append(",ma_softversion,ma_bomversion from make where ma_code='" + MakeCode.Text + "'");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            CleanForm(this);
+            if (dt.Rows.Count > 0)
+            {
+                BaseUtil.SetFormValue(this.Controls, dt);
+                string ma_prodcode = dt.Rows[0]["ma_prodcode"].ToString();
+                string ma_craftcode = dt.Rows[0]["ma_craftcode"].ToString();
+                string ma_bomversion = dt.Rows[0]["ma_bomversion"].ToString();
+                string ma_salecode = dt.Rows[0]["ma_salecode"].ToString();
+                sql.Clear();
+                sql.Append("select pr_code,pr_outboxinnerqty,case pr_sendchecktype when 'SaleCode' then '按合同送检' when 'LineCode' then '按线别送检' end pr_sendchecktype,pr_detail,pr_agingtime");
+                sql.Append(",( CASE WHEN pr_colorboxminw LIKE '.%' THEN '0'||pr_colorboxminw ELSE to_char(pr_colorboxminw)  END  ||'-'||   CASE WHEN pr_colorboxmaxw LIKE '.%' THEN '0'||pr_colorboxmaxw ELSE to_char(pr_colorboxmaxw)  END ||' '||pr_colorboxunit)pr_colorboxweight,");
+                sql.Append("(CASE WHEN pr_cartonminw LIKE '.%' THEN '0'||pr_cartonminw ELSE to_char(pr_cartonminw)  END  ||'-'|| CASE WHEN pr_cartonmaxw LIKE '.%' THEN '0'||pr_cartonmaxw ELSE to_char(pr_cartonmaxw)  END   ||' '||pr_cartonunit)pr_cartonweight from product where pr_code='" + ma_prodcode + "'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                }
+                sn_relation.Text = dh.getFieldDataByCondition("productsnrelation", "wm_concat(psr_type)", "psr_prodcode='" + ma_prodcode + "'").ToString();
+                sql.Clear();
+                sql.Append("select * from craftdetail left join craft on cd_crid=cr_id where cr_code='" + ma_craftcode + "' and cr_prodcode='" + ma_prodcode + "' order by cd_detno");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.FillDgvWithDataTable(Carft, dt);
+                }
+                sql.Clear();
+                sql.Append("select (msr_startno||'-'||msr_endno) before_snrange,msr_qty beforesn_qty from makesnrule where msr_makecode='" + MakeCode.Text + "' and msr_type='before'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                }
+                sql.Clear();
+                sql.Append("select (msr_startno||'-'||msr_endno) aftersn_range,msr_qty aftersn_qty from makesnrule where msr_makecode='" + MakeCode.Text + "' and msr_type='after'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                }
+                //获取SN关联信息
+                Mac_Num.Text = dh.getFieldDataByCondition("Makeaddresslist", "count(1)", "mal_makecode='" + MakeCode.Text + "' and mal_mac is not null").ToString();
+                BT_Num.Text = dh.getFieldDataByCondition("Makeaddresslist", "count(1)", "mal_makecode='" + MakeCode.Text + "' and mal_bt is not null").ToString();
+                IMEI_Num.Text = dh.getFieldDataByCondition("Makeimeilist", "count(1)", "mil_makecode='" + MakeCode.Text + "' and mil_imei1 is not null").ToString();
+                sql.Clear();
+                sql.Append("select * from StepProduct left join product on pr_code=sp_soncode where sp_bomversion='" + ma_bomversion + "' and sp_mothercode='" + ma_prodcode + "' and sp_craftcode='" + ma_craftcode + "'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.FillDgvWithDataTable(BOM, dt);
+                }
+                sql.Clear();
+                sql.Append("select * from label where la_prodcode='" + ma_prodcode + "'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.FillDgvWithDataTable(Label, dt);
+                }
+            }
+            else MessageBox.Show("工单号不存在");
+        }
+
+
+
+        /// <summary>
+        /// 清除DataGridView的数据
+        /// </summary>
+        /// <param name="dgv"></param>
+        public static void CleanDGVData(DataGridView dgv)
+        {
+            for (int i = dgv.Rows.Count - 1; i >= 0; i--)
+            {
+                dgv.Rows.RemoveAt(i);
+            }
+            DataTable dt = dgv.DataSource as DataTable;
+            if (dt != null)
+            {
+                dt.AcceptChanges();
+            }
+        }
+
+        public static void CleanForm(Form Form)
+        {
+            for (int i = 0; i < Form.Controls.Count; i++)
+            {
+                if (Form.Controls[i].Controls.Count > 0)
+                {
+                    CleanControls(Form.Controls[i].Controls);
+                }
+                if ((Form.Controls[i] is Label && GetCharInStringCount("_", Form.Controls[i].Name) != 2))
+                    Form.Controls[i].Text = "";
+                if (Form.Controls[i] is DataGridView)
+                    CleanDGVData((DataGridView)Form.Controls[i]);
+            }
+        }
+
+        public static void CleanControls(Control.ControlCollection collection)
+        {
+            for (int i = 0; i < collection.Count; i++)
+            {
+                if (collection[i].Controls.Count > 0)
+                    CleanControls(collection[i].Controls);
+                if ((collection[i] is Label && GetCharInStringCount("_", collection[i].Name) != 2))
+                    collection[i].Text = "";
+                if (collection[i] is DataGridView)
+                    CleanDGVData((DataGridView)collection[i]);
+            }
+        }
+
+
+        public static int GetCharInStringCount(string Char, string String)
+        {
+            string str = String.Replace(Char, "");
+            return (String.Length - str.Length) / Char.Length;
+        }
+
+
+    }
+}

+ 375 - 0
UAS-MES/FunctionCode/Query/Query_MakeInf.resx

@@ -0,0 +1,375 @@
+<?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="CD_STEPNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_STEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_STEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_NEXTSTEPNAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_NEXTSTEPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFINPUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFOUTPUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFTEST.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFBURNIN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFWEIGH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFSNCHANGE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFOQC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFPACK.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFREPAIR.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFOUTLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFSMTINOUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFSPC.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFREDUCE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFMIDFINISH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFMIDINPUT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_FIRSTSTEP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_IFOFFLINE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_DETNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CD_TABLE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_MOTHERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_SONCODE.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="SP_REPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_TYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_DESCRIPTION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_DETNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_PREFIX.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_TRACEKIND.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_LENGTH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_ONEUSEQTY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_UPDATEMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_UPDATEDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_MOTHERCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_SONCODE.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="SP_REPCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_TYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_DESCRIPTION.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_DETNO.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_PREFIX.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_TRACEKIND.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_LENGTH.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_ONEUSEQTY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_UPDATEMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="SP_UPDATEDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_STATUS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_INDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_INMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_PRINTNOS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_URL.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_ISDEFAULT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_TEMPLATETYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_SOFTTYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_PRODCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_CODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_STATUS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_INDATE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_INMAN.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_PRINTNOS.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_URL.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_ISDEFAULT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_TEMPLATETYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_SOFTTYPE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="LA_PRODCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Search.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="Search.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="Search.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+</root>

+ 2 - 29
UAS-MES/PublicMethod/LogicHandler.cs

@@ -804,7 +804,7 @@ namespace UAS_MES.PublicMethod
             }
             else
             {
-                return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, out oErrorMessage);
+                return CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
             }
         }
 
@@ -840,18 +840,6 @@ namespace UAS_MES.PublicMethod
             return SetStepFinish(iMakeCode, iSourceCode, iSN, iMPKind, iResult, iUserCode, out oErrorMessage);
         }
 
-        public static bool CS_SetFinish(string iMakeCode, string iSourceCode, string iSN, string iUserCode, out string oErrorMessage)
-        {
-            oErrorMessage = "";
-            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, oErrorMessage };
-            dh.CallProcedure("CS_SETSTEPFINISH", ref param);
-            oErrorMessage = param[4];
-            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
-                return true;
-            else
-                return false;
-        }
-
         /// <summary>
         /// 方法说明:测试详细信息录入系统,针对一个SN多个测试项目结果可循环调用
         /// </summary>
@@ -983,7 +971,7 @@ namespace UAS_MES.PublicMethod
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "' ");
                     else
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_paststep = ms_paststep ||'," + StepCode + "',ms_reworkstatus=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
-                    SetTestResult(iMakeCode, iSourceCode, iSnCode, "不良采集", iResult, iUserCode, out oErrorMessage);
+                    SetTestResult(iMakeCode, iSourceCode, iSnCode, "不良采集", "NG", iUserCode, out oErrorMessage);
                 }
             }
             return true;
@@ -1131,21 +1119,6 @@ namespace UAS_MES.PublicMethod
                 return false;
         }
 
-        /// <summary>
-        /// 设置良品采集结果,iResult含有“批次通过”按抽检批次通过
-        /// </summary>
-        /// <param name="iSnCode"></param>
-        /// <param name="iMakeCode"></param>
-        /// <param name="iSourceCode"></param>
-        /// <param name="iUserName"></param>
-        /// <param name="iResult"></param>
-        /// <param name="oErrorMessage"></param>
-        /// <returns></returns>
-        public static bool UpdateMakeMessage(string iSnCode, string iMakeCode, string iMPKind, string iSourceCode, string iUserCode, string iResult, out string oErrorMessage)
-        {
-            return SetStepFinish(iMakeCode, iSourceCode, iSnCode, iMPKind, iResult, iUserCode, out oErrorMessage);
-        }
-
         /// <summary>
         /// 获取执行步骤代码,名称和线别
         /// </summary>

+ 2 - 1
UAS-MES/PublicMethod/Print.cs

@@ -35,7 +35,7 @@ namespace UAS_MES.PublicMethod
                 {
                     dt = (DataTable)dh.ExecuteSql("select lpl_id from labelprintlog where lpl_value='" + SnCode + "' and lpl_makecode='" + MakeCode + "' and lpl_type='" + LabelType + "' and lpl_stepcode='" + User.CurrentStepCode + "'", "select");
                 }
-                //如果已经打印过了,则不允许再打印
+                ////如果已经打印过了,则不允许再打印
                 if (dt.Rows.Count > 0)
                 {
                     ErrorMessage = SnCode + LabelType + "已打印";
@@ -109,6 +109,7 @@ namespace UAS_MES.PublicMethod
             //doc.Save();
             doc.Printer.SwitchTo(PrinterName);
             doc.PrintDocument(PrintNum);
+          //doc.Close();
             LogicHandler.DoCommandLog(iCaller, User.UserCode, "", User.UserLineCode, User.UserSourceCode, "打印", "成功打印", SnCode, "");
             LogicHandler.doLabelPrintLog(SnCode, LabelType, MakeCode, ProdCode, User.UserSourceCode, User.CurrentStepCode, IfRePrint, User.UserCode);
             return true;

+ 1 - 1
UAS-MES/PublicMethod/ftpOperater.cs

@@ -287,7 +287,7 @@ namespace UAS_MES.PublicMethod
                 File.Copy(sourceFile, destFile, true);
             }
             catch {
-                MessageBox.Show("标签文件不在指定维护路径"+ URL + "中","提示",MessageBoxButtons.OK,MessageBoxIcon.Warning);
+                MessageBox.Show("标签文件更新失败,不在指定维护路径"+ URL + "中或已被占用","提示",MessageBoxButtons.OK,MessageBoxIcon.Warning);
             }
             return destFile;
         }

+ 11 - 20
UAS-出货标签管理/UAS_出货标签管理.cs

@@ -1439,7 +1439,6 @@ namespace UAS_LabelMachine
                 //查找是否存在该中盒号
                 List<int> MidRowIndex = new List<int>();
                 //缓存中盒数据
-                List<string> MidBoxCode = new List<string>();
                 for (int i = 0; i < LabelInf.RowCount; i++)
                 {
                     if (MidLabelNum.Text == LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString())
@@ -1447,11 +1446,6 @@ namespace UAS_LabelMachine
                         //找到了输入的中盒号停止循环
                         FindMidLabel = true;
                         MidLabelRowIndex = i;
-                    }
-                    //设置所有的中盒号的索引
-                    if (!MidBoxCode.Contains(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()))
-                    {
-                        MidBoxCode.Add(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString());
                         MidRowIndex.Add(i);
                     }
                 }
@@ -1623,17 +1617,7 @@ namespace UAS_LabelMachine
 
         private void MidBoxCodePrint(string la_id, int rowindex, int[] midindex)
         {
-            if (MidBoxCacheData.Rows.Count == 0)
-            {
-                MidIDAndOutboxcode.Clear();
-                for (int i = 0; i < midindex.Length; i++)
-                {
-                    MidIDAndOutboxcode.Add(LabelInf.Rows[midindex[i]].Cells["pib_id1"].Value.ToString(), LabelInf.Rows[midindex[i]].Cells["pib_outboxcode1"].Value.ToString());
-                }
-                GetMidBoxData();
-            }
             DataTable dt = (DataTable)dh.ExecuteSql("select lp_name,lp_sql from label left join LABELPARAMETER on la_id= lp_laid where la_id=" + la_id, "select");
-            string[] arg = MidBoxArgument.ToArray();
             for (int j = 0; j < MidDoc.Variables.FreeVariables.Count; j++)
             {
                 //将维护的模板参数和模板本身的参数名称进行比对
@@ -1657,7 +1641,6 @@ namespace UAS_LabelMachine
                             }
                             else
                             {
-                                DataRow[] dr = MidBoxCacheData.Select("pib_outboxcode1=" + pib_outboxcode1);
                                 if (MidDoc.Variables.FreeVariables.Item(j + 1).Name.ToLower().Contains("datecode1"))
                                 {
                                     if (LabelInf.Rows[rowindex].Cells["DateCode1"].Value != null)
@@ -1673,12 +1656,20 @@ namespace UAS_LabelMachine
                                     if (LabelInf.Rows[rowindex].Cells["pib_datecode"].Value != null)
                                         MidDoc.Variables.FreeVariables.Item(j + 1).Value = LabelInf.Rows[rowindex].Cells["pib_datecode"].Value.ToString();
                                 }
-                                else if (arg.Contains(MidDoc.Variables.FreeVariables.Item(j + 1).Name))
+                                else
                                 {
-                                    if (dr.Length > 0)
+                                    if (sql.ToLower().Contains("pib_qty"))
                                     {
-                                        MidDoc.Variables.FreeVariables.Item(j + 1).Value = dr[0][MidDoc.Variables.FreeVariables.Item(j + 1).Name].ToString();
+                                        sql = sql.Substring(0, sql.IndexOf("{")) + pib_id + sql.Substring(sql.IndexOf("}") + 1);
+                                        sql = sql.Substring(0, sql.LastIndexOf("=")) + "='" + pib_outboxcode1 + "' group by pib_outboxcode1";
+                                    }
+                                    else
+                                    {
+                                        sql = sql.Substring(0, sql.IndexOf("{"));
+                                        sql = sql.Substring(0, sql.LastIndexOf("="));
+                                        sql = sql + " in (select distinct pib_outboxcode1 from PRODIOBARCODE where pib_inoutno='" + pi_inoutno.Text + "')" + " and pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode1='" + pib_outboxcode1 + "'";
                                     }
+                                    MidDoc.Variables.FreeVariables.Item(j + 1).Value = dh.GetLabelParam(sql).ToString();
                                 }
                                 LogManager.DoLog("打印参数【" + MidDoc.Variables.FreeVariables.Item(j + 1).Name + "】赋值," + "取值SQL:" + sql + ",取到值" + MidDoc.Variables.FreeVariables.Item(j + 1).Value);
                             }