Merge repos.ubtob.net:usoft/mes-client

UAS_MES_YTDZ/FunctionCode/Make/Make_BodyTest.Designer.cs

@@ -0,0 +1,307 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_BodyTest
+    {
+        /// <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.components = new System.ComponentModel.Container();
+            this.MsgBox = new System.Windows.Forms.TableLayoutPanel();
+            this.TopBox = new System.Windows.Forms.Panel();
+            this.ketVal = new System.Windows.Forms.TextBox();
+            this.ketLab = new System.Windows.Forms.Label();
+            this.claerBtn = new System.Windows.Forms.Button();
+            this.onStart = new System.Windows.Forms.Button();
+            this.IpPortUrlVal = new System.Windows.Forms.TextBox();
+            this.IpPortUrlLab = new System.Windows.Forms.Label();
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.Msg1 = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.workTimeVal1 = new System.Windows.Forms.DateTimePicker();
+            this.workTimeLab1 = new System.Windows.Forms.Label();
+            this.workTimeVal2 = new System.Windows.Forms.DateTimePicker();
+            this.workTimeLab2 = new System.Windows.Forms.Label();
+            this.workTimeVal4 = new System.Windows.Forms.DateTimePicker();
+            this.workTimeLab4 = new System.Windows.Forms.Label();
+            this.workTimeVal3 = new System.Windows.Forms.DateTimePicker();
+            this.workTimeLab3 = new System.Windows.Forms.Label();
+            this.MsgBox.SuspendLayout();
+            this.TopBox.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // MsgBox
+            // 
+            this.MsgBox.ColumnCount = 2;
+            this.MsgBox.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.MsgBox.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.MsgBox.Controls.Add(this.Msg1, 1, 0);
+            this.MsgBox.Controls.Add(this.TopBox, 0, 0);
+            this.MsgBox.Dock = System.Windows.Forms.DockStyle.Top;
+            this.MsgBox.Location = new System.Drawing.Point(0, 0);
+            this.MsgBox.Name = "MsgBox";
+            this.MsgBox.RowCount = 1;
+            this.MsgBox.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.MsgBox.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.MsgBox.Size = new System.Drawing.Size(1280, 253);
+            this.MsgBox.TabIndex = 9;
+            // 
+            // TopBox
+            // 
+            this.TopBox.Controls.Add(this.workTimeVal4);
+            this.TopBox.Controls.Add(this.workTimeLab4);
+            this.TopBox.Controls.Add(this.workTimeVal3);
+            this.TopBox.Controls.Add(this.workTimeLab3);
+            this.TopBox.Controls.Add(this.workTimeVal2);
+            this.TopBox.Controls.Add(this.workTimeLab2);
+            this.TopBox.Controls.Add(this.workTimeVal1);
+            this.TopBox.Controls.Add(this.workTimeLab1);
+            this.TopBox.Controls.Add(this.ketVal);
+            this.TopBox.Controls.Add(this.ketLab);
+            this.TopBox.Controls.Add(this.claerBtn);
+            this.TopBox.Controls.Add(this.onStart);
+            this.TopBox.Controls.Add(this.IpPortUrlVal);
+            this.TopBox.Controls.Add(this.IpPortUrlLab);
+            this.TopBox.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TopBox.Location = new System.Drawing.Point(3, 3);
+            this.TopBox.Name = "TopBox";
+            this.TopBox.Size = new System.Drawing.Size(634, 247);
+            this.TopBox.TabIndex = 10;
+            // 
+            // ketVal
+            // 
+            this.ketVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ketVal.Location = new System.Drawing.Point(147, 63);
+            this.ketVal.Name = "ketVal";
+            this.ketVal.Size = new System.Drawing.Size(305, 31);
+            this.ketVal.TabIndex = 12;
+            // 
+            // ketLab
+            // 
+            this.ketLab.AutoSize = true;
+            this.ketLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ketLab.Location = new System.Drawing.Point(86, 63);
+            this.ketLab.Name = "ketLab";
+            this.ketLab.Size = new System.Drawing.Size(59, 28);
+            this.ketLab.TabIndex = 13;
+            this.ketLab.Text = "密钥:";
+            // 
+            // claerBtn
+            // 
+            this.claerBtn.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.claerBtn.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.claerBtn.Location = new System.Drawing.Point(285, 195);
+            this.claerBtn.Name = "claerBtn";
+            this.claerBtn.Size = new System.Drawing.Size(120, 35);
+            this.claerBtn.TabIndex = 11;
+            this.claerBtn.Text = "清除提示";
+            this.claerBtn.UseVisualStyleBackColor = true;
+            this.claerBtn.Click += new System.EventHandler(this.claerBtn_Click);
+            // 
+            // onStart
+            // 
+            this.onStart.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.onStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.onStart.Location = new System.Drawing.Point(429, 195);
+            this.onStart.Name = "onStart";
+            this.onStart.Size = new System.Drawing.Size(120, 35);
+            this.onStart.TabIndex = 9;
+            this.onStart.Text = "开启获取";
+            this.onStart.UseVisualStyleBackColor = true;
+            this.onStart.Click += new System.EventHandler(this.onStart_Click);
+            // 
+            // IpPortUrlVal
+            // 
+            this.IpPortUrlVal.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.IpPortUrlVal.Location = new System.Drawing.Point(147, 17);
+            this.IpPortUrlVal.Name = "IpPortUrlVal";
+            this.IpPortUrlVal.Size = new System.Drawing.Size(355, 31);
+            this.IpPortUrlVal.TabIndex = 0;
+            // 
+            // IpPortUrlLab
+            // 
+            this.IpPortUrlLab.AutoSize = true;
+            this.IpPortUrlLab.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.IpPortUrlLab.Location = new System.Drawing.Point(57, 20);
+            this.IpPortUrlLab.Name = "IpPortUrlLab";
+            this.IpPortUrlLab.Size = new System.Drawing.Size(101, 28);
+            this.IpPortUrlLab.TabIndex = 1;
+            this.IpPortUrlLab.Text = "请求地址:";
+            // 
+            // timer1
+            // 
+            this.timer1.Interval = 60000;
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // Msg1
+            // 
+            this.Msg1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.Msg1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.Msg1.Location = new System.Drawing.Point(644, 4);
+            this.Msg1.Margin = new System.Windows.Forms.Padding(4);
+            this.Msg1.Name = "Msg1";
+            this.Msg1.Size = new System.Drawing.Size(632, 245);
+            this.Msg1.TabIndex = 53;
+            this.Msg1.Text = "";
+            // 
+            // workTimeVal1
+            // 
+            this.workTimeVal1.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal1.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.workTimeVal1.CustomFormat = "hh:mm";
+            this.workTimeVal1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal1.Format = System.Windows.Forms.DateTimePickerFormat.Time;
+            this.workTimeVal1.Location = new System.Drawing.Point(147, 108);
+            this.workTimeVal1.Name = "workTimeVal1";
+            this.workTimeVal1.ShowUpDown = true;
+            this.workTimeVal1.Size = new System.Drawing.Size(131, 31);
+            this.workTimeVal1.TabIndex = 14;
+            this.workTimeVal1.TabStop = false;
+            this.workTimeVal1.Value = new System.DateTime(2026, 6, 16, 11, 31, 0, 0);
+            // 
+            // workTimeLab1
+            // 
+            this.workTimeLab1.AutoSize = true;
+            this.workTimeLab1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeLab1.Location = new System.Drawing.Point(57, 108);
+            this.workTimeLab1.Name = "workTimeLab1";
+            this.workTimeLab1.Size = new System.Drawing.Size(101, 28);
+            this.workTimeLab1.TabIndex = 15;
+            this.workTimeLab1.Text = "上班时间:";
+            // 
+            // workTimeVal2
+            // 
+            this.workTimeVal2.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal2.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.workTimeVal2.CustomFormat = "hh:mm";
+            this.workTimeVal2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal2.Format = System.Windows.Forms.DateTimePickerFormat.Time;
+            this.workTimeVal2.Location = new System.Drawing.Point(147, 153);
+            this.workTimeVal2.Name = "workTimeVal2";
+            this.workTimeVal2.ShowUpDown = true;
+            this.workTimeVal2.Size = new System.Drawing.Size(131, 31);
+            this.workTimeVal2.TabIndex = 16;
+            this.workTimeVal2.TabStop = false;
+            this.workTimeVal2.Value = new System.DateTime(2026, 6, 16, 11, 31, 0, 0);
+            // 
+            // workTimeLab2
+            // 
+            this.workTimeLab2.AutoSize = true;
+            this.workTimeLab2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeLab2.Location = new System.Drawing.Point(57, 153);
+            this.workTimeLab2.Name = "workTimeLab2";
+            this.workTimeLab2.Size = new System.Drawing.Size(101, 28);
+            this.workTimeLab2.TabIndex = 17;
+            this.workTimeLab2.Text = "上班时间:";
+            // 
+            // workTimeVal4
+            // 
+            this.workTimeVal4.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal4.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.workTimeVal4.CustomFormat = "hh:mm";
+            this.workTimeVal4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal4.Format = System.Windows.Forms.DateTimePickerFormat.Time;
+            this.workTimeVal4.Location = new System.Drawing.Point(388, 153);
+            this.workTimeVal4.Name = "workTimeVal4";
+            this.workTimeVal4.ShowUpDown = true;
+            this.workTimeVal4.Size = new System.Drawing.Size(131, 31);
+            this.workTimeVal4.TabIndex = 20;
+            this.workTimeVal4.TabStop = false;
+            this.workTimeVal4.Value = new System.DateTime(2026, 6, 16, 11, 31, 0, 0);
+            // 
+            // workTimeLab4
+            // 
+            this.workTimeLab4.AutoSize = true;
+            this.workTimeLab4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeLab4.Location = new System.Drawing.Point(298, 153);
+            this.workTimeLab4.Name = "workTimeLab4";
+            this.workTimeLab4.Size = new System.Drawing.Size(101, 28);
+            this.workTimeLab4.TabIndex = 21;
+            this.workTimeLab4.Text = "下班时间:";
+            // 
+            // workTimeVal3
+            // 
+            this.workTimeVal3.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal3.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.workTimeVal3.CustomFormat = "hh:mm";
+            this.workTimeVal3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeVal3.Format = System.Windows.Forms.DateTimePickerFormat.Time;
+            this.workTimeVal3.Location = new System.Drawing.Point(388, 108);
+            this.workTimeVal3.Name = "workTimeVal3";
+            this.workTimeVal3.ShowUpDown = true;
+            this.workTimeVal3.Size = new System.Drawing.Size(131, 31);
+            this.workTimeVal3.TabIndex = 18;
+            this.workTimeVal3.TabStop = false;
+            this.workTimeVal3.Value = new System.DateTime(2026, 6, 16, 11, 31, 0, 0);
+            // 
+            // workTimeLab3
+            // 
+            this.workTimeLab3.AutoSize = true;
+            this.workTimeLab3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.workTimeLab3.Location = new System.Drawing.Point(298, 108);
+            this.workTimeLab3.Name = "workTimeLab3";
+            this.workTimeLab3.Size = new System.Drawing.Size(101, 28);
+            this.workTimeLab3.TabIndex = 19;
+            this.workTimeLab3.Text = "下班时间:";
+            // 
+            // Make_BodyTest
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1280, 720);
+            this.Controls.Add(this.MsgBox);
+            this.Font = new System.Drawing.Font("微软雅黑", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Name = "Make_BodyTest";
+            this.Text = "Make_Humiture";
+            this.Load += new System.EventHandler(this.Make_Humiture_Load);
+            this.MsgBox.ResumeLayout(false);
+            this.TopBox.ResumeLayout(false);
+            this.TopBox.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TableLayoutPanel MsgBox;
+        private System.Windows.Forms.Panel TopBox;
+        private System.Windows.Forms.Timer timer1;
+        private System.Windows.Forms.Label IpPortUrlLab;
+        private System.Windows.Forms.TextBox IpPortUrlVal;
+        private System.Windows.Forms.Button onStart;
+        private System.Windows.Forms.Button claerBtn;
+        private System.Windows.Forms.TextBox ketVal;
+        private System.Windows.Forms.Label ketLab;
+        private CustomControl.RichText.RichTextAutoBottom Msg1;
+        private System.Windows.Forms.DateTimePicker workTimeVal1;
+        private System.Windows.Forms.Label workTimeLab1;
+        private System.Windows.Forms.DateTimePicker workTimeVal2;
+        private System.Windows.Forms.Label workTimeLab2;
+        private System.Windows.Forms.DateTimePicker workTimeVal4;
+        private System.Windows.Forms.Label workTimeLab4;
+        private System.Windows.Forms.DateTimePicker workTimeVal3;
+        private System.Windows.Forms.Label workTimeLab3;
+    }
+}

