Kaynağa Gözat

添加选择功能

callm 6 yıl önce
ebeveyn
işleme
d6d60b5ff5

+ 144 - 0
UAS-出货标签管理(吉利通)/DateCodeSetAndPrint.Designer.cs

@@ -0,0 +1,144 @@
+namespace UAS_LabelMachine
+{
+    partial class DateCodeSetAndPrint
+    {
+        /// <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.SetValueAndPrint = new System.Windows.Forms.Button();
+            this.loadingCircle1 = new UAS_LabelMachine.CustomControl.SetLoading.LoadingCircle();
+            this.SetValue = new System.Windows.Forms.Button();
+            this.lotno_label = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.lotno = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.datecode = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.SuspendLayout();
+            // 
+            // SetValueAndPrint
+            // 
+            this.SetValueAndPrint.Location = new System.Drawing.Point(382, 335);
+            this.SetValueAndPrint.Name = "SetValueAndPrint";
+            this.SetValueAndPrint.Size = new System.Drawing.Size(142, 41);
+            this.SetValueAndPrint.TabIndex = 0;
+            this.SetValueAndPrint.Text = "设置并打印";
+            this.SetValueAndPrint.UseVisualStyleBackColor = true;
+            // 
+            // loadingCircle1
+            // 
+            this.loadingCircle1.Active = false;
+            this.loadingCircle1.Color = System.Drawing.Color.DarkGray;
+            this.loadingCircle1.InnerCircleRadius = 5;
+            this.loadingCircle1.Location = new System.Drawing.Point(410, 212);
+            this.loadingCircle1.Name = "loadingCircle1";
+            this.loadingCircle1.NumberSpoke = 12;
+            this.loadingCircle1.OuterCircleRadius = 11;
+            this.loadingCircle1.RotationSpeed = 100;
+            this.loadingCircle1.Size = new System.Drawing.Size(0, 0);
+            this.loadingCircle1.SpokeThickness = 2;
+            this.loadingCircle1.StylePreset = UAS_LabelMachine.CustomControl.SetLoading.LoadingCircle.StylePresets.MacOSX;
+            this.loadingCircle1.TabIndex = 2;
+            this.loadingCircle1.Text = "loadingCircle1";
+            // 
+            // SetValue
+            // 
+            this.SetValue.Location = new System.Drawing.Point(213, 335);
+            this.SetValue.Name = "SetValue";
+            this.SetValue.Size = new System.Drawing.Size(142, 41);
+            this.SetValue.TabIndex = 3;
+            this.SetValue.Text = "设置值";
+            this.SetValue.UseVisualStyleBackColor = true;
+            // 
+            // lotno_label
+            // 
+            this.lotno_label.AutoSize = true;
+            this.lotno_label.Location = new System.Drawing.Point(135, 131);
+            this.lotno_label.Name = "lotno_label";
+            this.lotno_label.Size = new System.Drawing.Size(70, 24);
+            this.lotno_label.TabIndex = 4;
+            this.lotno_label.Text = "LotNo";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(135, 221);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(106, 24);
+            this.label2.TabIndex = 5;
+            this.label2.Text = "DateCode";
+            // 
+            // lotno
+            // 
+            this.lotno.ID = null;
+            this.lotno.Location = new System.Drawing.Point(268, 128);
+            this.lotno.Name = "lotno";
+            this.lotno.Size = new System.Drawing.Size(301, 35);
+            this.lotno.Str = null;
+            this.lotno.Str1 = null;
+            this.lotno.Str2 = null;
+            this.lotno.TabIndex = 6;
+            // 
+            // datecode
+            // 
+            this.datecode.ID = null;
+            this.datecode.Location = new System.Drawing.Point(268, 218);
+            this.datecode.Name = "datecode";
+            this.datecode.Size = new System.Drawing.Size(301, 35);
+            this.datecode.Str = null;
+            this.datecode.Str1 = null;
+            this.datecode.Str2 = null;
+            this.datecode.TabIndex = 7;
+            // 
+            // DateCodeSetAndPrint
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(730, 425);
+            this.Controls.Add(this.datecode);
+            this.Controls.Add(this.lotno);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.lotno_label);
+            this.Controls.Add(this.SetValue);
+            this.Controls.Add(this.loadingCircle1);
+            this.Controls.Add(this.SetValueAndPrint);
+            this.Name = "DateCodeSetAndPrint";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "DateCodeSetAndPrint";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button SetValueAndPrint;
+        private CustomControl.SetLoading.LoadingCircle loadingCircle1;
+        private System.Windows.Forms.Button SetValue;
+        private System.Windows.Forms.Label lotno_label;
+        private System.Windows.Forms.Label label2;
+        private CustomControl.EnterTextBox lotno;
+        private CustomControl.EnterTextBox datecode;
+    }
+}

