Просмотр исходного кода

添加工单物料核对功能

callm 19 часов назад
Родитель
Сommit
9ca6644314

+ 14 - 0
UAS_MES_YDCY/.workbuddy/memory/2026-10-30.md

@@ -0,0 +1,14 @@
+# 2026-10-30
+
+## 新增界面 Make_MakeMaterialCheck(工单物料核对)
+- 三件套:`FunctionCode/Make/Make_MakeMaterialCheck.cs` + `.Designer.cs` + `.resx`(resx 抄 Make_SplitBoard 空模板);csproj 两处注册(Compile×2 + EmbeddedResource×1,名字共出现 5 次)。
+- 布局:ma_label + `ma_code`(MaCodeSearchTextBox) + LockMakeCode(锁定) + input_label + `input`(TextBox,回车核对) + total_label/checked_label + `MakeMaterialDGV`(3列: mm_prodcode/pr_detail/pr_spec) + OperateResult;ClientSize(1560,790)。
+- 逻辑:
+  - Load 配放大镜(TableName `make left join product on ma_prodcode=pr_code`,SetValueField `["ma_code"]`)+ `DbChange` 事件,照 `Make_FeedingCollection` 惯例(GetMakeCodeCtl/SetLockCheckBox)。
+  - `Ma_code_DBChange`:`select mm_prodcode,pr_detail,pr_spec from make left join makematerial on mm_code=ma_code left join product on pr_code=mm_prodcode where ma_code='...'` → FillDgvWithDataTable → UpdateCounts。
+  - `input_KeyDown`:输入料号回车,遍历 DGV 把 `mm_prodcode` 相等的行 `DefaultCellStyle.BackColor = LightGreen`;已绿行不重复计数;未匹配红字提示;匹配后清空输入框。
+  - `UpdateCounts`:物料总数 = DGV 行数(同一料号多行按行计),已核对行数 = 绿背景行数。
+  - 工单文本被清空(UserControlTextChanged)→ CleanDGVData + 计数复位。
+- 无写库操作,不用 DoCommandLog;Designer 未挂 FormClosed(无资源需释放)。
+- 菜单:需 DB 端往 `CS$SYSNAVATION` 插 `sn_classname='Make.Make_MakeMaterialCheck'` + `CS$USERGROUPPOWER` 授权(用户自己执行)。
+- 自检:括号平衡 .cs 18/18、55/55、8/8;Designer 6/6、100/100、1/1 ✅。

+ 250 - 0
UAS_MES_YDCY/FunctionCode/Make/Make_MakeMaterialCheck.Designer.cs