UAS_MES_YTDZ/FunctionCode/Make/Make_BodyTest.cs

@@ -0,0 +1,194 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Data;
+using System.Drawing;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using UAS_MES_NEW.CustomControl.RichText;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_BodyTest : Form
+    {
+        public Make_BodyTest()
+        {
+            InitializeComponent();
+        }
+
+        string url = "http://192.168.41.200:9527/";
+        string key = "c6b0ac61-bb5a-411f-9213-3ed05da979f8";
+
+        DataHelper dh;
+        DataTable dt;
+        int InsertNum = 0;
+
+        private void Make_Humiture_Load(object sender, EventArgs e)
+        {
+            IpPortUrlVal.Text = url;
+            ketVal.Text = key;
+
+            workTimeVal1.Value = DateTime.Today.AddHours(08).AddMinutes(00).AddSeconds(0);
+            workTimeVal2.Value = DateTime.Today.AddHours(12).AddMinutes(30).AddSeconds(0);
+
+            workTimeVal3.Value = DateTime.Today.AddHours(12).AddMinutes(00).AddSeconds(0);
+            workTimeVal4.Value = DateTime.Today.AddHours(17).AddMinutes(30).AddSeconds(0);
+
+            workTimeLab1.Visible = false;
+            workTimeLab2.Visible = false;
+            workTimeLab3.Visible = false;
+            workTimeLab4.Visible = false;
+
+            workTimeVal1.Visible = false;
+            workTimeVal2.Visible = false;
+            workTimeVal3.Visible = false;
+            workTimeVal4.Visible = false;
+            dh = SystemInf.dh;
+        }
+
+        private void onStart_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(IpPortUrlVal.Text))
+            {
+                ShowMsg(Msg1, 0, "请输出请求地址");
+                IpPortUrlVal.Focus();
+                IpPortUrlVal.SelectAll();
+                return;
+            }
+
+            if (onStart.Text == "获取中")
+            {
+                IpPortUrlVal.Enabled = true;
+                ketVal.Enabled = true;
+                workTimeVal1.Enabled = true;
+                workTimeVal2.Enabled = true;
+                workTimeVal3.Enabled = true;
+                workTimeVal4.Enabled = true;
+                onStart.Text = "开启获取";
+                timer1.Stop();
+            }
+            else
+            {
+                IpPortUrlVal.Enabled = false;
+                ketVal.Enabled = false;
+                workTimeVal1.Enabled = false;
+                workTimeVal2.Enabled = false;
+                workTimeVal3.Enabled = false;
+                workTimeVal4.Enabled = false;
+                onStart.Text = "获取中";
+                ShowMsg(Msg1, 2, $"执行间隔:{timer1.Interval / 60000}分钟");
+                timer1.Start();
+                //timer1_Tick(null, null);
+            }
+        }
+        private async void timer1_Tick(object sender, EventArgs e)
+        {
+            try
+            {
+                string apiUrl = IpPortUrlVal.Text.Trim() + "api/AcsDataApi/GetData";
+                DateTime startTime = DateTime.Now.Date;
+                DateTime endTime = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
+                var dataObject = new
+                {
+                    Key = ketVal.Text.Trim(),
+                    Type = "Event",
+                    STime = startTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                    ETime = endTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                    IsAllType = "0"
+                };
+                string result = await HttpHelper.PostAsync(apiUrl, dataObject);
+                JObject root = JObject.Parse(result);
+                JArray dataArr = (JArray)root["Data"];
+
+
+                if (root["Code"].ToString() == "1")
+                {
+                    ShowMsg(Msg1, 1, $"获取人体测试仪设备成功,已获取到{dataArr.Count}条记录");
+                }
+                InsertNum = 0;
+                foreach (JToken item in dataArr)
+                {
+                    string DeptName = item["DeptName"].ToString();
+                    string EmployeeCode = item["EmployeeCode"].ToString();
+                    string EmployeeName = item["EmployeeName"].ToString();
+                    string EventName = item["EventName"].ToString();
+                    string ControlName = item["ControlName"].ToString();
+
+                    string EventID = item["EventID"].ToString();
+                    string EventTime = item["EventTime"].ToString();
+                    DateTime.TryParse(EventTime, out DateTime dtHour);
+                    string timeType = dtHour.Hour < 11 ? "上午" : "下午";
+
+
+                    dt = (DataTable)dh.ExecuteSql($"select * from bodytest where BT_EVENTID = '{EventID}'", "select");
+                    if (dt.Rows.Count == 0)
+                    {
+                        string sql = $@"INSERT INTO BODYTEST (BT_ID,BT_DEPTNAME,BT_EMPNO,BT_EMP,BT_TYPE,BT_TIMETYPE,
+                            BT_HAND,BT_DHAND,BT_LEFTSHOES,BT_RIGHTSHOES,BT_CONTROLNAME,BT_EVENTID,BT_INDATE) VALUES 
+                            (BODYTEST_SEQ.NEXTVAL,'{DeptName}','{EmployeeCode}','{EmployeeName}','{EventName}','{timeType}',
+                            '','','','','{ControlName}','{EventID}',to_date('{EventTime}', 'YYYY-MM-DD HH24:MI:SS'))";
+
+                        dh.ExecuteSql(sql, "insert");
+                        InsertNum += 1;
+                    }
+                }
+
+                ShowMsg(Msg1, 1, $"人体测试信息已记录{InsertNum}条记录");
+            }
+            catch (Exception ex)
+            {
+                ShowMsg(Msg1, 0, $"获取数据时发生错误: {ex.Message}");
+            }
+        }
+
+
+        private void claerBtn_Click(object sender, EventArgs e)
+        {
+            Msg1.Clear();
+        }
+
+        private void ShowMsg(RichTextAutoBottom msgBox, int type, string msg)
+        {
+            msg = msg.Replace("\r", "").Replace("\n", "");
+            string msgTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            string showMsg = $"{msgTime}: {msg}\n";
+
+            if (type == 0)
+            {
+                msgBox.AppendText(showMsg, Color.Red);
+                msgBox.SelectionStart = msgBox.Text.Length;
+                msgBox.ScrollToCaret();
+            }
+            else if (type == 1)
+            {
+                msgBox.AppendText(showMsg, Color.Green);
+                msgBox.SelectionStart = msgBox.Text.Length;
+                msgBox.ScrollToCaret();
+            }
+            else if (type == 2)
+            {
+                msgBox.AppendText(showMsg, Color.YellowGreen);
+                msgBox.SelectionStart = msgBox.Text.Length;
+                msgBox.ScrollToCaret();
+            }
+        }
+        public static class HttpHelper
+        {
+            public static async Task<string> PostAsync<T>(string url, T data)
+            {
+                var client = new HttpClient();
+                string json = JsonConvert.SerializeObject(data);
+                var content = new StringContent(json, Encoding.UTF8, "application/json");
+                var response = await client.PostAsync(url, content);
+                response.EnsureSuccessStatusCode();
+                return await response.Content.ReadAsStringAsync();
+            }
+        }
+
+    }
+}