+ 19 - 0
UAS-出货标签管理(吉利通)/DateCodeSetAndPrint.cs

@@ -0,0 +1,19 @@
+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_LabelMachine
+{
+    public partial class DateCodeSetAndPrint : Form
+    {
+        public DateCodeSetAndPrint()
+        {
+            InitializeComponent();
+        }
+    }
+}

+ 120 - 0
UAS-出货标签管理(吉利通)/DateCodeSetAndPrint.resx

@@ -0,0 +1,120 @@
+<?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>
+</root>

+ 9 - 0
UAS-出货标签管理(吉利通)/UAS-出货标签管理(吉利通).csproj

@@ -214,6 +214,12 @@
     <Compile Include="CustomControl\SerialPortWithTag.Designer.cs">
       <DependentUpon>SerialPortWithTag.cs</DependentUpon>
     </Compile>
+    <Compile Include="DateCodeSetAndPrint.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DateCodeSetAndPrint.Designer.cs">
+      <DependentUpon>DateCodeSetAndPrint.cs</DependentUpon>
+    </Compile>
     <Compile Include="DbFind.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -336,6 +342,9 @@
     <EmbeddedResource Include="CustomControl\SearchTextBox.resx">
       <DependentUpon>SearchTextBox.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DateCodeSetAndPrint.resx">
+      <DependentUpon>DateCodeSetAndPrint.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DbFind.resx">
       <DependentUpon>DbFind.cs</DependentUpon>
     </EmbeddedResource>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 225 - 179
UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs


+ 123 - 54
UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -174,73 +174,79 @@ namespace UAS_LabelMachine
             }
             RefreshDBConnect.Interval = 60000;
             RefreshDBConnect.Start();