@@ -0,0 +1,250 @@
+namespace UAS_MES_NEW.Make
+{
+    partial class Make_MakeMaterialCheck
+    {
+        /// <summary>
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows 窗体设计器生成的代码
+
+        /// <summary>
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.MakeMaterialDGV = new System.Windows.Forms.DataGridView();
+            this.mm_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ma_label = new System.Windows.Forms.Label();
+            this.input_label = new System.Windows.Forms.Label();
+            this.input = new System.Windows.Forms.TextBox();
+            this.total_label = new System.Windows.Forms.Label();
+            this.checked_label = new System.Windows.Forms.Label();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.OperateResult = new UAS_MES_NEW.CustomControl.RichText.RichTextAutoBottom();
+            this.ma_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
+            ((System.ComponentModel.ISupportInitialize)(this.MakeMaterialDGV)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // MakeMaterialDGV
+            // 
+            this.MakeMaterialDGV.AllowUserToAddRows = false;
+            this.MakeMaterialDGV.AllowUserToDeleteRows = false;
+            this.MakeMaterialDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.MakeMaterialDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.mm_prodcode,
+            this.pr_detail,
+            this.pr_spec});
+            this.MakeMaterialDGV.Location = new System.Drawing.Point(40, 103);
+            this.MakeMaterialDGV.Margin = new System.Windows.Forms.Padding(5);
+            this.MakeMaterialDGV.Name = "MakeMaterialDGV";
+            this.MakeMaterialDGV.ReadOnly = true;
+            this.MakeMaterialDGV.RowHeadersVisible = false;
+            this.MakeMaterialDGV.RowHeadersWidth = 82;
+            this.MakeMaterialDGV.RowTemplate.Height = 33;
+            this.MakeMaterialDGV.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.MakeMaterialDGV.Size = new System.Drawing.Size(2000, 592);
+            this.MakeMaterialDGV.TabIndex = 7;
+            // 
+            // mm_prodcode
+            // 
+            this.mm_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.mm_prodcode.DataPropertyName = "mm_prodcode";
+            this.mm_prodcode.HeaderText = "物料编号";
+            this.mm_prodcode.MinimumWidth = 10;
+            this.mm_prodcode.Name = "mm_prodcode";
+            this.mm_prodcode.ReadOnly = true;
+            this.mm_prodcode.Width = 10;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "物料名称";
+            this.pr_detail.MinimumWidth = 10;
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.ReadOnly = true;
+            this.pr_detail.Width = 10;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCellsExceptHeader;
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "物料规格";
+            this.pr_spec.MinimumWidth = 10;
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.ReadOnly = true;
+            this.pr_spec.Width = 10;
+            // 
+            // ma_label
+            // 
+            this.ma_label.AutoSize = true;
+            this.ma_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_label.Location = new System.Drawing.Point(40, 34);
+            this.ma_label.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+            this.ma_label.Name = "ma_label";
+            this.ma_label.Size = new System.Drawing.Size(146, 41);
+            this.ma_label.TabIndex = 0;
+            this.ma_label.Text = "工单编号";
+            // 
+            // input_label
+            // 
+            this.input_label.AutoSize = true;
+            this.input_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.input_label.Location = new System.Drawing.Point(656, 39);
+            this.input_label.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+            this.input_label.Name = "input_label";
+            this.input_label.Size = new System.Drawing.Size(146, 41);
+            this.input_label.TabIndex = 3;
+            this.input_label.Text = "物料编号";
+            // 
+            // input
+            // 
+            this.input.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.input.Location = new System.Drawing.Point(815, 36);
+            this.input.Margin = new System.Windows.Forms.Padding(5);
+            this.input.Name = "input";
+            this.input.Size = new System.Drawing.Size(372, 50);
+            this.input.TabIndex = 4;
+            this.input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.input_KeyDown);
+            // 
+            // total_label
+            // 
+            this.total_label.AutoSize = true;
+            this.total_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.total_label.Location = new System.Drawing.Point(1467, 34);
+            this.total_label.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+            this.total_label.Name = "total_label";
+            this.total_label.Size = new System.Drawing.Size(182, 41);
+            this.total_label.TabIndex = 5;
+            this.total_label.Text = "物料总数: 0";
+            // 
+            // checked_label
+            // 
+            this.checked_label.AutoSize = true;
+            this.checked_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.checked_label.Location = new System.Drawing.Point(1773, 34);
+            this.checked_label.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
+            this.checked_label.Name = "checked_label";
+            this.checked_label.Size = new System.Drawing.Size(214, 41);
+            this.checked_label.TabIndex = 6;
+            this.checked_label.Text = "已核对行数: 0";
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.DataPropertyName = "mm_prodcode";
+            this.dataGridViewTextBoxColumn1.HeaderText = "物料编号";
+            this.dataGridViewTextBoxColumn1.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.Width = 260;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.DataPropertyName = "pr_detail";
+            this.dataGridViewTextBoxColumn2.HeaderText = "物料名称";
+            this.dataGridViewTextBoxColumn2.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.Width = 360;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.DataPropertyName = "pr_spec";
+            this.dataGridViewTextBoxColumn3.HeaderText = "物料规格";
+            this.dataGridViewTextBoxColumn3.MinimumWidth = 10;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.Width = 360;
+            // 
+            // 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(40, 707);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7);
+            this.OperateResult.Name = "OperateResult";
+            this.OperateResult.Size = new System.Drawing.Size(1999, 173);
+            this.OperateResult.TabIndex = 8;
+            this.OperateResult.Text = "";
+            // 
+            // 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(200, 29);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6);
+            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(409, 63);
+            this.ma_code.TabIndex = 234;
+            this.ma_code.TableName = null;
+            this.ma_code.Tag = "makecode";
+            this.ma_code.TextBoxEnable = true;
+            // 
+            // Make_MakeMaterialCheck
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(2080, 903);
+            this.Controls.Add(this.ma_code);
+            this.Controls.Add(this.ma_label);
+            this.Controls.Add(this.input_label);
+            this.Controls.Add(this.input);
+            this.Controls.Add(this.total_label);
+            this.Controls.Add(this.checked_label);
+            this.Controls.Add(this.MakeMaterialDGV);
+            this.Controls.Add(this.OperateResult);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(5);
+            this.Name = "Make_MakeMaterialCheck";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Tag = "Make_MakeMaterialCheck";
+            this.Text = "工单物料核对";
+            this.Load += new System.EventHandler(this.Make_MakeMaterialCheck_Load);
+            this.SizeChanged += new System.EventHandler(this.Make_MakeMaterialCheck_SizeChanged);
+            ((System.ComponentModel.ISupportInitialize)(this.MakeMaterialDGV)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Label ma_label;
+        private System.Windows.Forms.Label input_label;
+        private System.Windows.Forms.TextBox input;
+        private System.Windows.Forms.Label total_label;
+        private System.Windows.Forms.Label checked_label;
+        private System.Windows.Forms.DataGridView MakeMaterialDGV;
+        private CustomControl.RichText.RichTextAutoBottom OperateResult;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private CustomControl.TextBoxWithIcon.SearchTextBox ma_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn mm_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
+    }
+}