UAS_MES_YTDZ/FunctionCode/Make/Make_BodyTest.resx

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

UAS_MES_YTDZ/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -77,10 +77,10 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(680, 292);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(765, 350);
             this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(86, 31);
             this.ob_batchqty_label.TabIndex = 158;
             this.ob_batchqty_label.Text = "实批数";
             // 
@@ -88,10 +88,10 @@
             // 
             this.ob_result_label.AutoSize = true;
             this.ob_result_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_result_label.Location = new System.Drawing.Point(680, 252);
+            this.ob_result_label.Location = new System.Drawing.Point(765, 302);
             this.ob_result_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_result_label.Name = "ob_result_label";
-            this.ob_result_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_result_label.Size = new System.Drawing.Size(110, 31);
             this.ob_result_label.TabIndex = 166;
             this.ob_result_label.Text = "判定结果";
             // 
@@ -99,10 +99,10 @@
             // 
             this.ob_okqty_label.AutoSize = true;
             this.ob_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_okqty_label.Location = new System.Drawing.Point(680, 377);
+            this.ob_okqty_label.Location = new System.Drawing.Point(765, 452);
             this.ob_okqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_okqty_label.Name = "ob_okqty_label";
-            this.ob_okqty_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_okqty_label.Size = new System.Drawing.Size(86, 31);
             this.ob_okqty_label.TabIndex = 160;
             this.ob_okqty_label.Text = "合格数";
             // 