-
-            DataTable dt = (DataTable)adh.ExecuteSql("select * from cominfo", "select");
-            DataRow[] dr = dt.Select("comtype='FrontendCheck'");
-            if (dr.Length > 0)
-            {
-                FrontendCheck.PortName = dr[0]["COM"].ToString();
-                int sleeptime = 0;
-                if (int.TryParse(dr[0]["DATAWAIT"].ToString(), out sleeptime))
-                {
-                    FrontendCheck.SleepTime = sleeptime;
-                }
-                FrontendCheck.Tag = "FrontendCheck";
-                FrontendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
-                FrontendCheck.DataReceived += Serial_DataReceived;
-                FrontendCheck.Open();
-            }
-            dr = dt.Select("comtype='BackendCheck'");
-            if (dr.Length > 0)
-            {
-                BackendCheck.PortName = dr[0]["COM"].ToString();
-                BackendCheck.Tag = "BackendCheck";
-                int sleeptime = 0;
-                if (int.TryParse(dr[0]["DATAWAIT"].ToString(), out sleeptime))
-                {
-                    BackendCheck.SleepTime = sleeptime;
-                }
-                BackendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
-                BackendCheck.DataReceived += Serial_DataReceived;
-                BackendCheck.Open();
-            }
-            dr = dt.Select("comtype='PLC1'");
-            if (dr.Length > 0)
+            try
             {
-                if (!PLC1.IsOpen)
+                DataTable dt = (DataTable)adh.ExecuteSql("select * from cominfo", "select");
+                DataRow[] dr = dt.Select("comtype='FrontendCheck'");
+                if (dr.Length > 0)
                 {
-                    PLC1.PortName = dr[0]["COM"].ToString();
-                    PLC1.Tag = "PLC1";
+                    FrontendCheck.PortName = dr[0]["COM"].ToString();
                     int sleeptime = 0;
                     if (int.TryParse(dr[0]["DATAWAIT"].ToString(), out sleeptime))
                     {
-                        PLC1.SleepTime = sleeptime;
+                        FrontendCheck.SleepTime = sleeptime;
                     }
-                    PLC1.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
-                    PLC1.DataReceived += Serial_DataReceived;
-                    PLC1.Open();
+                    FrontendCheck.Tag = "FrontendCheck";
+                    FrontendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
+                    FrontendCheck.DataReceived += Serial_DataReceived;
+                    FrontendCheck.Open();
                 }
-                LogicHandler.SendDataToPLC(PLC1, PLCInstruct.DeviceStart, adh);
-                MessageLog.AppendText("PLC启动成功\n", Color.Blue);
-            }
-            dr = dt.Select("comtype='ManBackendCheck'");
-            if (dr.Length > 0)
-            {
-                if (!ManBackendCheck.IsOpen)
+                dr = dt.Select("comtype='BackendCheck'");
+                if (dr.Length > 0)
                 {
-                    ManBackendCheck.PortName = dr[0]["COM"].ToString();
-                    ManBackendCheck.Tag = "ManBackendCheck";
+                    BackendCheck.PortName = dr[0]["COM"].ToString();
+                    BackendCheck.Tag = "BackendCheck";
                     int sleeptime = 0;
                     if (int.TryParse(dr[0]["DATAWAIT"].ToString(), out sleeptime))
                     {
-                        ManBackendCheck.SleepTime = sleeptime;
+                        BackendCheck.SleepTime = sleeptime;
                     }
-                    ManBackendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
-                    ManBackendCheck.DataReceived += Serial_DataReceived;
-                    ManBackendCheck.Open();
+                    BackendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
+                    BackendCheck.DataReceived += Serial_DataReceived;
+                    BackendCheck.Open();
+                }
+                dr = dt.Select("comtype='PLC1'");
+                if (dr.Length > 0)
+                {
+                    if (!PLC1.IsOpen)
+                    {
+                        PLC1.PortName = dr[0]["COM"].ToString();
+                        PLC1.Tag = "PLC1";
+                        int sleeptime = 0;
+                        if (int.TryParse(dr[0]["DATAWAIT"].ToString(), out sleeptime))
+                        {
+                            PLC1.SleepTime = sleeptime;
+                        }
+                        PLC1.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
+                        PLC1.DataReceived += Serial_DataReceived;
+                        PLC1.Open();
+                    }
+                    LogicHandler.SendDataToPLC(PLC1, PLCInstruct.DeviceStart, adh);
+                    MessageLog.AppendText("PLC启动成功\n", Color.Blue);
+                }
+                dr = dt.Select("comtype='ManBackendCheck'");
+                if (dr.Length > 0)
+                {
+                    if (!ManBackendCheck.IsOpen)
+                    {
+                        ManBackendCheck.PortName = dr[0]["COM"].ToString();
+                        ManBackendCheck.Tag = "ManBackendCheck";
+                        int sleeptime = 0;
+                        if (int.TryParse(dr[0]["DATAWAIT"].ToString(), out sleeptime))
+                        {
+                            ManBackendCheck.SleepTime = sleeptime;
+                        }
+                        ManBackendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
+                        ManBackendCheck.DataReceived += Serial_DataReceived;
+                        ManBackendCheck.Open();
+                    }
+                    LogicHandler.SendDataToPLC(PLC1, PLCInstruct.DeviceStart, adh);
+                    MessageLog.AppendText("PLC启动成功\n", Color.Blue);
                 }
-                LogicHandler.SendDataToPLC(PLC1, PLCInstruct.DeviceStart, adh);
-                MessageLog.AppendText("PLC启动成功\n", Color.Blue);
+            }
+            catch (Exception ex)
+            {
+                MessageLog.AppendText(ex.Message);
             }
             RefreshPLCInstruct();
         }
