Jelajahi Sumber

修改Web项目文件,次元标签打印修改

callm 3 minggu lalu
induk
melakukan
51887bb419

+ 2 - 2
UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckBXK.cs

@@ -256,7 +256,7 @@ namespace UAS_MES_NEW.Make
                                 dh.BatchInsert(sql.GetString(), new string[] { "LCL_LABELTYPE", "lcl_prefix", "lcl_length", "LCL_LABELVALUE" },
                                     labeltype_list.ToArray(), prefix_list.ToArray(), length_list.ToArray(), value.ToArray());
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "上料采集", "上料成功", sn_code.Text, "");
-                                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn_code.Text, int.Parse(PrintNum.Text == "" ? "1" : PrintNum.Text), ma_code.Text, ma_prodcode.Text, "售后卡", "0", out ErrorMessage))
+                                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn_code.Text, int.Parse(PrintNum.Text == "" ? "1" : PrintNum.Text), ma_code.Text, ma_prodcode.Text, "保修卡", "0", out ErrorMessage))
                                 {
                                     OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                 }
@@ -431,7 +431,7 @@ namespace UAS_MES_NEW.Make
 
         private void ma_prodcode_TextChanged(object sender, EventArgs e)
         {
-            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");
+            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");
             PrintLabel.DataSource = _dt;
             PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";

+ 2 - 2
UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckColorBox.cs

@@ -256,7 +256,7 @@ namespace UAS_MES_NEW.Make
                                 dh.BatchInsert(sql.GetString(), new string[] { "LCL_LABELTYPE", "lcl_prefix", "lcl_length", "LCL_LABELVALUE" },
                                     labeltype_list.ToArray(), prefix_list.ToArray(), length_list.ToArray(), value.ToArray());
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "上料采集", "上料成功", sn_code.Text, "");
-                                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn_code.Text, int.Parse(PrintNum.Text == "" ? "1" : PrintNum.Text), ma_code.Text, ma_prodcode.Text, "售后卡", "0", out ErrorMessage))
+                                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn_code.Text, int.Parse(PrintNum.Text == "" ? "1" : PrintNum.Text), ma_code.Text, ma_prodcode.Text, "彩盒标", "0", out ErrorMessage))
                                 {
                                     OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                 }
@@ -431,7 +431,7 @@ namespace UAS_MES_NEW.Make
 
         private void ma_prodcode_TextChanged(object sender, EventArgs e)
         {
-            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");
+            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");
             PrintLabel.DataSource = _dt;
             PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";

+ 2 - 2
UAS_MES_YDCY/FunctionCode/Make/Make_SNLabelCheckMidBox.cs

@@ -256,7 +256,7 @@ namespace UAS_MES_NEW.Make
                                 dh.BatchInsert(sql.GetString(), new string[] { "LCL_LABELTYPE", "lcl_prefix", "lcl_length", "LCL_LABELVALUE" },
                                     labeltype_list.ToArray(), prefix_list.ToArray(), length_list.ToArray(), value.ToArray());
                                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "上料采集", "上料成功", sn_code.Text, "");
-                                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn_code.Text, int.Parse(PrintNum.Text == "" ? "1" : PrintNum.Text), ma_code.Text, ma_prodcode.Text, "售后卡", "0", out ErrorMessage))
+                                if (!Print.BarTender(Tag.ToString(), ref engine, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sn_code.Text, int.Parse(PrintNum.Text == "" ? "1" : PrintNum.Text), ma_code.Text, ma_prodcode.Text, "中箱标", "0", out ErrorMessage))
                                 {
                                     OperateResult.AppendText(ErrorMessage + "\n", Color.Red);
                                 }