@@ -110,10 +110,10 @@
             // 
             this.ob_ngqty_label.AutoSize = true;
             this.ob_ngqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_ngqty_label.Location = new System.Drawing.Point(680, 420);
+            this.ob_ngqty_label.Location = new System.Drawing.Point(765, 504);
             this.ob_ngqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_ngqty_label.Name = "ob_ngqty_label";
-            this.ob_ngqty_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_ngqty_label.Size = new System.Drawing.Size(110, 31);
             this.ob_ngqty_label.TabIndex = 162;
             this.ob_ngqty_label.Text = "不合格数";
             // 
@@ -121,10 +121,10 @@
             // 
             this.oi_checkqty_label.AutoSize = true;
             this.oi_checkqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.oi_checkqty_label.Location = new System.Drawing.Point(680, 333);
+            this.oi_checkqty_label.Location = new System.Drawing.Point(765, 400);
             this.oi_checkqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.oi_checkqty_label.Name = "oi_checkqty_label";
-            this.oi_checkqty_label.Size = new System.Drawing.Size(72, 27);
+            this.oi_checkqty_label.Size = new System.Drawing.Size(86, 31);
             this.oi_checkqty_label.TabIndex = 164;
             this.oi_checkqty_label.Text = "抽检数";
             // 
@@ -132,10 +132,10 @@
             // 
             this.ReworkRequire.AutoSize = true;
             this.ReworkRequire.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ReworkRequire.Location = new System.Drawing.Point(163, 620);