@@ -2393,5 +2399,68 @@ namespace UAS_LabelMachine
                 }
             }
         }
+        int rowindex = 0;
+        private void LabelInf_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Right)
+            {
+                rowindex = e.RowIndex;
+                DateCodeSetAndPrint date = new DateCodeSetAndPrint();
+                date.Controls["SetValue"].Click += SetValue_ButtonClick;
+                date.Controls["SetValueAndPrint"].Click += SetValueAndPrint_ButtonClick;
+                date.ShowDialog();
+            }
+        }
+
+        private void SetValue_ButtonClick(object sender, EventArgs e)
+        {
+            Button setvalue = sender as Button;
+            string pdno = LabelInf.Rows[rowindex].Cells["pib_pdno"].Value.ToString();
+            string datecode = setvalue.FindForm().Controls["datecode"].Text;
+            string lotno = setvalue.FindForm().Controls["lotno"].Text;
+            adh.ExecuteSql("update prodiobarcode set pib_lotno='" + lotno + "',pib_datecode='" + datecode + "' where pib_inoutno='" + pi_inoutno.Text + "' and pib_pdno=" + pdno, "update");
+            LoadGridData();
+            setvalue.FindForm().Close();
+        }
+
+        private void SetValueAndPrint_ButtonClick(object sender, EventArgs e)
+        {
+            Button setvalueandprint = sender as Button;
+            string pdno = LabelInf.Rows[rowindex].Cells["pib_pdno"].Value.ToString();
+            DataTable pibid_dt = (DataTable)adh.ExecuteSql("select pib_id from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' and pib_pdno=" + pdno, "select");
+            for (int i = 0; i < pibid_dt.Rows.Count; i++)
+            {
+                string pib_id = pibid_dt.Rows[i]["pib_id"].ToString();
+                sql.Clear();
+                for (int j = 0; j < SingleDoc.Variables.FormVariables.Count; j++)
+                {
+                    DataRow[] dr1 = SingleLabelParam.Select("lp_name='" + SingleDoc.Variables.FormVariables.Item(j + 1).Name.ToLower() + "'");
+                    if (dr1.Length > 0)
+                    {
+                        sql.Append(dr1[0]["lp_sql"].ToString() + ",");
+                    }
+                }
+                sql.Append("1,");
+                DataTable dt = (DataTable)adh.ExecuteSql("select " + sql.ToString().Substring(0, sql.Length - 1) + " from prodiobarcode where pib_id=" + pib_id, "select");
+                for (int j = 0; j < SingleDoc.Variables.FormVariables.Count; j++)
+                {
+                    DataRow[] dr1 = SingleLabelParam.Select("lp_name='" + SingleDoc.Variables.FormVariables.Item(j + 1).Name.ToLower() + "'");
+                    if (dr1.Length > 0)
+                    {
+                        SingleDoc.Variables.FormVariables.Item(j + 1).Value = dt.Rows[0][dr1[0]["lp_sql"].ToString()].ToString();
+                    }
+                    if (SingleDoc.Variables.FormVariables.Item(j + 1).Value == "")
+                    {
+                        dr1 = Attach.Select("lp_name='" + SingleDoc.Variables.FormVariables.Item(j + 1).Name.ToLower() + "'");
+                        if (dr1.Length > 0)
+                            SingleDoc.Variables.FormVariables.Item(j + 1).Value = dr1[0]["lp_sql"].ToString();
+                    }
+                }
+                SingleDoc.Printer.SwitchTo(SingleLabelPrinter.Text);
+                SingleDoc.PrintDocument();
+                LogicHandler.UpdateRowPrinted(pib_id);
+            }
+            setvalueandprint.FindForm().Close();
+        }
     }
 }

+ 69 - 30
UAS-出货标签管理(吉利通)/生成条码.Designer.cs