@@ -431,7 +431,7 @@ namespace UAS_MES_NEW.Make
 
         private void ma_prodcode_TextChanged(object sender, EventArgs e)
         {
-            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");
+            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");
             PrintLabel.DataSource = _dt;
             PrintLabel.DisplayMember = "la_url";
             PrintLabel.ValueMember = "la_id";

+ 519 - 0
UAS_MES_YDCY/FunctionCode/Packing/Packing_ProdWeightSetMidBox.Designer.cs

@@ -0,0 +1,519 @@
+namespace UAS_MES_NEW.Packing
+{
+    partial class Packing_ProdWeightSetMidBox
+    {
+        /// <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(Packing_ProdWeightSetMidBox));
+            this.ms_makecode_label = new System.Windows.Forms.Label();
+            this.pr_code = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.pr_detail = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.pr_spec = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.showResult = new System.Windows.Forms.ListView();
+            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.errorValue = new System.Windows.Forms.TextBox();
+            this.standardWeight = new System.Windows.Forms.TextBox();
+            this.confirm = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.label7 = new System.Windows.Forms.Label();
+            this.unit = new System.Windows.Forms.Label();
+            this.label6 = new System.Windows.Forms.Label();
+            this.pr_cartonunit = new System.Windows.Forms.Label();
+            this.label22 = new System.Windows.Forms.Label();
+            this.weight = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.sncode = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.ComList = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
+            this.BaudRate = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.NumOnlyTextBox();
+            this.stopWeigh = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.startWeigh = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.panel4.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // ms_makecode_label
+            // 
+            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(44, 24);
+            this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ms_makecode_label.Name = "ms_makecode_label";
+            this.ms_makecode_label.Size = new System.Drawing.Size(114, 41);
+            this.ms_makecode_label.TabIndex = 212;
+            this.ms_makecode_label.Text = "工单号";
+            // 
+            // pr_code
+            // 
+            this.pr_code.AutoSize = true;
+            this.pr_code.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.pr_code.Location = new System.Drawing.Point(193, 99);
+            this.pr_code.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_code.Name = "pr_code";
+            this.pr_code.Size = new System.Drawing.Size(0, 41);
+            this.pr_code.TabIndex = 215;
+            this.pr_code.TextChanged += new System.EventHandler(this.pr_code_TextChanged);
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label2.Location = new System.Drawing.Point(44, 99);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(146, 41);
+            this.label2.TabIndex = 214;
+            this.label2.Text = "产品编号";
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.AutoSize = true;
+            this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.pr_detail.Location = new System.Drawing.Point(193, 171);
+            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, 41);
+            this.pr_detail.TabIndex = 217;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label3.Location = new System.Drawing.Point(44, 171);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(146, 41);
+            this.label3.TabIndex = 216;
+            this.label3.Text = "产品名称";
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.AutoSize = true;
+            this.pr_spec.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.pr_spec.Location = new System.Drawing.Point(193, 243);
+            this.pr_spec.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.pr_spec.MaximumSize = new System.Drawing.Size(733, 80);
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Size = new System.Drawing.Size(0, 41);
+            this.pr_spec.TabIndex = 219;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label5.Location = new System.Drawing.Point(44, 243);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(82, 41);
+            this.label5.TabIndex = 218;
+            this.label5.Text = "规格";
+            // 
+            // showResult
+            // 
+            this.showResult.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2,
+            this.columnHeader3,
+            this.columnHeader4,
+            this.columnHeader5});
+            this.showResult.Font = new System.Drawing.Font("宋体", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.showResult.HideSelection = false;
+            this.showResult.Location = new System.Drawing.Point(571, 333);
+            this.showResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.showResult.Name = "showResult";
+            this.showResult.Size = new System.Drawing.Size(876, 408);
+            this.showResult.TabIndex = 220;
+            this.showResult.UseCompatibleStateImageBehavior = false;
+            this.showResult.View = System.Windows.Forms.View.Details;
+            // 
+            // columnHeader1
+            // 
+            this.columnHeader1.Text = "";
+            this.columnHeader1.Width = 5;
+            // 
+            // columnHeader2
+            // 
+            this.columnHeader2.Text = "序号";
+            this.columnHeader2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.columnHeader2.Width = 110;
+            // 
+            // columnHeader3
+            // 
+            this.columnHeader3.Text = "序列号";
+            this.columnHeader3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.columnHeader3.Width = 200;
+            // 
+            // columnHeader4
+            // 
+            this.columnHeader4.Text = "重量(单位)";
+            this.columnHeader4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.columnHeader4.Width = 160;
+            // 
+            // columnHeader5
+            // 
+            this.columnHeader5.Text = "时间";
+            this.columnHeader5.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+            this.columnHeader5.Width = 170;
+            // 
+            // panel4
+            // 
+            this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel4.Controls.Add(this.errorValue);
+            this.panel4.Controls.Add(this.standardWeight);
+            this.panel4.Controls.Add(this.confirm);
+            this.panel4.Controls.Add(this.label7);
+            this.panel4.Controls.Add(this.unit);
+            this.panel4.Controls.Add(this.label6);
+            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(760, 24);
+            this.panel4.Margin = new System.Windows.Forms.Padding(5, 3, 5, 3);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(686, 207);
+            this.panel4.TabIndex = 221;
+            // 
+            // errorValue
+            // 
+            this.errorValue.Location = new System.Drawing.Point(327, 25);
+            this.errorValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.errorValue.Name = "errorValue";
+            this.errorValue.Size = new System.Drawing.Size(132, 35);
+            this.errorValue.TabIndex = 52;
+            this.errorValue.Enter += new System.EventHandler(this.standardWeight_Enter);
+            this.errorValue.Leave += new System.EventHandler(this.standardWeight_Leave);
+            // 
+            // standardWeight
+            // 
+            this.standardWeight.Location = new System.Drawing.Point(111, 25);
+            this.standardWeight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.standardWeight.Name = "standardWeight";
+            this.standardWeight.Size = new System.Drawing.Size(132, 35);
+            this.standardWeight.TabIndex = 51;
+            this.standardWeight.Enter += new System.EventHandler(this.standardWeight_Enter);
+            this.standardWeight.Leave += new System.EventHandler(this.standardWeight_Leave);
+            // 
+            // confirm
+            // 
+            this.confirm.AllPower = null;
+            this.confirm.BackColor = System.Drawing.Color.Transparent;
+            this.confirm.DownImage = ((System.Drawing.Image)(resources.GetObject("confirm.DownImage")));
+            this.confirm.Image = null;
+            this.confirm.IsShowBorder = true;
+            this.confirm.Location = new System.Drawing.Point(493, 115);
+            this.confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("confirm.MoveImage")));
+            this.confirm.Name = "confirm";
+            this.confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("confirm.NormalImage")));
+            this.confirm.Power = null;
+            this.confirm.Size = new System.Drawing.Size(100, 37);
+            this.confirm.TabIndex = 227;
+            this.confirm.Text = "保存";
+            this.confirm.UseVisualStyleBackColor = false;
+            this.confirm.Click += new System.EventHandler(this.confirm_Click);
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(24, 29);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(69, 35);
+            this.label7.TabIndex = 50;
+            this.label7.Text = "标准";
+            // 
+            // unit
+            // 
+            this.unit.AutoSize = true;
+            this.unit.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.unit.Location = new System.Drawing.Point(495, 29);
+            this.unit.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.unit.Name = "unit";
+            this.unit.Size = new System.Drawing.Size(47, 35);
+            this.unit.TabIndex = 47;
+            this.unit.Text = "kg";
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(269, 29);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(34, 24);
+            this.label6.TabIndex = 44;
+            this.label6.Text = "±";
+            // 
+            // pr_cartonunit
+            // 
+            this.pr_cartonunit.AutoSize = true;
+            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(603, 115);
+            this.pr_cartonunit.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.pr_cartonunit.Name = "pr_cartonunit";
+            this.pr_cartonunit.Size = new System.Drawing.Size(60, 50);
+            this.pr_cartonunit.TabIndex = 42;
+            this.pr_cartonunit.Text = "克";
+            this.pr_cartonunit.Visible = false;
+            // 
+            // label22
+            // 
+            this.label22.AutoSize = true;
+            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(19, 115);
+            this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label22.Name = "label22";
+            this.label22.Size = new System.Drawing.Size(98, 50);
+            this.label22.TabIndex = 20;
+            this.label22.Text = "重量";
+            // 
+            // weight
+            // 
+            this.weight.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            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(197, 99);
+            this.weight.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.weight.Name = "weight";
+            this.weight.Size = new System.Drawing.Size(0, 78);
+            this.weight.TabIndex = 41;
+            // 
+            // label1
+            // 
+            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(20, 701);
+            this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(114, 41);
+            this.label1.TabIndex = 229;
+            this.label1.Text = "序列号";
+            // 
+            // sncode
+            // 
+            this.sncode.AllPower = null;
+            this.sncode.BackColor = System.Drawing.Color.White;
+            this.sncode.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.sncode.ID = null;
+            this.sncode.Location = new System.Drawing.Point(147, 701);
+            this.sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sncode.Name = "sncode";
+            this.sncode.Power = null;
+            this.sncode.Size = new System.Drawing.Size(248, 39);
+            this.sncode.Str = null;
+            this.sncode.Str1 = null;
+            this.sncode.Str2 = null;
+            this.sncode.TabIndex = 228;
+            this.sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sncode_KeyDown);
+            // 
+            // 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(28, 331);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(441, 337);
+            this.OperateResult.TabIndex = 226;
+            this.OperateResult.Text = "";
+            // 
+            // ComList
+            // 
+            this.ComList.AutoSize = true;
+            this.ComList.CutLength = null;
+            this.ComList.Location = new System.Drawing.Point(1272, 304);
+            this.ComList.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+            this.ComList.MaximumSize = new System.Drawing.Size(300, 0);
+            this.ComList.Name = "ComList";
+            this.ComList.Size = new System.Drawing.Size(94, 24);
+            this.ComList.TabIndex = 225;
+            this.ComList.Text = "ComList";
+            this.ComList.Visible = false;
+            // 
+            // BaudRate
+            // 
+            this.BaudRate.AllPower = null;
+            this.BaudRate.BackColor = System.Drawing.Color.White;
+            this.BaudRate.ID = null;
+            this.BaudRate.Location = new System.Drawing.Point(1283, 259);
+            this.BaudRate.Margin = new System.Windows.Forms.Padding(5, 3, 5, 3);
+            this.BaudRate.Name = "BaudRate";
+            this.BaudRate.Negative = false;
+            this.BaudRate.Power = null;
+            this.BaudRate.Size = new System.Drawing.Size(65, 35);
+            this.BaudRate.Str = null;
+            this.BaudRate.Str1 = null;
+            this.BaudRate.Str2 = null;
+            this.BaudRate.TabIndex = 224;
+            this.BaudRate.Text = "9600";
+            this.BaudRate.Visible = false;
+            // 
+            // stopWeigh
+            // 
+            this.stopWeigh.AllPower = null;
+            this.stopWeigh.BackColor = System.Drawing.Color.Transparent;
+            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(1077, 251);
+            this.stopWeigh.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            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(144, 51);
+            this.stopWeigh.TabIndex = 223;
+            this.stopWeigh.Text = "停止称重";
+            this.stopWeigh.UseVisualStyleBackColor = false;
+            this.stopWeigh.Click += new System.EventHandler(this.stopWeigh_Click);
+            // 
+            // startWeigh
+            // 
+            this.startWeigh.AllPower = null;
+            this.startWeigh.BackColor = System.Drawing.Color.Transparent;
+            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(872, 251);
+            this.startWeigh.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            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(124, 51);
+            this.startWeigh.TabIndex = 222;
+            this.startWeigh.Text = "开始称重";
+            this.startWeigh.UseVisualStyleBackColor = false;
+            this.startWeigh.Click += new System.EventHandler(this.startWeigh_Click);
+            // 
+            // ma_code
+            // 
+            this.ma_code.AllPower = "IFALL";
+            this.ma_code.Caller = null;
+            this.ma_code.Condition = null;
+            this.ma_code.DBTitle = "";
+            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.ma_code.FormName = null;
+            this.ma_code.Location = new System.Drawing.Point(201, 24);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Power = "";
+            this.ma_code.ReturnData = null;
+            this.ma_code.SelectField = null;
+            this.ma_code.SetValueField = null;
+            this.ma_code.Size = new System.Drawing.Size(283, 45);
+            this.ma_code.TabIndex = 213;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "makecode";
+            this.ma_code.TextBoxEnable = true;
+            this.ma_code.UserControlTextChanged += new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ma_code_UserControlTextChanged);
+            // 
+            // Packing_ProdWeightSetMidBox
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1493, 795);
+            this.Controls.Add(this.label1);
+            this.Controls.Add(this.sncode);
+            this.Controls.Add(this.OperateResult);
+            this.Controls.Add(this.ComList);
+            this.Controls.Add(this.BaudRate);
+            this.Controls.Add(this.stopWeigh);
+            this.Controls.Add(this.startWeigh);
+            this.Controls.Add(this.panel4);
+            this.Controls.Add(this.showResult);
+            this.Controls.Add(this.pr_spec);
+            this.Controls.Add(this.label5);
+            this.Controls.Add(this.pr_detail);
+            this.Controls.Add(this.label3);
+            this.Controls.Add(this.pr_code);
+            this.Controls.Add(this.label2);
+            this.Controls.Add(this.ma_code);
+            this.Controls.Add(this.ms_makecode_label);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Name = "Packing_ProdWeightSetMidBox";
+            this.Tag = "Packing!ProdWeightSet";
+            this.Text = "Packing_ProdWeightSet";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Packing_ProdWeightSet_FormClosing);
+            this.Load += new System.EventHandler(this.Packing_ProdWeightSet_Load);
+            this.SizeChanged += new System.EventHandler(this.Packing_ProdWeightSet_SizeChanged);
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
+        private System.Windows.Forms.Label ms_makecode_label;
+        private System.Windows.Forms.Label pr_code;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label pr_detail;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label pr_spec;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.ListView showResult;
+        private System.Windows.Forms.ColumnHeader columnHeader1;
+        private System.Windows.Forms.ColumnHeader columnHeader2;
+        private System.Windows.Forms.ColumnHeader columnHeader3;
+        private System.Windows.Forms.ColumnHeader columnHeader4;
+        private System.Windows.Forms.ColumnHeader columnHeader5;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Label pr_cartonunit;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.Label weight;
+        private CustomControl.ValueLabel.ValueLabel ComList;
+        private CustomControl.TextBoxWithIcon.NumOnlyTextBox BaudRate;
+        private CustomControl.ButtonUtil.NormalButton stopWeigh;
+        private CustomControl.ButtonUtil.NormalButton startWeigh;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private CustomControl.ButtonUtil.NormalButton confirm;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox sncode;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label unit;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox errorValue;
+        private System.Windows.Forms.TextBox standardWeight;
+    }
+}