-            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ReworkRequire.Location = new System.Drawing.Point(183, 744);
+            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ReworkRequire.Name = "ReworkRequire";
-            this.ReworkRequire.Size = new System.Drawing.Size(154, 31);
+            this.ReworkRequire.Size = new System.Drawing.Size(184, 35);
             this.ReworkRequire.TabIndex = 168;
             this.ReworkRequire.Text = "发起返工需求";
             this.ReworkRequire.UseVisualStyleBackColor = true;
@@ -145,10 +145,10 @@
             // 
             this.ob_aqlcode_label.AutoSize = true;
             this.ob_aqlcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_aqlcode_label.Location = new System.Drawing.Point(680, 462);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(765, 554);
             this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_aqlcode_label.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(52, 27);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(63, 31);
             this.ob_aqlcode_label.TabIndex = 169;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -156,10 +156,10 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(352, 145);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(396, 174);
             this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(110, 31);
             this.ob_prodcode_label.TabIndex = 218;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -167,10 +167,10 @@
             // 
             this.ob_makecode_label.AutoSize = true;
             this.ob_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_makecode_label.Location = new System.Drawing.Point(11, 145);
+            this.ob_makecode_label.Location = new System.Drawing.Point(12, 174);
             this.ob_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_makecode_label.Name = "ob_makecode_label";
-            this.ob_makecode_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_makecode_label.Size = new System.Drawing.Size(86, 31);
             this.ob_makecode_label.TabIndex = 216;
             this.ob_makecode_label.Text = "工单号";
             // 
@@ -178,10 +178,10 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(11, 15);
+            this.ob_checkno_label.Location = new System.Drawing.Point(12, 18);
             this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(72, 27);
+            this.ob_checkno_label.Size = new System.Drawing.Size(86, 31);
             this.ob_checkno_label.TabIndex = 214;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -189,10 +189,10 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(11, 55);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(12, 66);
             this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(52, 27);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(62, 31);
             this.obd_outboxcode_label.TabIndex = 212;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -200,10 +200,10 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(11, 97);
+            this.ms_sncode_label.Location = new System.Drawing.Point(12, 116);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
+            this.ms_sncode_label.Size = new System.Drawing.Size(86, 31);
             this.ms_sncode_label.TabIndex = 210;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -211,10 +211,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(48, 532);
+            this.label3.Location = new System.Drawing.Point(54, 638);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(571, 24);
+            this.label3.Size = new System.Drawing.Size(666, 28);
             this.label3.TabIndex = 222;
             this.label3.Text = "--说明:如何物料没有维护AQL标准，需手动填写最大不合格允许通过数";
             // 
@@ -222,19 +222,19 @@
             // 
             this.ob_maxngacceptqty_label.AutoSize = true;
             this.ob_maxngacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(48, 497);
+            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(54, 596);
             this.ob_maxngacceptqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_maxngacceptqty_label.Name = "ob_maxngacceptqty_label";
-            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(212, 27);
+            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(254, 31);
             this.ob_maxngacceptqty_label.TabIndex = 223;
             this.ob_maxngacceptqty_label.Text = "最大不合格允许通过数";
             // 
             // Remark
             // 
-            this.Remark.Location = new System.Drawing.Point(117, 202);
-            this.Remark.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Remark.Location = new System.Drawing.Point(132, 242);
+            this.Remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(546, 281);
+            this.Remark.Size = new System.Drawing.Size(614, 336);
             this.Remark.TabIndex = 225;
             this.Remark.Tag = "Remark";
             this.Remark.Text = "";
@@ -243,10 +243,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(11, 202);
+            this.label5.Location = new System.Drawing.Point(12, 242);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(52, 27);
+            this.label5.Size = new System.Drawing.Size(62, 31);
             this.label5.TabIndex = 226;
             this.label5.Text = "备注";
             // 
@@ -254,10 +254,10 @@
             // 
             this.ob_status_label.AutoSize = true;
             this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_status_label.Location = new System.Drawing.Point(680, 210);
+            this.ob_status_label.Location = new System.Drawing.Point(765, 252);
             this.ob_status_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(92, 27);