@@ -57,6 +57,9 @@
             this.pd_totalqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pd_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_restqty1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_restqty2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_restqty3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mid_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mid_num = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mid_remain = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -67,9 +70,10 @@
             // 
             this.pi_inoutno_label.AutoSize = true;
             this.pi_inoutno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_inoutno_label.Location = new System.Drawing.Point(25, 29);
+            this.pi_inoutno_label.Location = new System.Drawing.Point(50, 58);
+            this.pi_inoutno_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_inoutno_label.Name = "pi_inoutno_label";
-            this.pi_inoutno_label.Size = new System.Drawing.Size(90, 21);
+            this.pi_inoutno_label.Size = new System.Drawing.Size(178, 41);
             this.pi_inoutno_label.TabIndex = 148;
             this.pi_inoutno_label.Text = "出入库单号";
             // 
@@ -77,9 +81,10 @@
             // 
             this.pi_class_label.AutoSize = true;
             this.pi_class_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_class_label.Location = new System.Drawing.Point(266, 29);
+            this.pi_class_label.Location = new System.Drawing.Point(532, 58);
+            this.pi_class_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_class_label.Name = "pi_class_label";
-            this.pi_class_label.Size = new System.Drawing.Size(74, 21);
+            this.pi_class_label.Size = new System.Drawing.Size(146, 41);
             this.pi_class_label.TabIndex = 150;
             this.pi_class_label.Text = "单据类型";
             // 
@@ -87,18 +92,20 @@
             // 
             this.pi_class.AutoSize = true;
             this.pi_class.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pi_class.Location = new System.Drawing.Point(355, 29);
+            this.pi_class.Location = new System.Drawing.Point(710, 58);
+            this.pi_class.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pi_class.Name = "pi_class";
-            this.pi_class.Size = new System.Drawing.Size(0, 21);
+            this.pi_class.Size = new System.Drawing.Size(0, 41);
             this.pi_class.TabIndex = 152;
             // 
             // pr_kind_label
             // 
             this.pr_kind_label.AutoSize = true;
             this.pr_kind_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_kind_label.Location = new System.Drawing.Point(476, 29);
+            this.pr_kind_label.Location = new System.Drawing.Point(952, 58);
+            this.pr_kind_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.pr_kind_label.Name = "pr_kind_label";
-            this.pr_kind_label.Size = new System.Drawing.Size(74, 21);
+            this.pr_kind_label.Size = new System.Drawing.Size(146, 41);
             this.pr_kind_label.TabIndex = 156;
             this.pr_kind_label.Text = "物料类型";
             // 
@@ -110,27 +117,30 @@
             "单件管控",
             "批管控",
             "全部"});
-            this.pr_kind.Location = new System.Drawing.Point(563, 30);
+            this.pr_kind.Location = new System.Drawing.Point(1126, 60);
+            this.pr_kind.Margin = new System.Windows.Forms.Padding(6);
             this.pr_kind.Name = "pr_kind";
-            this.pr_kind.Size = new System.Drawing.Size(121, 20);
+            this.pr_kind.Size = new System.Drawing.Size(238, 32);
             this.pr_kind.TabIndex = 157;
             // 
             // MidCapacity_label
             // 
             this.MidCapacity_label.AutoSize = true;
             this.MidCapacity_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidCapacity_label.Location = new System.Drawing.Point(703, 29);
+            this.MidCapacity_label.Location = new System.Drawing.Point(1406, 58);
+            this.MidCapacity_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.MidCapacity_label.Name = "MidCapacity_label";
-            this.MidCapacity_label.Size = new System.Drawing.Size(74, 21);
+            this.MidCapacity_label.Size = new System.Drawing.Size(146, 41);
             this.MidCapacity_label.TabIndex = 158;
             this.MidCapacity_label.Text = "中盘容量";
             // 
             // SetMidCapacity
             // 
             this.SetMidCapacity.Image = ((System.Drawing.Image)(resources.GetObject("SetMidCapacity.Image")));
-            this.SetMidCapacity.Location = new System.Drawing.Point(911, 28);
+            this.SetMidCapacity.Location = new System.Drawing.Point(1822, 56);
+            this.SetMidCapacity.Margin = new System.Windows.Forms.Padding(6);
             this.SetMidCapacity.Name = "SetMidCapacity";