+ 382 - 0
UAS_MES_YDCY/FunctionCode/Packing/Packing_ProdWeightSetMidBox.cs

@@ -0,0 +1,382 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.IO.Ports;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Windows.Forms;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Packing
+{
+    public partial class Packing_ProdWeightSetMidBox : Form
+    {
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        LogStringBuilder sql = new LogStringBuilder();
+
+        DataTable Dbfind;//存储工单号查询出来的信息
+
+        //创建串口实例
+        SerialPort serialPort1 = new SerialPort();
+
+        Regex re = new Regex("\\d+.\\d+\\w+");
+
+        DataHelper dh;
+
+        Thread thread;
+
+        //true的时候表示从串口读取数据
+        bool GetData = true;
+
+        int samplesCount = 0;
+
+        //string maxValue = "";//存储最大值
+
+        //string minValue = "";//存储最小值
+
+        List<string> sncodes = new List<string>();//存序列号
+        List<string> indates = new List<string>();//存时间
+        List<string> weights = new List<string>();//存重量
+
+        string recordSW = ""; //存标准重量
+        string recordEV = "";//存误差值
+        public Packing_ProdWeightSetMidBox()
+        {
+            InitializeComponent();
+        }
+
+        private void Packing_ProdWeightSet_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            ComList.Text = BaseUtil.GetCacheData("PortName").ToString();
+            BaudRate.Text = BaseUtil.GetCacheData("BaudRate").ToString();
+            //工单号放大镜配置
+            ma_code.TableName = "make left join product on ma_prodcode=pr_code";
+            ma_code.SelectField = "ma_code # 工单号,pr_code # 产品编号,pr_detail # 产品名称,pr_spec # 规格,ma_qty # 工单数量";
+            ma_code.FormName = Name;
+            ma_code.SetValueField = new string[] { "ma_code","pr_code","pr_detail","pr_spec" };
+            ma_code.DbChange += Ma_code_DbChange;
+
+            dh = SystemInf.dh;
+            //开始称重
+            startWeigh.PerformClick();
+        }
+        private void Ma_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = ma_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+            //取误差值
+            errorValue.Text = dh.GetConfig("prodWeightErrorValue", "MESSetting").ToString();
+        }
+        private void recordResult(int index,string palletcode, string weigh, DateTime time)
+        {
+            //创建一个item
+            ListViewItem lvi = new ListViewItem();
+            //分条赋值
+            lvi.SubItems.Add(index+"");
+            lvi.SubItems.Add(palletcode);
+            lvi.SubItems.Add(weigh);
+            lvi.SubItems.Add(time.ToString());
+            //添加结果的信息进去
+            showResult.Items.Add(lvi);
+            //更新已称重量最大值最小值
+            if (index > 1)
+            {
+                //maxValue = double.Parse(weigh) > double.Parse(maxValue) ? weigh : maxValue;
+                //minValue = double.Parse(weigh) < double.Parse(minValue) ? weigh : minValue;
+            }
+            else
+            {
+                //maxValue = weigh;
+                //minValue = weigh;
+                //每次添加第一条数据的时候清空list的值
+                sncodes.Clear();
+                indates.Clear();
+                weights.Clear();
+            }
+            //将重量信息加到集合中
+            sncodes.Add(palletcode);
+            indates.Add(time.ToString("yyyy-MM-dd HH:mm:ss"));
+            weights.Add(weigh.Replace("kg", "").Trim());
+        }
+
+        private void startWeigh_Click(object sender, EventArgs e)
+        {
+            thread = new Thread(getSerialData);
+            try
+            {
+                GetData = true;
+                serialPort1.PortName = this.ComList.Text;
+                serialPort1.BaudRate = int.Parse(BaudRate.Text);
+                serialPort1.Open();
+                thread.Start();
+            }
+            catch (Exception mes)
+            {
+                if (BaudRate.Text == "" || ComList.Text == "")
+                    OperateResult.AppendText(">>请先在电子秤调试界面维护波特率和串口\n", Color.Red);
+                else
+                    OperateResult.AppendText(">>" + mes.Message + "\n", Color.Red);
+            }
+        }
+        private void getSerialData()
+        {
+            if (serialPort1.IsOpen)
+            {
+                if (!SystemInf.OpenPort.Contains(serialPort1.PortName))
+                {
+                    SystemInf.OpenPort.Add(serialPort1.PortName);
+                    try
+                    {
+                        while (GetData)
+                        {
+                            try
+                            {
+                                weight.Text = re.Match(serialPort1.ReadLine().Trim()).Groups[0].Value;
+                                //weight.Text = Regex.Replace(serialPort1.ReadLine(), "\\D+", "");
+                            }
+                            catch (Exception)
+                            {
+                                GetData = false;
+                            }
+                        }
+                    }
+                    catch (IOException ex) { MessageBox.Show(ex.Message); }
+                }
+                else
+                    MessageBox.Show("端口已被占用,请关闭其他窗口");
+            }
+        }
+        //停止称重
+        private void stopWeigh_Click(object sender, EventArgs e)
+        {
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Abort();
+            }
+        }
+
+        private void confirm_Click(object sender, EventArgs e)
+        {
+            //按确认更新产品重量
+            if (ma_code.Text=="")
+            {
+                OperateResult.AppendText("<<请先选择工单\n", Color.Red);
+                return;
+            }
+            //判断是否达到已称数量
+            if (showResult.Items.Count<samplesCount)
+            {
+                OperateResult.AppendText("<<采样个数不足\n", Color.Red);
+                return;
+            }
+            //double sum = 0;
+            ////点击取平均值
+            //foreach (string s in weights)
+            //{
+            //    sum += double.Parse(s);
+            //}
+            //sum = sum / weights.Count;
+            //更新彩盒重量最大值最小值
+            dh.ExecuteSql("update product set pr_midboxmaxweight ='" + (double.Parse(standardWeight.Text) + double.Parse(errorValue.Text)) + "', pr_midboxminweight = '" + (double.Parse(standardWeight.Text) - double.Parse(errorValue.Text)) + "' where pr_code='" + pr_code.Text + "'", "update");
+            //更新此产品需要检测彩盒重量
+            //dh.ExecuteSql("update product set pr_checkcolorboxw = 1 where pr_code='" + pr_code.Text + "'", "update");
+            OperateResult.AppendText("<<重量设置成功,最大值" + (double.Parse(standardWeight.Text) + double.Parse(errorValue.Text)) +unit.Text+ ",最小值" + (double.Parse(standardWeight.Text) - double.Parse(errorValue.Text)) + unit.Text+"\n", Color.Green);
+            LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,"",User.UserLineCode,User.UserSourceCode,"产品重量设置","产品编号"+pr_code.Text+",最大"+ (double.Parse(standardWeight.Text) + double.Parse(errorValue.Text))+unit.Text+"最小"+ (double.Parse(standardWeight.Text) - double.Parse(errorValue.Text))+unit.Text,"","");
+            //更新采样记录表
+            string serialNum = dh.GetSerialNumberByCaller("ProdWeightSample");
+            sql.Clear();
+            sql.Append("insert into PRODWEIGHTSAMPLE(PWS_CODE,PWS_SNCODE,PWS_MAKECODE,PWS_PRODCODE,PWS_INDATE,PWS_WEIGHT,PWS_UNIT) ");
+            sql.Append("values ('"+serialNum+"',:sncode,'"+ma_code.Text+"','"+pr_code.Text+ "',TO_Date(:indate,'YYYY-MM-dd HH24:mi:ss'),:weight,'" + unit.Text+"')");
+            dh.BatchInsert(sql.GetString(), new string[] { "sncode", "indate" , "weight" },sncodes.ToArray(),indates.ToArray(),weights.ToArray());
+        }
+
+        private void sncode_KeyDown(object sender, KeyEventArgs e)
+        {
+            //按下了enter键
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (sncode.Text == "")
+                {
+                    OperateResult.AppendText("<<输入不能为空\n", Color.Red);
+                    return;
+                }
+                if (weight.Text == "")
+                {
+                    OperateResult.AppendText("<<未读取到重量信息\n", Color.Red);
+                    return;
+                }
+                if (double.Parse(weight.Text.Replace("kg", "").Trim()) == 0)
+                {
+                    OperateResult.AppendText("<<重量不能等于0\n", Color.Red, sncode);
+                    return;
+                }
+                //验证序列号是否存在
+                if (!dh.CheckExist("makeserial", "ms_sncode = '" + sncode.Text + "'"))
+                {
+                    OperateResult.AppendText("<<序列号" + sncode.Text + "不存在\n", Color.Red, sncode);
+                    return;
+                }
+                //验证彩盒是否与产品对应
+                if (!dh.CheckExist("makeserial","ms_prodcode='"+pr_code.Text+"' and ms_sncode = '"+sncode.Text+"'"))
+                {
+                    OperateResult.AppendText("<<序列号"+sncode.Text+"对应产品编号不是"+pr_code.Text+"\n", Color.Red, sncode);
+                    return;
+                }
+                //验证所称彩盒是否重复
+                if (sncodes.Contains(sncode.Text))
+                {
+                    OperateResult.AppendText("<<序列号" + sncode.Text + "已经称过\n", Color.Red, sncode);
+                    return;
+                }
+                //判断称重记录是否满足标准重量+-误差值
+                double ActualWeight = double.Parse(weight.Text == "" ? "0" : weight.Text.Replace("kg", "").Trim());
+                if (ActualWeight < (double.Parse(standardWeight.Text)- double.Parse(errorValue.Text))|| ActualWeight > (double.Parse(standardWeight.Text) + double.Parse(errorValue.Text)))
+                {
+                    OperateResult.AppendText("<<序列号" + sncode.Text + "重量不在预设范围内\n", Color.Red, sncode);
+                    return;
+                }
+                //记录重量
+                recordResult(showResult.Items.Count+1,sncode.Text, weight.Text, System.DateTime.Now);
+                sncode.Text = "";
+            }
+        }
+
+        private void Packing_ProdWeightSet_AutoSizeChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void Packing_ProdWeightSet_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        private void ma_code_UserControlTextChanged(object sender, EventArgs e)
+        {
+            //赋值
+            sql.Clear();
+            sql.Append("select ma_code,pr_code,pr_detail,pr_spec,ma_qty from make left join product on ma_prodcode=pr_code ");
+            sql.Append("where ma_code='" + ma_code.Text + "'");
+            Dbfind = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (Dbfind.Rows.Count == 0)
+            {
+                return;
+            }
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+            //清空称量记录
+            showResult.Items.Clear();
+            indates.Clear();
+            sncodes.Clear();
+            weights.Clear();
+        }
+
+        private void ma_code_TextKeyDown(object sender, KeyEventArgs e)
+        {
+
+        }
+
+        private void Packing_ProdWeightSet_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            stopWeigh.PerformClick();
+            if (serialPort1.IsOpen)
+            {
+                GetData = false;
+                serialPort1.Close();
+                SystemInf.OpenPort.Remove(serialPort1.PortName);
+                thread.Interrupt();
+            }
+            //thread.Abort();
+        }
+
+        private void standardWeight_Leave(object sender, EventArgs e)
+        {
+            //在采样的时候不能更改
+            if (showResult.Items.Count > 0)
+            {
+                if ((sender as TextBox).Name == "standardWeight"&& standardWeight.Text == recordSW)
+                {
+                    return;
+                }
+                else if((sender as TextBox).Name == "errorValue" && errorValue.Text == recordEV)
+                {
+                    return;
+                }
+                if (MessageBox.Show("是否修改标准重量或误差值重新采样", "提示", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+                {
+                    //选择取消,数据回退
+                    standardWeight.Text = recordSW;
+                    errorValue.Text = recordEV;
+                }
+                else
+                {
+                    //选择确认,重新采样
+                    showResult.Items.Clear();
+                    indates.Clear();
+                    sncodes.Clear();
+                    weights.Clear();
+                }
+            }
+        }
+
+        private void standardWeight_Enter(object sender, EventArgs e)
+        {
+            recordSW = standardWeight.Text;
+            recordEV = errorValue.Text;
+        }
+
+        private void pr_code_TextChanged(object sender, EventArgs e)
+        {
+            //产品更换的时候
+            DataTable d = (DataTable)dh.ExecuteSql("select pr_midboxmaxweight,pr_midboxminweight,PR_COLORBOXUNIT from product where pr_code='" + pr_code.Text + "'", "select");
+            //给标准重量赋值
+            if (d.Rows[0]["pr_midboxmaxweight"].ToString() == "" || d.Rows[0]["pr_midboxminweight"].ToString() == "")
+            {
+                standardWeight.Text = 0 + "";
+            }
+            else
+            {
+                //取二者平均值来
+                standardWeight.Text = (double.Parse(d.Rows[0]["pr_midboxmaxweight"].ToString()) + double.Parse(d.Rows[0]["pr_midboxminweight"].ToString())) / 2 + "";
+            }
+            if (d.Rows[0]["PR_COLORBOXUNIT"].ToString() != "")
+            {
+                unit.Text = d.Rows[0]["PR_COLORBOXUNIT"].ToString();
+            }
+            else
+            {
+                unit.Text = "kg";
+            }
+            //取误差值
+            errorValue.Text = dh.GetConfig("prodWeightErrorValue", "MESSetting").ToString();
+            //查询重量设置采样个数
+            try
+            {
+                samplesCount = int.Parse(dh.GetConfig("prodWeightSetting", "MESSetting").ToString());
+            }
+            catch (Exception ess)
+            {
+                //如果没维护的话默认是10
+                samplesCount = 10;
+            }
+            OperateResult.AppendText("<<重量设置需采样个数为" + samplesCount + "\n", Color.Black);
+            //清空称量记录
+            showResult.Items.Clear();
+            indates.Clear();
+            sncodes.Clear();
+            weights.Clear();
+        }
+    }
+}

+ 235 - 0
UAS_MES_YDCY/FunctionCode/Packing/Packing_ProdWeightSetMidBox.resx

@@ -0,0 +1,235 @@
+<?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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="confirm.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="confirm.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="confirm.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="stopWeigh.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="stopWeigh.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="stopWeigh.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="startWeigh.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFfSURBVFhH5dhNTsJgFIXhM2WiCxL2oAEHrJKhQSYM
+        JIgzjSLIX0sRKPSPtl+Lo2uOgVbWcJu8CzhP8nVwISIAUAFwA+AWQFNh3M39lZMHrgDUu91uyxjji8KP
+        u7mfDgCuiVLt958fkjSTie3I62iqLu7m/sHgpQ2gRpSG6/nmc2bL23imtuHMkp0f5ADuidIMoljev+bq
+        o8PpH4NmcIjlY7JQHx0KlPCQyHBqqY8OJUqcyGhuq48OBUoUJzJeLNVHhwLlkKQysRz10eECZbpcqe8C
+        JU6NzJ1v9dGhQElSI9Zqoz46lCgmE3u9VR8dCpTUZOJsXPXRoUTJclltd+qjQ4FislzW7l59dChR8lw2
+        e099dDijNA5xYnZBKFvPVxv3x0lanA5qT71eOzsexQsjcf1AXdzN/XQ4H5l4fqs/djqtIIzC/Pgj2uJu
+        7i/Okf8O11UAd6c3pS3u5v6/w/UvTaFspAxAMh4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="startWeigh.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAF3SURBVFhH5djbSgJRFMbxHsP7wBfYT7jvu46QDIoI
+        C4QNQRAIgVBRSdpxpgZN83wYx5nZOjNqrvgEd73DGvhfzdX3g32ztohoS0iVElLtCakehVQdhmE39qfg
+        AZBtIdX70Y0TjsJ4SQw/7MZ+OAip0kDJnD3UdJAsyXIjKvWm7MJu7M+X6lpIlQWK3ZhEq8pgRvfdKdvK
+        /Rk1/XglpHKA0ulPF3Tb0eyDAzzWKL3pgq7bmn1wMChdPadiK2QfHAxKW8/pqhmwDw4GpRXOqdAI2AcH
+        g9IME7qs++yDg0H5DhK6qE3YBweD0vATOq967IODQfnyE1KOxz44GJTaJKb855h9cDAoVS+mU9tlHxwM
+        iuPFdGK57IPDH8o4ouO3EfvgYFA+xhEdvg7ZB4cNil3uhquc5dLBy5Bt2P/U0+Z0kN0tOhqHlpzt0v7z
+        gF3Yjf1w2ByZ0jjD7RSs8K7l/+Ant7Ab+8058t/hOiOkquBNMQy7sX99uP4F5D4U8hdr4uMAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="startWeigh.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGpSURBVFhH5dg/ayJBGMfxB4YFXTARBAvBQhAsBEEQ
+        ZLnNzFu4I6aYV5kyF9tgbad1jrsYY9T4Z3fcnV2f45e38Sx8q6l+n2IWhpiZjDFVY8wPY8xPY4wVGHZj
+        fxUepLW+0Vrfz+fzR+fclgV+2I39cNBa31Icx/FisXi6XpnL8io27F8ul89xHN9RFEWTPM+ToihZet57
+        F0XRA43HYwsp7wvxwQEeNBqNbFmWnOW5+OAADxoOh7YoS3ZZJj44wIMGg4H1RcGpu4gPDvCgfr9vvfd8
+        TlPxwQEe1Ov1bO49H8+J+OAAD+p2uxaXzNfpJD44wIM6nY69ZDnvDkfxwQEe1G637SXLeLs/iA8O8KBW
+        q2XdJePNbi8+OMCDms2mxe9o/bkTHxzgQY1GwybO8WrzKT44wIPq9bpNUsdv64344AAPqtVq9pw6/vv+
+        IT44wIPCMJzsvg7Jv/UH/1m9iw3794ejC8PwgSqVyt3LbPZ8SpLvg9e3lbiwG/vhAA8KguA2CIL739Pp
+        42a73eNQWtiN/XCAB+GhVilVVUrFSqlfSikrMOzG/u+H6/+yQ4jdXN8e9AAAAABJRU5ErkJggg==
+</value>
+  </data>
+</root>

+ 9 - 0
UAS_MES_YDCY/UAS_MES_YDCY.csproj

@@ -1060,6 +1060,12 @@
     <Compile Include="FunctionCode\Packing\Packing_CartonTransfer.Designer.cs">
       <DependentUpon>Packing_CartonTransfer.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Packing\Packing_ProdWeightSetMidBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Packing\Packing_ProdWeightSetMidBox.Designer.cs">
+      <DependentUpon>Packing_ProdWeightSetMidBox.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Packing\Packing_ProdWeightSet.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1857,6 +1863,9 @@
     <EmbeddedResource Include="FunctionCode\Packing\Packing_CartonTransfer.resx">
       <DependentUpon>Packing_CartonTransfer.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Packing\Packing_ProdWeightSetMidBox.resx">
+      <DependentUpon>Packing_ProdWeightSetMidBox.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Packing\Packing_ProdWeightSet.resx">
       <DependentUpon>Packing_ProdWeightSet.cs</DependentUpon>
     </EmbeddedResource>

+ 2 - 2
UAS_Web/Browser.cs

@@ -25,8 +25,8 @@ namespace UAS_Web
             InitializeComponent();
             Text = "";
 
-            string path = "http://erp.cosuntech.cn:8099/ERP/vendbarcode/relogin.action";
-            //string path = "http://192.168.15.16:8888/ERP/vendbarcode/loginSuc.action";
+            string path = "http://119.145.34.88:8099/mes/vendbarcode/relogin.action";
+           // string path = "http://113.108.109.210:8099/ERP/vendbarcode/loginSuc.action";
             //string path = "http://stwecig.vicp.io:8099/ERP/vendbarcode/relogin.action";
             this.SetStyle(ControlStyles.UserPaint|ControlStyles.OptimizedDoubleBuffer | ControlStyles.AllPaintingInWmPaint, true);
             webBrowser = new ChromiumWebBrowser(path)

+ 2 - 2
UAS_Web/UAS_Web.csproj

@@ -55,7 +55,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -75,7 +75,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <DebugType>full</DebugType>