+ 147 - 0
UAS_MES_YDCY/FunctionCode/Make/Make_MakeMaterialCheck.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using UAS_MES_NEW.CustomControl.CustomCheckBox;
+using UAS_MES_NEW.CustomControl.RichText;
+using UAS_MES_NEW.CustomControl.TextBoxWithIcon;
+using UAS_MES_NEW.DataOperate;
+using UAS_MES_NEW.Entity;
+using UAS_MES_NEW.PublicMethod;
+
+namespace UAS_MES_NEW.Make
+{
+    public partial class Make_MakeMaterialCheck : Form
+    {
+        DataHelper dh;
+        LogStringBuilder sql = new LogStringBuilder();
+        DataTable dt;
+
+        AutoSizeFormClass asc = new AutoSizeFormClass();
+
+        /// <summary>
+        /// 已核对行标记的背景色
+        /// </summary>
+        readonly Color CheckColor = Color.LightGreen;
+
+        public Make_MakeMaterialCheck()
+        {
+            InitializeComponent();
+        }
+
+        private void Make_MakeMaterialCheck_Load(object sender, EventArgs e)
+        {
+            asc.controllInitializeSize(this);
+            dh = SystemInf.dh;
+            //工单号放大镜配置
+            ma_code.TableName = "make left join product on ma_prodcode=pr_code";
+            ma_code.SelectField = "ma_code # 工单号,ma_prodcode # 产品编号,ma_qty # 工单数量,pr_detail # 产品名称";
+            ma_code.FormName = Name;
+            ma_code.DBTitle = "工单查询";
+            ma_code.SetValueField = new string[] { "ma_code" };
+            ma_code.DbChange += Ma_code_DBChange;
+            ma_code.UserControlTextChanged += ma_code_UserControlTextChanged;
+            ma_code.Focus();
+        }
+
+        private void Make_MakeMaterialCheck_SizeChanged(object sender, EventArgs e)
+        {
+            asc.controlAutoSize(this);
+        }
+
+        /// <summary>
+        /// 工单号被清空时,清空列表与统计
+        /// </summary>
+        private void ma_code_UserControlTextChanged(object sender, EventArgs e)
+        {
+            if (ma_code.Text == "")
+            {
+                BaseUtil.CleanDGVData(MakeMaterialDGV);
+                UpdateCounts();
+            }
+        }
+
+        /// <summary>
+        /// 工单选定后查询物料清单填充DGV
+        /// </summary>
+        private void Ma_code_DBChange(object sender, EventArgs e)
+        {
+            sql.Clear();
+            sql.Append("select mm_prodcode,pr_detail,pr_spec from make");
+            sql.Append(" left join makematerial on mm_code=ma_code");
+            sql.Append(" left join product on pr_code=mm_prodcode");
+            sql.Append(" where ma_code='" + ma_code.Text + "'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            BaseUtil.FillDgvWithDataTable(MakeMaterialDGV, dt);
+            UpdateCounts();
+            OperateResult.AppendText(">>工单" + ma_code.Text + "物料清单加载完成,共" + dt.Rows.Count + "行\n", Color.Black);
+            input.Focus();
+        }
+
+        /// <summary>
+        /// 输入料号回车核对:匹配到的行标记绿色背景
+        /// </summary>
+        private void input_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode != Keys.Enter)
+                return;
+            e.SuppressKeyPress = true;
+            if (ma_code.Text == "")
+            {
+                OperateResult.AppendText(">>请先选择工单\n", Color.Red, input);
+                return;
+            }
+            string prodcode = input.Text.Trim().ToUpper();
+            if (prodcode == "")
+            {
+                OperateResult.AppendText(">>请输入物料编号\n", Color.Red, input);
+                return;
+            }
+            bool found = false;
+            int newChecked = 0;
+            for (int i = 0; i < MakeMaterialDGV.Rows.Count; i++)
+            {
+                string rowCode = MakeMaterialDGV.Rows[i].Cells["mm_prodcode"].Value == null ? "" : MakeMaterialDGV.Rows[i].Cells["mm_prodcode"].Value.ToString().Trim().ToUpper();
+                if (rowCode == prodcode)
+                {
+                    found = true;
+                    //已标记过的行不重复计数
+                    if (MakeMaterialDGV.Rows[i].DefaultCellStyle.BackColor != CheckColor)
+                    {
+                        MakeMaterialDGV.Rows[i].DefaultCellStyle.BackColor = CheckColor;
+                        newChecked++;
+                    }
+                }
+            }
+            if (!found)
+            {
+                OperateResult.AppendText(">>物料" + prodcode + "不在当前工单的物料清单中\n", Color.Red, input);
+                return;
+            }
+            if (newChecked == 0)
+                OperateResult.AppendText(">>物料" + prodcode + "已核对过,不允许重复核对\n", Color.Black, input);
+            else
+                OperateResult.AppendText(">>物料" + prodcode + "核对成功,本次核对" + newChecked + "行\n", Color.Green, input);
+            UpdateCounts();
+            input.Clear();
+            input.Focus();
+        }
+
+        /// <summary>
+        /// 刷新底部统计:物料总数取DGV行数,已核对取绿色背景行数
+        /// </summary>
+        private void UpdateCounts()
+        {
+            int checkedCount = 0;
+            for (int i = 0; i < MakeMaterialDGV.Rows.Count; i++)
+            {
+                if (MakeMaterialDGV.Rows[i].DefaultCellStyle.BackColor == CheckColor)
+                    checkedCount++;
+            }
+            total_label.Text = "物料总数: " + MakeMaterialDGV.Rows.Count;
+            checked_label.Text = "已核对行数: " + checkedCount;
+        }
+    }
+}

+ 120 - 0
UAS_MES_YDCY/FunctionCode/Make/Make_MakeMaterialCheck.resx

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

+ 9 - 0
UAS_MES_YDCY/UAS_MES_YDCY.csproj

@@ -1018,6 +1018,12 @@
     <Compile Include="FunctionCode\Make\Make_MakeCancelDown.Designer.cs">
       <DependentUpon>Make_MakeCancelDown.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_MakeMaterialCheck.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_MakeMaterialCheck.Designer.cs">
+      <DependentUpon>Make_MakeMaterialCheck.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_MakeDown.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -2090,6 +2096,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_MakeCancelDown.resx">
       <DependentUpon>Make_MakeCancelDown.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_MakeMaterialCheck.resx">
+      <DependentUpon>Make_MakeMaterialCheck.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_MakeDown.resx">
       <DependentUpon>Make_MakeDown.cs</DependentUpon>
     </EmbeddedResource>