-            this.SetMidCapacity.Size = new System.Drawing.Size(50, 23);
+            this.SetMidCapacity.Size = new System.Drawing.Size(100, 46);
             this.SetMidCapacity.TabIndex = 160;
             this.SetMidCapacity.Text = "刷新";
             this.SetMidCapacity.UseVisualStyleBackColor = true;
@@ -138,17 +148,19 @@
             // 
             // MidCapacity
             // 
-            this.MidCapacity.Location = new System.Drawing.Point(787, 29);
+            this.MidCapacity.Location = new System.Drawing.Point(1574, 58);
+            this.MidCapacity.Margin = new System.Windows.Forms.Padding(6);
             this.MidCapacity.Name = "MidCapacity";
             this.MidCapacity.Negative = false;
-            this.MidCapacity.Size = new System.Drawing.Size(121, 21);
+            this.MidCapacity.Size = new System.Drawing.Size(238, 35);
             this.MidCapacity.TabIndex = 159;
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(1, 102);
+            this.ChooseAll.Location = new System.Drawing.Point(2, 204);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(6);
             this.ChooseAll.Name = "ChooseAll";
-            this.ChooseAll.Size = new System.Drawing.Size(46, 23);
+            this.ChooseAll.Size = new System.Drawing.Size(92, 46);
             this.ChooseAll.TabIndex = 155;
             this.ChooseAll.Text = "全选";
             this.ChooseAll.UseVisualStyleBackColor = true;
@@ -156,9 +168,10 @@
             // GenerateBarCode
             // 
             this.GenerateBarCode.Image = ((System.Drawing.Image)(resources.GetObject("GenerateBarCode.Image")));
-            this.GenerateBarCode.Location = new System.Drawing.Point(442, 78);
+            this.GenerateBarCode.Location = new System.Drawing.Point(884, 156);
+            this.GenerateBarCode.Margin = new System.Windows.Forms.Padding(6);
             this.GenerateBarCode.Name = "GenerateBarCode";
-            this.GenerateBarCode.Size = new System.Drawing.Size(64, 24);
+            this.GenerateBarCode.Size = new System.Drawing.Size(128, 48);
             this.GenerateBarCode.TabIndex = 154;
             this.GenerateBarCode.Text = "生成条码";
             this.GenerateBarCode.UseVisualStyleBackColor = true;
@@ -167,9 +180,10 @@
             // Screen
             // 
             this.Screen.Image = ((System.Drawing.Image)(resources.GetObject("Screen.Image")));
-            this.Screen.Location = new System.Drawing.Point(354, 78);
+            this.Screen.Location = new System.Drawing.Point(708, 156);
+            this.Screen.Margin = new System.Windows.Forms.Padding(6);
             this.Screen.Name = "Screen";
-            this.Screen.Size = new System.Drawing.Size(64, 24);
+            this.Screen.Size = new System.Drawing.Size(128, 48);
             this.Screen.TabIndex = 153;
             this.Screen.Text = "筛选";
             this.Screen.UseVisualStyleBackColor = true;
@@ -198,14 +212,18 @@
             this.pd_totalqty,
             this.pd_qty,
             this.pr_zxbzs,
+            this.pib_restqty1,
+            this.pib_restqty2,
+            this.pib_restqty3,
             this.mid_qty,
             this.mid_num,
             this.mid_remain});
             this.ProdIoInfDGV.GridColor = System.Drawing.SystemColors.ButtonFace;
-            this.ProdIoInfDGV.Location = new System.Drawing.Point(0, 125);
+            this.ProdIoInfDGV.Location = new System.Drawing.Point(0, 250);
+            this.ProdIoInfDGV.Margin = new System.Windows.Forms.Padding(6);
             this.ProdIoInfDGV.Name = "ProdIoInfDGV";
             this.ProdIoInfDGV.RowTemplate.Height = 23;