+            this.ob_status_label.Size = new System.Drawing.Size(110, 31);
             this.ob_status_label.TabIndex = 232;
             this.ob_status_label.Text = "批次状态";
             // 
@@ -268,13 +268,13 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = null;
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(571, 495);
-            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.normalButton1.Location = new System.Drawing.Point(642, 594);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
             this.normalButton1.Power = null;
-            this.normalButton1.Size = new System.Drawing.Size(100, 35);
+            this.normalButton1.Size = new System.Drawing.Size(112, 42);
             this.normalButton1.TabIndex = 234;
             this.normalButton1.Text = "保存备注";
             this.normalButton1.UseVisualStyleBackColor = false;
@@ -285,11 +285,11 @@
             this.ob_maxngacceptqty.AllPower = "";
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(268, 497);
-            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(302, 596);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = "";
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(257, 25);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(289, 28);
             this.ob_maxngacceptqty.Str = null;
             this.ob_maxngacceptqty.Str1 = null;
             this.ob_maxngacceptqty.Str2 = null;
@@ -302,11 +302,11 @@
             this.ob_status.BackColor = System.Drawing.Color.White;
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
-            this.ob_status.Location = new System.Drawing.Point(800, 210);
-            this.ob_status.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_status.Location = new System.Drawing.Point(900, 252);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(194, 25);
+            this.ob_status.Size = new System.Drawing.Size(218, 28);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -319,11 +319,11 @@
             this.ob_source.BackColor = System.Drawing.Color.White;
             this.ob_source.Enabled = false;
             this.ob_source.ID = null;
-            this.ob_source.Location = new System.Drawing.Point(1012, 57);
-            this.ob_source.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_source.Location = new System.Drawing.Point(1138, 68);
+            this.ob_source.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_source.Name = "ob_source";
             this.ob_source.Power = null;
-            this.ob_source.Size = new System.Drawing.Size(194, 25);
+            this.ob_source.Size = new System.Drawing.Size(218, 28);
             this.ob_source.Str = null;
             this.ob_source.Str1 = null;
             this.ob_source.Str2 = null;
@@ -337,11 +337,11 @@
             this.ob_id.BackColor = System.Drawing.Color.White;
             this.ob_id.Enabled = false;
             this.ob_id.ID = null;
-            this.ob_id.Location = new System.Drawing.Point(1012, 32);
-            this.ob_id.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_id.Location = new System.Drawing.Point(1138, 38);
+            this.ob_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_id.Name = "ob_id";
             this.ob_id.Power = null;
-            this.ob_id.Size = new System.Drawing.Size(194, 25);
+            this.ob_id.Size = new System.Drawing.Size(218, 28);
             this.ob_id.Str = null;
             this.ob_id.Str1 = null;
             this.ob_id.Str2 = null;
@@ -352,10 +352,10 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(1013, 177);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.OperateResult.Location = new System.Drawing.Point(1140, 212);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(279, 397);
+            this.OperateResult.Size = new System.Drawing.Size(313, 476);
             this.OperateResult.TabIndex = 227;
             this.OperateResult.Text = "";
             // 
@@ -366,13 +366,13 @@
             this.GetBatch.DownImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.DownImage")));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(681, 147);
-            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.GetBatch.Location = new System.Drawing.Point(766, 176);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifread";
-            this.GetBatch.Size = new System.Drawing.Size(80, 30);
+            this.GetBatch.Size = new System.Drawing.Size(90, 36);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -384,11 +384,11 @@
             this.ob_prodcode.BackColor = System.Drawing.Color.White;
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
-            this.ob_prodcode.Location = new System.Drawing.Point(473, 150);
-            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_prodcode.Location = new System.Drawing.Point(532, 180);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(191, 25);
+            this.ob_prodcode.Size = new System.Drawing.Size(214, 28);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -401,11 +401,11 @@
             this.ob_makecode.BackColor = System.Drawing.Color.White;
             this.ob_makecode.Enabled = false;
             this.ob_makecode.ID = null;
-            this.ob_makecode.Location = new System.Drawing.Point(117, 147);
-            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_makecode.Location = new System.Drawing.Point(132, 176);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
-            this.ob_makecode.Size = new System.Drawing.Size(212, 25);
+            this.ob_makecode.Size = new System.Drawing.Size(238, 28);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -417,11 +417,11 @@
             this.ob_checkno.AllPower = "";
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(117, 17);
-            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_checkno.Location = new System.Drawing.Point(132, 20);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
-            this.ob_checkno.Size = new System.Drawing.Size(546, 25);
+            this.ob_checkno.Size = new System.Drawing.Size(614, 28);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -434,11 +434,11 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(117, 57);
-            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.obd_outboxcode.Location = new System.Drawing.Point(132, 68);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(546, 25);
+            this.obd_outboxcode.Size = new System.Drawing.Size(614, 28);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -451,11 +451,11 @@
             this.ms_sncode.AllPower = "";
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(117, 100);
-            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ms_sncode.Location = new System.Drawing.Point(132, 120);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
-            this.ms_sncode.Size = new System.Drawing.Size(546, 25);
+            this.ms_sncode.Size = new System.Drawing.Size(614, 28);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -469,11 +469,11 @@
             this.ob_nowcheckqty.BackColor = System.Drawing.Color.White;
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(800, 292);
-            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(900, 350);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(194, 25);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(218, 28);
             this.ob_nowcheckqty.Str = null;
             this.ob_nowcheckqty.Str1 = null;
             this.ob_nowcheckqty.Str2 = null;
@@ -486,11 +486,11 @@
             this.ob_okqty.BackColor = System.Drawing.Color.White;
             this.ob_okqty.Enabled = false;
             this.ob_okqty.ID = null;
-            this.ob_okqty.Location = new System.Drawing.Point(800, 377);
-            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_okqty.Location = new System.Drawing.Point(900, 452);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
-            this.ob_okqty.Size = new System.Drawing.Size(194, 25);
+            this.ob_okqty.Size = new System.Drawing.Size(218, 28);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -503,11 +503,11 @@
             this.oi_checkqty.BackColor = System.Drawing.Color.White;
             this.oi_checkqty.Enabled = false;
             this.oi_checkqty.ID = null;
-            this.oi_checkqty.Location = new System.Drawing.Point(800, 333);
-            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.oi_checkqty.Location = new System.Drawing.Point(900, 400);
+            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.Power = null;
-            this.oi_checkqty.Size = new System.Drawing.Size(194, 25);
+            this.oi_checkqty.Size = new System.Drawing.Size(218, 28);
             this.oi_checkqty.Str = null;
             this.oi_checkqty.Str1 = null;
             this.oi_checkqty.Str2 = null;
@@ -520,11 +520,11 @@
             this.ob_ngqty.BackColor = System.Drawing.Color.White;
             this.ob_ngqty.Enabled = false;
             this.ob_ngqty.ID = null;
-            this.ob_ngqty.Location = new System.Drawing.Point(800, 420);
-            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_ngqty.Location = new System.Drawing.Point(900, 504);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
-            this.ob_ngqty.Size = new System.Drawing.Size(194, 25);
+            this.ob_ngqty.Size = new System.Drawing.Size(218, 28);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -537,11 +537,11 @@
             this.ob_result.BackColor = System.Drawing.Color.White;
             this.ob_result.Enabled = false;
             this.ob_result.ID = null;
-            this.ob_result.Location = new System.Drawing.Point(800, 252);
-            this.ob_result.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_result.Location = new System.Drawing.Point(900, 302);
+            this.ob_result.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_result.Name = "ob_result";
             this.ob_result.Power = null;
-            this.ob_result.Size = new System.Drawing.Size(194, 25);
+            this.ob_result.Size = new System.Drawing.Size(218, 28);
             this.ob_result.Str = null;
             this.ob_result.Str1 = null;
             this.ob_result.Str2 = null;
@@ -554,11 +554,11 @@
             this.ob_aqlcode.BackColor = System.Drawing.Color.White;
             this.ob_aqlcode.Enabled = false;
             this.ob_aqlcode.ID = null;
-            this.ob_aqlcode.Location = new System.Drawing.Point(800, 462);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ob_aqlcode.Location = new System.Drawing.Point(900, 554);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(194, 25);
+            this.ob_aqlcode.Size = new System.Drawing.Size(218, 28);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -573,17 +573,16 @@
             this.WithdrawPass.Enabled = false;
             this.WithdrawPass.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.Image")));
             this.WithdrawPass.IsShowBorder = true;
-            this.WithdrawPass.Location = new System.Drawing.Point(580, 570);
-            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.WithdrawPass.Location = new System.Drawing.Point(652, 684);
+            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WithdrawPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.MoveImage")));
             this.WithdrawPass.Name = "WithdrawPass";
             this.WithdrawPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.NormalImage")));
             this.WithdrawPass.Power = "IFREAD";
-            this.WithdrawPass.Size = new System.Drawing.Size(91, 37);
+            this.WithdrawPass.Size = new System.Drawing.Size(102, 44);
             this.WithdrawPass.TabIndex = 167;
             this.WithdrawPass.Text = "撤销通过";
             this.WithdrawPass.UseVisualStyleBackColor = true;
-            this.WithdrawPass.Visible = false;
             this.WithdrawPass.Click += new System.EventHandler(this.WithdrawPass_Click);
             // 
             // BatchRejection
@@ -594,13 +593,13 @@
             this.BatchRejection.Enabled = false;
             this.BatchRejection.Image = ((System.Drawing.Image)(resources.GetObject("BatchRejection.Image")));
             this.BatchRejection.IsShowBorder = true;
-            this.BatchRejection.Location = new System.Drawing.Point(41, 622);
-            this.BatchRejection.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.BatchRejection.Location = new System.Drawing.Point(46, 746);
+            this.BatchRejection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BatchRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.MoveImage")));
             this.BatchRejection.Name = "BatchRejection";
             this.BatchRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.NormalImage")));
             this.BatchRejection.Power = "IFREAD";
-            this.BatchRejection.Size = new System.Drawing.Size(91, 37);
+            this.BatchRejection.Size = new System.Drawing.Size(102, 44);
             this.BatchRejection.TabIndex = 166;
             this.BatchRejection.Text = "批判退";
             this.BatchRejection.UseVisualStyleBackColor = true;
@@ -614,13 +613,13 @@
             this.ForcePass.Enabled = false;
             this.ForcePass.Image = ((System.Drawing.Image)(resources.GetObject("ForcePass.Image")));
             this.ForcePass.IsShowBorder = true;
-            this.ForcePass.Location = new System.Drawing.Point(393, 570);
-            this.ForcePass.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ForcePass.Location = new System.Drawing.Point(442, 684);
+            this.ForcePass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ForcePass.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.MoveImage")));
             this.ForcePass.Name = "ForcePass";
             this.ForcePass.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.NormalImage")));
             this.ForcePass.Power = "ifspecial";
-            this.ForcePass.Size = new System.Drawing.Size(91, 37);
+            this.ForcePass.Size = new System.Drawing.Size(102, 44);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
             this.ForcePass.UseVisualStyleBackColor = true;
@@ -634,13 +633,13 @@
             this.ForceRejection.Enabled = false;
             this.ForceRejection.Image = ((System.Drawing.Image)(resources.GetObject("ForceRejection.Image")));
             this.ForceRejection.IsShowBorder = true;
-            this.ForceRejection.Location = new System.Drawing.Point(393, 622);
-            this.ForceRejection.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.ForceRejection.Location = new System.Drawing.Point(442, 746);
+            this.ForceRejection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ForceRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.MoveImage")));
             this.ForceRejection.Name = "ForceRejection";
             this.ForceRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.NormalImage")));
             this.ForceRejection.Power = "ifspecial";
-            this.ForceRejection.Size = new System.Drawing.Size(91, 37);
+            this.ForceRejection.Size = new System.Drawing.Size(102, 44);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
             this.ForceRejection.UseVisualStyleBackColor = true;
@@ -654,17 +653,16 @@
             this.WithdrawRejection.Enabled = false;
             this.WithdrawRejection.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.Image")));
             this.WithdrawRejection.IsShowBorder = true;
-            this.WithdrawRejection.Location = new System.Drawing.Point(580, 622);
-            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.WithdrawRejection.Location = new System.Drawing.Point(652, 746);
+            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.WithdrawRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.MoveImage")));
             this.WithdrawRejection.Name = "WithdrawRejection";
             this.WithdrawRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.NormalImage")));
             this.WithdrawRejection.Power = "IFREAD";
-            this.WithdrawRejection.Size = new System.Drawing.Size(91, 37);
+            this.WithdrawRejection.Size = new System.Drawing.Size(102, 44);
             this.WithdrawRejection.TabIndex = 163;
             this.WithdrawRejection.Text = "撤销判退";
             this.WithdrawRejection.UseVisualStyleBackColor = true;
-            this.WithdrawRejection.Visible = false;
             this.WithdrawRejection.Click += new System.EventHandler(this.WithdrawRejection_Click);
             // 
             // BatchPass
@@ -675,13 +673,13 @@
             this.BatchPass.Enabled = false;
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
-            this.BatchPass.Location = new System.Drawing.Point(41, 568);
-            this.BatchPass.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.BatchPass.Location = new System.Drawing.Point(46, 682);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
             this.BatchPass.Power = "IFREAD";
-            this.BatchPass.Size = new System.Drawing.Size(91, 37);
+            this.BatchPass.Size = new System.Drawing.Size(102, 44);
             this.BatchPass.TabIndex = 162;
             this.BatchPass.Text = "批判过";
             this.BatchPass.UseVisualStyleBackColor = true;
@@ -694,13 +692,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(1113, 607);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Clean.Location = new System.Drawing.Point(1252, 728);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(85, 37);
+            this.Clean.Size = new System.Drawing.Size(96, 44);
             this.Clean.TabIndex = 159;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -708,9 +706,9 @@
             // 
             // OQC_BatchResultJudge
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1300, 672);
+            this.ClientSize = new System.Drawing.Size(1462, 806);
             this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_status_label);
@@ -754,7 +752,7 @@
             this.Controls.Add(this.ob_ngqty_label);
             this.Controls.Add(this.oi_checkqty_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";

UAS_MES_YTDZ/FunctionCode/OQC/OQC_BatchResultJudge.resx

@@ -215,7 +215,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -346,7 +346,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -477,7 +477,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -608,7 +608,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -739,7 +739,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -870,7 +870,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -1001,7 +1001,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B
@@ -1132,7 +1132,7 @@
         RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
         lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
         f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
-        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEwAACxMBAJqcGAAACfBJREFUeF7t3dtuFFcC
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEgAACxIB0t1+/AAACfBJREFUeF7t3dtuFFcC
         heFc5VWQRsrL5T0iRcrDkJAjJOADNjbdbvD5iE9tu302RIq0Z6+ynWkmS6oZrlys/+KT8FJX3f2bcmPa
         X5RSAISyI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0BZLAjgAx2BJDBjgAy2BFABjsCyGBHABnsCCCD
         HQFksCOADHYEkMGOADLYEUAGOwLIYEcAGewIIIMdAWSwI4AMdgSQwY4AMtgRQAY7AshgRwAZ7Agggx0B

UAS_MES_YTDZ/UAS_MES_YTDZ.csproj

@@ -561,6 +561,12 @@
     <Compile Include="FunctionCode\Make\Make_FeedingCollectionCombine.Designer.cs">
       <DependentUpon>Make_FeedingCollectionCombine.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_BodyTest.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_BodyTest.Designer.cs">
+      <DependentUpon>Make_BodyTest.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_Humiture.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1348,6 +1354,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_FeedingCollectionCombine.resx">
       <DependentUpon>Make_FeedingCollectionCombine.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_BodyTest.resx">
+      <DependentUpon>Make_BodyTest.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_Humiture.resx">
       <DependentUpon>Make_Humiture.cs</DependentUpon>
     </EmbeddedResource>