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

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

@@ -0,0 +1,307 @@
+namespace UAS_MES.Make
+{
+    partial class Make_MakeDown
+    {
+        /// <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.mdcode = new System.Windows.Forms.Label();
+            this.md_code_label = new System.Windows.Forms.Label();
+            this.make_count = new System.Windows.Forms.Label();
+            this.count_label = new System.Windows.Forms.Label();
+            this.md_reson = new System.Windows.Forms.Label();
+            this.LabelDataGridView = new System.Windows.Forms.DataGridView();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pr_code = new System.Windows.Forms.Label();
+            this.ms_makecode = new System.Windows.Forms.Label();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.md_macode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.md_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.md_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.inputreson = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // mdcode
+            // 
+            this.mdcode.AutoSize = true;
+            this.mdcode.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.mdcode.Location = new System.Drawing.Point(95, 10);
+            this.mdcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.mdcode.Name = "mdcode";
+            this.mdcode.Size = new System.Drawing.Size(0, 21);
+            this.mdcode.TabIndex = 195;
+            // 
+            // md_code_label
+            // 
+            this.md_code_label.AutoSize = true;
+            this.md_code_label.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.md_code_label.Location = new System.Drawing.Point(33, 10);
+            this.md_code_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.md_code_label.Name = "md_code_label";
+            this.md_code_label.Size = new System.Drawing.Size(58, 21);
+            this.md_code_label.TabIndex = 194;
+            this.md_code_label.Text = "事件号";
+            // 
+            // make_count
+            // 
+            this.make_count.AutoSize = true;
+            this.make_count.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.make_count.Location = new System.Drawing.Point(513, 9);
+            this.make_count.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.make_count.Name = "make_count";
+            this.make_count.Size = new System.Drawing.Size(0, 21);
+            this.make_count.TabIndex = 197;
+            // 
+            // count_label
+            // 
+            this.count_label.AutoSize = true;
+            this.count_label.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.count_label.Location = new System.Drawing.Point(467, 9);
+            this.count_label.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.count_label.Name = "count_label";
+            this.count_label.Size = new System.Drawing.Size(42, 21);
+            this.count_label.TabIndex = 196;
+            this.count_label.Text = "数量";
+            // 
+            // md_reson
+            // 
+            this.md_reson.AutoSize = true;
+            this.md_reson.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.md_reson.Location = new System.Drawing.Point(19, 47);
+            this.md_reson.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.md_reson.Name = "md_reson";
+            this.md_reson.Size = new System.Drawing.Size(74, 21);
+            this.md_reson.TabIndex = 198;
+            this.md_reson.Text = "下地原因";
+            // 
+            // LabelDataGridView
+            // 
+            this.LabelDataGridView.AllowUserToAddRows = false;
+            this.LabelDataGridView.AllowUserToResizeRows = false;
+            this.LabelDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
+            this.LabelDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.md_macode,
+            this.md_sncode,
+            this.md_prodcode,
+            this.pr_detail});
+            this.LabelDataGridView.Location = new System.Drawing.Point(22, 193);
+            this.LabelDataGridView.Name = "LabelDataGridView";
+            this.LabelDataGridView.RowHeadersVisible = false;
+            this.LabelDataGridView.RowTemplate.Height = 23;
+            this.LabelDataGridView.Size = new System.Drawing.Size(747, 192);
+            this.LabelDataGridView.TabIndex = 200;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label1.Location = new System.Drawing.Point(18, 408);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(58, 21);
+            this.label1.TabIndex = 202;
+            this.label1.Text = "序列号";
+            // 
+            // pr_code
+            // 
+            this.pr_code.AutoSize = true;
+            this.pr_code.Location = new System.Drawing.Point(440, 340);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(0, 12);
+            this.pr_code.TabIndex = 205;
+            this.pr_code.Visible = false;
+            // 
+            // ms_makecode
+            // 
+            this.ms_makecode.AutoSize = true;
+            this.ms_makecode.Location = new System.Drawing.Point(550, 340);
+            this.ms_makecode.Name = "ms_makecode";
+            this.ms_makecode.Size = new System.Drawing.Size(0, 12);
+            this.ms_makecode.TabIndex = 206;
+            this.ms_makecode.Visible = false;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "md_macode";
+            this.dataGridViewTextBoxColumn1.HeaderText = "工单编号";
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn1.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "md_sncode";
+            this.dataGridViewTextBoxColumn2.HeaderText = "序列号";
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn2.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "md_prodcode";
+            this.dataGridViewTextBoxColumn3.HeaderText = "产品代码";
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.DataPropertyName = "pr_detail";
+            this.dataGridViewTextBoxColumn4.HeaderText = "产品名称";
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn4.Width = 80;
+            // 
+            // 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(377, 51);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(392, 124);
+            this.OperateResult.TabIndex = 204;
+            this.OperateResult.Text = "";
+            // 
+            // sn_code
+            // 
+            this.sn_code.AllPower = null;
+            this.sn_code.BackColor = System.Drawing.Color.White;
+            this.sn_code.ID = null;
+            this.sn_code.Location = new System.Drawing.Point(99, 408);
+            this.sn_code.Name = "sn_code";
+            this.sn_code.Power = null;
+            this.sn_code.Size = new System.Drawing.Size(196, 21);
+            this.sn_code.Str = null;
+            this.sn_code.Str1 = null;
+            this.sn_code.Str2 = null;
+            this.sn_code.TabIndex = 201;
+            this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
+            // 
+            // md_macode
+            // 
+            this.md_macode.DataPropertyName = "md_macode";
+            this.md_macode.HeaderText = "工单编号";
+            this.md_macode.Name = "md_macode";
+            this.md_macode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.md_macode.Width = 80;
+            // 
+            // md_sncode
+            // 
+            this.md_sncode.DataPropertyName = "md_sncode";
+            this.md_sncode.HeaderText = "序列号";
+            this.md_sncode.Name = "md_sncode";
+            this.md_sncode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.md_sncode.Width = 80;
+            // 
+            // md_prodcode
+            // 
+            this.md_prodcode.DataPropertyName = "md_prodcode";
+            this.md_prodcode.HeaderText = "产品代码";
+            this.md_prodcode.Name = "md_prodcode";
+            this.md_prodcode.ReadOnly = true;
+            this.md_prodcode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.md_prodcode.Width = 80;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "产品名称";
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.ReadOnly = true;
+            this.pr_detail.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pr_detail.Width = 80;
+            // 
+            // inputreson
+            // 
+            this.inputreson.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.inputreson.Location = new System.Drawing.Point(87, 51);
+            this.inputreson.Name = "inputreson";
+            this.inputreson.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
+            this.inputreson.Size = new System.Drawing.Size(253, 124);
+            this.inputreson.TabIndex = 199;
+            this.inputreson.Text = "";
+            // 
+            // Make_MakeDown
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(812, 456);
+            this.Controls.Add(this.ms_makecode);
+            this.Controls.Add(this.pr_code);
+            this.Controls.Add(this.OperateResult);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.sn_code);
+            this.Controls.Add(this.LabelDataGridView);
+            this.Controls.Add(this.inputreson);
+            this.Controls.Add(this.md_reson);
+            this.Controls.Add(this.make_count);
+            this.Controls.Add(this.count_label);
+            this.Controls.Add(this.mdcode);
+            this.Controls.Add(this.md_code_label);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "Make_MakeDown";
+            this.Tag = "Make!MakeDown";
+            this.Text = "Make_MakeDown";
+            this.Load += new System.EventHandler(this.Make_MakeDown_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_MakeDown_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label mdcode;
+        private System.Windows.Forms.Label md_code_label;
+        private System.Windows.Forms.Label make_count;
+        private System.Windows.Forms.Label count_label;
+        private System.Windows.Forms.Label md_reson;
+        private CustomControl.RichText.RichTextAutoBottom inputreson;
+        private System.Windows.Forms.DataGridView LabelDataGridView;
+        private CustomControl.TextBoxWithIcon.EnterTextBox sn_code;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private System.Windows.Forms.Label pr_code;
+        private System.Windows.Forms.Label ms_makecode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn md_macode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn md_sncode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn md_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
+    }
+}

UAS-MES/FunctionCode/Make/Make_MakeDown.cs

@@ -0,0 +1,146 @@
+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.DataOperate;
+using UAS_MES.Entity;
+using UAS_MES.PublicMethod;
+
+namespace UAS_MES.Make
+{
+    public partial class Make_MakeDown : Form
+    {
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        DataTable dt;
+
+        DataTable dt1;
+
+        DataTable dtbar;
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        DataHelper dh;
+
+        //页面Caller
+        string caller;
+
+        //事件号变量
+        string _macode;
+
+        //数量记录
+        int count;
+
+        //记录当前序列号ms_id
+        string ms_id;
+
+        public Make_MakeDown()
+        {
+            InitializeComponent();
+            caller = "MakeDown";
+            count = 0;
+            _macode = "";
+        }
+
+        private void Make_MakeDown_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            dh = new DataHelper();
+            sn_code.Focus();
+            make_count.Text = count.ToString();
+            string[] param = new string[] { caller,make_count.Text, _macode};
+            dh.CallProcedure("SP_GETMAXNUMBER",ref param);
+            mdcode.Text = param[2];
+        }
+
+        private void Make_MakeDown_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void sn_code_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (inputreson.Text.Trim() != "")
+                {
+                    sql.Clear();
+                    sql.Append("select max(ms_id) from makeserial where ms_sncode='"+sn_code.Text+"'");
+                    dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        ms_id = dt.Rows[0][0].ToString();
+                        //界面赋值
+                        dtbar = (DataTable)dh.ExecuteSql("select ms_makecode,pr_code,pr_detail from makeserial left join product on MS_PRODCODE=pr_code where ms_id='" + ms_id + "'", "select");
+                        BaseUtil.SetFormValue(this.Controls, dtbar);      
+                        sql.Clear();
+                        sql.Append("select ms_outboxcode, ms_downstatus,ms_prodcode from makeserial where ms_id ='"+ms_id+"' ");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                        string ms_downstatus = dt.Rows[0]["ms_downstatus"].ToString();
+                        string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
+                        if (ms_downstatus == "0")
+                        {
+                            if (ms_outboxcode == null || ms_outboxcode == "")
+                            {
+                                //进行下地操作，插入下地记录
+                                sql.Clear();
+                                sql.Append("INSERT INTO MAKEDOWN (MD_ID,MD_LINECODE,MD_SCCODE,MD_STEPCODE,");
+                                sql.Append("MD_SNCODE,MD_PRODCODE,MD_MACODE, MD_DOWNREASON, MD_CODE,");
+                                sql.Append("MD_DOWNDATE,MD_DOWNMAN,MD_STATUS) values (MAKEDOWN_seq.nextval,'" + User.UserLineCode + "','" + User.UserSourceCode + "',");
+                                sql.Append("'" + User.CurrentStepCode + "','" + sn_code.Text + "','" + pr_code.Text + "','" + ms_makecode.Text + "','"+inputreson.Text+"','" + mdcode.Text + "',sysdate,'" + User.UserCode + "','-1')");
+                                //执行
+                                dh.ExecuteSql(sql.GetString(), "insert");
+                                //更新序列号状态为下地
+                                dh.UpdateByCondition("makeserial", "ms_downstatus='-1'", "ms_id='"+ms_id+"'");
+                                OperateResult.AppendText("序列号" + sn_code.Text + "下地成功\n", Color.Green);
+                                //更新数量
+                                count++;
+                                make_count.Text = count + "";
+                                loadGrid();
+                            }
+                            else {
+                                OperateResult.AppendText("序列号" + sn_code.Text + "已装箱:"+ms_outboxcode+ ",不允许下地，如需下地请先解除装箱\n", Color.Red);
+                                sn_code.Text = "";
+                                sn_code.Focus();
+                                return;
+                            }
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("序列号"+ sn_code.Text + "目前已经是下地状态，无需重复下地\n", Color.Red);
+                            sn_code.Text = "";
+                            sn_code.Focus();
+                            return;
+                        }
+
+                    }
+                    else {
+                        ms_id = null; 
+                        OperateResult.AppendText("序列号"+ sn_code.Text + "不存在\n", Color.Red);
+                        sn_code.Text = "";
+                        sn_code.Focus();
+                    }
+                }
+                else
+                {
+                    OperateResult.AppendText("序列号"+ sn_code.Text + "未输入下地原因\n", Color.Red);
+                    sn_code.Text = "";
+                    sn_code.Focus();
+                    return;
+                }
+            }
+        }
+
+        private void loadGrid()
+        {
+            sql.Clear();
+            sql.Append("select md_macode,md_sncode,md_prodcode,pr_detail from makedown left join product on pr_code = md_prodcode where md_code = '"+mdcode.Text+"'");
+            dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt1);
+        }
+    }
+}

UAS-MES/FunctionCode/Make/Make_MakeDown.resx

@@ -0,0 +1,132 @@
+<?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="md_macode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_sncode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="md_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pr_detail.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -247,7 +247,7 @@ namespace UAS_MES.Make
                 //打印成功,记录日志commandlog , cl_operate彩盒或者机身标补打印，cl_result补打印成功
                 LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, giftBox.Checked?"彩盒标补打印":"机身标补打印", "补打印成功", inputValue.Text, "");
                 //如果ms_downstatus<>0，则更新ms_downstatus=-1 where ms_id=?id，同时插入记录至表 MAKEDOWN
-                if (mapB.Rows[0]["ms_downstatus"].ToString()!="0")
+                if (mapB.Rows[0]["ms_downstatus"].ToString()=="0")
                 {
                     dh.ExecuteSql("update makeserial set ms_downstatus='-1' where ms_id='"+ms_id+"'","update");
                     //插入数据
@@ -270,7 +270,7 @@ namespace UAS_MES.Make
                 //打印成功,记录日志commandlog , cl_operate彩盒或者机身标补打印，cl_result补打印成功
                 LogicHandler.DoCommandLog(User.UserCode, "", User.UserLineCode, User.UserSourceCode, "卡通箱标签补打印,箱号:"+ inputValue.Text, "补打印成功","", "");
                 //如果pa_downstatus<>0，则更新pa_downstatus=-1 where pa_outboxcode=?code，同时插入记录至表 MAKEDOWN
-                if (mapB.Rows[0]["pa_downstatus"].ToString()!="0") {
+                if (mapB.Rows[0]["pa_downstatus"].ToString()=="0") {
                     dh.ExecuteSql("update package set pa_downstatus='-1' where pa_outboxcode='"+ inputValue.Text+"'", "update");
                     //插入MakeDown表
                     putInfo2MakeDown();