-            this.ProdIoInfDGV.Size = new System.Drawing.Size(1200, 427);
+            this.ProdIoInfDGV.Size = new System.Drawing.Size(2400, 854);
             this.ProdIoInfDGV.TabIndex = 151;
             this.ProdIoInfDGV.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.ProdIoInfDGV_CellEndEdit);
             this.ProdIoInfDGV.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.ProdIoInfDGV_CellPainting);
@@ -213,9 +231,10 @@
             // pi_inoutno
             // 
             this.pi_inoutno.ID = null;
-            this.pi_inoutno.Location = new System.Drawing.Point(128, 29);
+            this.pi_inoutno.Location = new System.Drawing.Point(256, 58);
+            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(6);
             this.pi_inoutno.Name = "pi_inoutno";
-            this.pi_inoutno.Size = new System.Drawing.Size(121, 21);
+            this.pi_inoutno.Size = new System.Drawing.Size(238, 35);
             this.pi_inoutno.Str = null;
             this.pi_inoutno.Str1 = null;
             this.pi_inoutno.Str2 = null;
@@ -226,9 +245,10 @@
             // ResetSerialNum
             // 
             this.ResetSerialNum.Image = ((System.Drawing.Image)(resources.GetObject("ResetSerialNum.Image")));
-            this.ResetSerialNum.Location = new System.Drawing.Point(529, 78);
+            this.ResetSerialNum.Location = new System.Drawing.Point(1058, 156);
+            this.ResetSerialNum.Margin = new System.Windows.Forms.Padding(6);
             this.ResetSerialNum.Name = "ResetSerialNum";
-            this.ResetSerialNum.Size = new System.Drawing.Size(64, 24);
+            this.ResetSerialNum.Size = new System.Drawing.Size(128, 48);
             this.ResetSerialNum.TabIndex = 161;
             this.ResetSerialNum.Text = "流水重置";
             this.ResetSerialNum.UseVisualStyleBackColor = true;
@@ -331,6 +351,21 @@
             this.pr_zxbzs.HeaderText = "单盘数量";
             this.pr_zxbzs.Name = "pr_zxbzs";
             // 
+            // pib_restqty1
+            // 
+            this.pib_restqty1.HeaderText = "尾数1";
+            this.pib_restqty1.Name = "pib_restqty1";
+            // 
+            // pib_restqty2
+            // 
+            this.pib_restqty2.HeaderText = "尾数2";
+            this.pib_restqty2.Name = "pib_restqty2";
+            // 
+            // pib_restqty3
+            // 
+            this.pib_restqty3.HeaderText = "尾数3";
+            this.pib_restqty3.Name = "pib_restqty3";
+            // 
             // mid_qty
             // 
             this.mid_qty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
@@ -352,9 +387,9 @@
             // 
             // 生成条码
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1201, 554);
+            this.ClientSize = new System.Drawing.Size(2402, 1108);
             this.Controls.Add(this.ResetSerialNum);
             this.Controls.Add(this.SetMidCapacity);
             this.Controls.Add(this.MidCapacity);
@@ -369,6 +404,7 @@
             this.Controls.Add(this.pi_class_label);
             this.Controls.Add(this.pi_inoutno);
             this.Controls.Add(this.pi_inoutno_label);
+            this.Margin = new System.Windows.Forms.Padding(6);
             this.Name = "生成条码";
             this.Text = "生成条码";
             this.Load += new System.EventHandler(this.生成条码_Load);
@@ -409,6 +445,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_totalqty;
         private System.Windows.Forms.DataGridViewTextBoxColumn pd_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_zxbzs;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pib_restqty1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pib_restqty2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pib_restqty3;
         private System.Windows.Forms.DataGridViewTextBoxColumn mid_qty;
         private System.Windows.Forms.DataGridViewTextBoxColumn mid_num;
         private System.Windows.Forms.DataGridViewTextBoxColumn mid_remain;

+ 9 - 0
UAS-出货标签管理(吉利通)/生成条码.resx

@@ -196,6 +196,15 @@
   <metadata name="pr_zxbzs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pib_restqty1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pib_restqty2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pib_restqty3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="mid_qty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor