diff --git a/.vs/WinformGeneralDeveloperFrame/v16/.suo b/.vs/WinformGeneralDeveloperFrame/v16/.suo
index c321281..8926511 100644
Binary files a/.vs/WinformGeneralDeveloperFrame/v16/.suo and b/.vs/WinformGeneralDeveloperFrame/v16/.suo differ
diff --git a/DB/script.sql b/DB/script.sql
index 6984345..32f4e33 100644
Binary files a/DB/script.sql and b/DB/script.sql differ
diff --git a/WinformGeneralDeveloperFrame.Commons/Encrypt/Base64Util.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/Base64Util.cs
new file mode 100644
index 0000000..0d574bc
--- /dev/null
+++ b/WinformGeneralDeveloperFrame.Commons/Encrypt/Base64Util.cs
@@ -0,0 +1,292 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WinformGeneralDeveloperFrame.Commons
+{
+    /// <summary>
+    /// 基于Base64的加密编码辅助类，
+    /// 可以设置不同的密码表来获取不同的编码与解码
+    /// </summary>
+    public class Base64Util
+    {
+        /// <summary>
+        /// 构造函数，初始化编码表
+        /// </summary>
+        public Base64Util()
+        {
+            this.InitDict();
+        }
+
+        protected static Base64Util s_b64 = new Base64Util();
+
+        /// <summary>
+        /// 使用默认的密码表加密字符串
+        /// </summary>
+        /// <param name="input">待加密字符串</param>
+        /// <returns></returns>
+        public static string Encrypt(string input)
+        {
+            return s_b64.Encode(input);
+        }
+        /// <summary>
+        /// 使用默认的密码表解密字符串
+        /// </summary>
+        /// <param name="input">待解密字符串</param>
+        /// <returns></returns>
+        public static string Decrypt(string input)
+        {
+            return s_b64.Decode(input);
+        }
+
+        /// <summary>
+        /// 获取具有标准的Base64密码表的加密类
+        /// </summary>
+        /// <returns></returns>
+        public static Base64Util GetStandardBase64()
+        {
+            Base64Util b64 = new Base64Util();
+            b64.Pad = "=";
+            b64.CodeTable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+            return b64;
+        }
+
+        protected string m_codeTable = @"ABCDEFGHIJKLMNOPQRSTUVWXYZbacdefghijklmnopqrstu_wxyz0123456789*-";
+        protected string m_pad = "v";
+        protected Dictionary<int, char> m_t1 = new Dictionary<int, char>();
+        protected Dictionary<char, int> m_t2 = new Dictionary<char, int>();
+
+        /// <summary>
+        /// 密码表
+        /// </summary>
+        public string CodeTable
+        {
+            get { return m_codeTable; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new Exception("密码表不能为null");
+                }
+                else if (value.Length < 64)
+                {
+                    throw new Exception("密码表长度必须至少为64");
+                }
+                else
+                {
+                    this.ValidateRepeat(value);
+                    this.ValidateEqualPad(value, m_pad);
+                    m_codeTable = value;
+                    this.InitDict();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 补码
+        /// </summary>
+        public string Pad
+        {
+            get { return m_pad; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new Exception("密码表的补码不能为null");
+                }
+                else if (value.Length != 1)
+                {
+                    throw new Exception("密码表的补码长度必须为1");
+                }
+                else
+                {
+                    this.ValidateEqualPad(m_codeTable, value);
+                    m_pad = value;
+                    this.InitDict();
+                }
+            }
+        }
+
+        /// <summary>
+        /// 返回编码后的字符串
+        /// </summary>
+        /// <param name="source">原字符串</param>
+        /// <returns></returns>
+        public string Encode(string source)
+        {
+            if (source == null || source == "")
+            {
+                return "";
+            }
+            else
+            {
+                StringBuilder sb = new StringBuilder();
+                byte[] tmp = System.Text.UTF8Encoding.UTF8.GetBytes(source);
+                int remain = tmp.Length % 3;
+                int patch = 3 - remain;
+                if (remain != 0)
+                {
+                    Array.Resize(ref tmp, tmp.Length + patch);
+                }
+                int cnt = (int)Math.Ceiling(tmp.Length * 1.0 / 3);
+                for (int i = 0; i < cnt; i++)
+                {
+                    sb.Append(this.EncodeUnit(tmp[i * 3], tmp[i * 3 + 1], tmp[i * 3 + 2]));
+                }
+                if (remain != 0)
+                {
+                    sb.Remove(sb.Length - patch, patch);
+                    for (int i = 0; i < patch; i++)
+                    {
+                        sb.Append(m_pad);
+                    }
+                }
+                return sb.ToString();
+            }
+
+        }
+
+        protected string EncodeUnit(params byte[] unit)
+        {
+            int[] obj = new int[4];
+            obj[0] = (unit[0] & 0xfc) >> 2;
+            obj[1] = ((unit[0] & 0x03) << 4) + ((unit[1] & 0xf0) >> 4);
+            obj[2] = ((unit[1] & 0x0f) << 2) + ((unit[2] & 0xc0) >> 6);
+            obj[3] = unit[2] & 0x3f;
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < obj.Length; i++)
+            {
+                sb.Append(this.GetEC((int)obj[i]));
+            }
+            return sb.ToString();
+        }
+
+        protected char GetEC(int code)
+        {
+            return m_t1[code];//m_codeTable[code];
+        }
+
+        /// <summary>
+        /// 获得解码字符串
+        /// </summary>
+        /// <param name="source">原字符串</param>
+        /// <returns></returns>
+        public string Decode(string source)
+        {
+            if (source == null || source == "")
+            {
+                return "";
+            }
+            else
+            {
+                List<byte> list = new List<byte>();
+                char[] tmp = source.ToCharArray();
+                int remain = tmp.Length % 4;
+                if (remain != 0)
+                {
+                    Array.Resize(ref tmp, tmp.Length - remain);
+                }
+                int patch = source.IndexOf(m_pad);
+                if (patch != -1)
+                {
+                    patch = source.Length - patch;
+                }
+                int cnt = tmp.Length / 4;
+                for (int i = 0; i < cnt; i++)
+                {
+                    this.DecodeUnit(list, tmp[i * 4], tmp[i * 4 + 1], tmp[i * 4 + 2], tmp[i * 4 + 3]);
+                }
+                for (int i = 0; i < patch; i++)
+                {
+                    list.RemoveAt(list.Count - 1);
+                }
+                return System.Text.Encoding.UTF8.GetString(list.ToArray());
+            }
+        }
+
+        protected void DecodeUnit(List<byte> byteArr, params char[] chArray)
+        {
+            int[] res = new int[3];
+            byte[] unit = new byte[chArray.Length];
+            for (int i = 0; i < chArray.Length; i++)
+            {
+                unit[i] = this.FindChar(chArray[i]);
+            }
+            res[0] = (unit[0] << 2) + ((unit[1] & 0x30) >> 4);
+            res[1] = ((unit[1] & 0xf) << 4) + ((unit[2] & 0x3c) >> 2);
+            res[2] = ((unit[2] & 0x3) << 6) + unit[3];
+            for (int i = 0; i < res.Length; i++)
+            {
+                byteArr.Add((byte)res[i]);
+            }
+        }
+
+        protected byte FindChar(char ch)
+        {
+            int pos = m_t2[ch];//m_codeTable.IndexOf(ch);
+            return (byte)pos;
+        }
+
+        /// <summary>
+        /// 初始化双向哈希字典
+        /// </summary>
+        protected void InitDict()
+        {
+            m_t1.Clear();
+            m_t2.Clear();
+            m_t2.Add(m_pad[0], -1);
+            for (int i = 0; i < m_codeTable.Length; i++)
+            {
+                m_t1.Add(i, m_codeTable[i]);
+                m_t2.Add(m_codeTable[i], i);
+            }
+        }
+
+        /// <summary>
+        /// 检查字符串中的字符是否有重复
+        /// </summary>
+        /// <param name="input">待检查字符串</param>
+        /// <returns></returns>
+        protected void ValidateRepeat(string input)
+        {
+            for (int i = 0; i < input.Length; i++)
+            {
+                if (input.LastIndexOf(input[i]) > i)
+                {
+                    throw new Exception("密码表中含有重复字符：" + input[i]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 检查字符串是否包含补码字符
+        /// </summary>
+        /// <param name="input">待检查字符串</param>
+        /// <param name="pad"></param>
+        protected void ValidateEqualPad(string input, string pad)
+        {
+            if (input.IndexOf(pad) > -1)
+            {
+                throw new Exception("密码表中包含了补码字符：" + pad);
+            }
+        }
+
+        /// <summary>
+        /// 测试
+        /// </summary>
+        protected void Test()
+        {
+            //m_codeTable = @"STUVWXYZbacdefghivklABCDEFGHIJKLMNOPQRmnopqrstu!wxyz0123456789+/";
+            //m_pad = "j";
+
+            this.InitDict();
+
+            string test = "abc ABC 你好！◎＃￥％……!@#$%^";
+            string encode = this.Encode("false");
+            string decode = this.Decode(encode);
+            Console.WriteLine(encode);
+            Console.WriteLine(test == decode);
+        }
+    }
+}
+
diff --git a/WinformGeneralDeveloperFrame.Commons/Encrypt/EncodeHelper.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/EncodeHelper.cs
new file mode 100644
index 0000000..64e30cd
--- /dev/null
+++ b/WinformGeneralDeveloperFrame.Commons/Encrypt/EncodeHelper.cs
@@ -0,0 +1,620 @@
+using System;
+using System.Text;
+using System.IO;
+using System.Security.Cryptography;
+
+namespace WinformGeneralDeveloperFrame.Commons
+{
+    /// <summary>
+    /// DES�ԳƼӽ��ܡ�AES RijndaelManaged�ӽ��ܡ�Base64���ܽ��ܡ�MD5���ܵȲ���������
+    /// </summary>
+    public sealed class EncodeHelper
+    {
+        #region DES�ԳƼ��ܽ���
+        
+        /// <summary>
+        /// ע��DEFAULT_ENCRYPT_KEY�ij���Ϊ8λ(���Ҫ���ӻ��߼���key����,����IV�ij��Ⱦ�����) 
+        /// </summary>
+        public const string DEFAULT_ENCRYPT_KEY = "12345678";
+
+        /// <summary>
+        /// ʹ��Ĭ�ϼ���
+        /// </summary>
+        /// <param name="strText"></param>
+        /// <returns></returns>
+        public static string DesEncrypt(string strText)
+        {
+            try
+            {
+                return DesEncrypt(strText, DEFAULT_ENCRYPT_KEY);
+            }
+            catch
+            {
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// ʹ��Ĭ�Ͻ���
+        /// </summary>
+        /// <param name="strText">�����ַ���</param>
+        /// <returns></returns>
+        public static string DesDecrypt(string strText)
+        {
+            try
+            {
+                return DesDecrypt(strText, DEFAULT_ENCRYPT_KEY);
+            }
+            catch
+            {
+                return "";
+            }
+        }
+
+        /// <summary> 
+        /// �����ַ���,ע��strEncrKey�ij���Ϊ8λ
+        /// </summary> 
+        /// <param name="strText">�������ַ���</param> 
+        /// <param name="strEncrKey">���ܼ�</param> 
+        /// <returns></returns> 
+        public static string DesEncrypt(string strText, string strEncrKey)
+        {
+            byte[] byKey = null;
+            byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF };
+
+            byKey = Encoding.UTF8.GetBytes(strEncrKey.Substring(0, 8));
+            DESCryptoServiceProvider des = new DESCryptoServiceProvider();
+            byte[] inputByteArray = Encoding.UTF8.GetBytes(strText);
+            MemoryStream ms = new MemoryStream();
+            CryptoStream cs = new CryptoStream(ms, des.CreateEncryptor(byKey, IV), CryptoStreamMode.Write);
+            cs.Write(inputByteArray, 0, inputByteArray.Length);
+            cs.FlushFinalBlock();
+            return Convert.ToBase64String(ms.ToArray());
+        }
+
+        /// <summary> 
+        /// �����ַ���,ע��strEncrKey�ij���Ϊ8λ
+        /// </summary> 
+        /// <param name="strText">�����ܵ��ַ���</param> 
+        /// <param name="sDecrKey">���ܼ�</param> 
+        /// <returns>���ܺ���ַ���</returns> 
+        public static string DesDecrypt(string strText, string sDecrKey)
+        {
+            byte[] byKey = null;
+            byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF };
+            byte[] inputByteArray = new Byte[strText.Length];
+
+            byKey = Encoding.UTF8.GetBytes(sDecrKey.Substring(0, 8));
+            DESCryptoServiceProvider des = new DESCryptoServiceProvider();
+            inputByteArray = Convert.FromBase64String(strText);
+            MemoryStream ms = new MemoryStream();
+            CryptoStream cs = new CryptoStream(ms, des.CreateDecryptor(byKey, IV), CryptoStreamMode.Write);
+            cs.Write(inputByteArray, 0, inputByteArray.Length);
+            cs.FlushFinalBlock();
+            Encoding encoding = new UTF8Encoding();
+            return encoding.GetString(ms.ToArray());
+        }
+
+        /// <summary> 
+        /// ���������ļ�,ע��strEncrKey�ij���Ϊ8λ
+        /// </summary> 
+        /// <param name="m_InFilePath">�����ܵ��ļ�·��</param> 
+        /// <param name="m_OutFilePath">����ļ�·��</param> 
+        /// <param name="strEncrKey">���ܼ�</param> 
+        public static void DesEncrypt(string m_InFilePath, string m_OutFilePath, string strEncrKey)
+        {
+            byte[] byKey = null;
+            byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF };
+
+            byKey = Encoding.UTF8.GetBytes(strEncrKey.Substring(0, 8));
+            FileStream fin = new FileStream(m_InFilePath, FileMode.Open, FileAccess.Read);
+            FileStream fout = new FileStream(m_OutFilePath, FileMode.OpenOrCreate, FileAccess.Write);
+            fout.SetLength(0);
+            //Create variables to help with read and write. 
+            byte[] bin = new byte[100]; //This is intermediate storage for the encryption. 
+            long rdlen = 0; //This is the total number of bytes written. 
+            long totlen = fin.Length; //This is the total length of the input file. 
+            int len; //This is the number of bytes to be written at a time. 
+
+            DES des = new DESCryptoServiceProvider();
+            CryptoStream encStream = new CryptoStream(fout, des.CreateEncryptor(byKey, IV), CryptoStreamMode.Write);
+
+            //Read from the input file, then encrypt and write to the output file. 
+            while (rdlen < totlen)
+            {
+                len = fin.Read(bin, 0, 100);
+                encStream.Write(bin, 0, len);
+                rdlen = rdlen + len;
+            }
+            encStream.Close();
+            fout.Close();
+            fin.Close();
+        }
+
+        /// <summary> 
+        /// ���������ļ�,ע��strEncrKey�ij���Ϊ8λ
+        /// </summary> 
+        /// <param name="m_InFilePath">�����ܵ��ļ�·��</param> 
+        /// <param name="m_OutFilePath">���·��</param> 
+        /// <param name="sDecrKey">���ܼ�</param> 
+        public static void DesDecrypt(string m_InFilePath, string m_OutFilePath, string sDecrKey)
+        {
+            byte[] byKey = null;
+            byte[] IV = { 0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF };
+
+            byKey = Encoding.UTF8.GetBytes(sDecrKey.Substring(0, 8));
+            FileStream fin = new FileStream(m_InFilePath, FileMode.Open, FileAccess.Read);
+            FileStream fout = new FileStream(m_OutFilePath, FileMode.OpenOrCreate, FileAccess.Write);
+            fout.SetLength(0);
+            //Create variables to help with read and write. 
+            byte[] bin = new byte[100]; //This is intermediate storage for the encryption. 
+            long rdlen = 0; //This is the total number of bytes written. 
+            long totlen = fin.Length; //This is the total length of the input file. 
+            int len; //This is the number of bytes to be written at a time. 
+
+            DES des = new DESCryptoServiceProvider();
+            CryptoStream encStream = new CryptoStream(fout, des.CreateDecryptor(byKey, IV), CryptoStreamMode.Write);
+
+            //Read from the input file, then encrypt and write to the output file. 
+            while (rdlen < totlen)
+            {
+                len = fin.Read(bin, 0, 100);
+                encStream.Write(bin, 0, len);
+                rdlen = rdlen + len;
+            }
+            encStream.Close();
+            fout.Close();
+            fin.Close();
+        } 
+        #endregion
+
+        #region �ԳƼ����㷨AES RijndaelManaged���ܽ���
+        private static readonly string Default_AES_Key = "@#kim123";
+        private static byte[] Keys = { 0x41, 0x72, 0x65, 0x79, 0x6F, 0x75, 0x6D, 0x79,
+                                             0x53,0x6E, 0x6F, 0x77, 0x6D, 0x61, 0x6E, 0x3F };
+
+        /// <summary>
+        /// �ԳƼ����㷨AES RijndaelManaged����(RijndaelManaged��AES���㷨�ǿ�ʽ�����㷨)
+        /// </summary>
+        /// <param name="encryptString">�������ַ���</param>
+        /// <returns>���ܽ���ַ���</returns>
+        public static string AES_Encrypt(string encryptString)
+        {
+            return AES_Encrypt(encryptString, Default_AES_Key);
+        }
+
+        /// <summary>
+        /// �ԳƼ����㷨AES RijndaelManaged����(RijndaelManaged��AES���㷨�ǿ�ʽ�����㷨)
+        /// </summary>
+        /// <param name="encryptString">�������ַ���</param>
+        /// <param name="encryptKey">������Կ�������ַ�</param>
+        /// <returns>���ܽ���ַ���</returns>
+        public static string AES_Encrypt(string encryptString, string encryptKey)
+        {
+            encryptKey = GetSubString(encryptKey, 32, "");
+            encryptKey = encryptKey.PadRight(32, ' ');
+
+            RijndaelManaged rijndaelProvider = new RijndaelManaged();
+            rijndaelProvider.Key = Encoding.UTF8.GetBytes(encryptKey.Substring(0, 32));
+            rijndaelProvider.IV = Keys;
+            ICryptoTransform rijndaelEncrypt = rijndaelProvider.CreateEncryptor();
+
+            byte[] inputData = Encoding.UTF8.GetBytes(encryptString);
+            byte[] encryptedData = rijndaelEncrypt.TransformFinalBlock(inputData, 0, inputData.Length);
+
+            return Convert.ToBase64String(encryptedData);
+        }
+
+        /// <summary>
+        /// �ԳƼ����㷨AES RijndaelManaged�����ַ���
+        /// </summary>
+        /// <param name="decryptString">�����ܵ��ַ���</param>
+        /// <returns>���ܳɹ����ؽ��ܺ���ַ���,ʧ�ܷ�Դ��</returns>
+        public static string AES_Decrypt(string decryptString)
+        {
+            return AES_Decrypt(decryptString, Default_AES_Key);
+        }
+
+        /// <summary>
+        /// �ԳƼ����㷨AES RijndaelManaged�����ַ���
+        /// </summary>
+        /// <param name="decryptString">�����ܵ��ַ���</param>
+        /// <param name="decryptKey">������Կ,�ͼ�����Կ��ͬ</param>
+        /// <returns>���ܳɹ����ؽ��ܺ���ַ���,ʧ�ܷ��ؿ�</returns>
+        public static string AES_Decrypt(string decryptString, string decryptKey)
+        {
+            try
+            {
+                decryptKey = GetSubString(decryptKey, 32, "");
+                decryptKey = decryptKey.PadRight(32, ' ');
+
+                RijndaelManaged rijndaelProvider = new RijndaelManaged();
+                rijndaelProvider.Key = Encoding.UTF8.GetBytes(decryptKey);
+                rijndaelProvider.IV = Keys;
+                ICryptoTransform rijndaelDecrypt = rijndaelProvider.CreateDecryptor();
+
+                byte[] inputData = Convert.FromBase64String(decryptString);
+                byte[] decryptedData = rijndaelDecrypt.TransformFinalBlock(inputData, 0, inputData.Length);
+
+                return Encoding.UTF8.GetString(decryptedData);
+            }
+            catch
+            {
+                return string.Empty;
+            }
+        }
+
+        /// <summary>
+        /// ���ֽڳ���(���ֽ�,һ������Ϊ2���ֽ�)ȡ��ij�ַ�����һ����
+        /// </summary>
+        /// <param name="sourceString">Դ�ַ���</param>
+        /// <param name="length">��ȡ�ַ����ֽڳ���</param>
+        /// <param name="tailString">�����ַ���(���ַ���������ʱ��β�������ӵ��ַ�����һ��Ϊ"...")</param>
+        /// <returns>ij�ַ�����һ����</returns>
+        private static string GetSubString(string sourceString, int length, string tailString)
+        {
+            return GetSubString(sourceString, 0, length, tailString);
+        }
+
+        /// <summary>
+        /// ���ֽڳ���(���ֽ�,һ������Ϊ2���ֽ�)ȡ��ij�ַ�����һ����
+        /// </summary>
+        /// <param name="sourceString">Դ�ַ���</param>
+        /// <param name="startIndex">����λ�ã���0��ʼ</param>
+        /// <param name="length">��ȡ�ַ����ֽڳ���</param>
+        /// <param name="tailString">�����ַ���(���ַ���������ʱ��β�������ӵ��ַ�����һ��Ϊ"...")</param>
+        /// <returns>ij�ַ�����һ����</returns>
+        private static string GetSubString(string sourceString, int startIndex, int length, string tailString)
+        {
+            string myResult = sourceString;
+
+            //�������Ļ���ʱ(ע:���ĵķ�Χ:\u4e00 - \u9fa5, ������\u0800 - \u4e00, ����Ϊ\xAC00-\xD7A3)
+            if (System.Text.RegularExpressions.Regex.IsMatch(sourceString, "[\u0800-\u4e00]+") ||
+                System.Text.RegularExpressions.Regex.IsMatch(sourceString, "[\xAC00-\xD7A3]+"))
+            {
+                //����ȡ����ʼλ�ó����ֶδ�����ʱ
+                if (startIndex >= sourceString.Length)
+                {
+                    return string.Empty;
+                }
+                else
+                {
+                    return sourceString.Substring(startIndex,
+                                                   ((length + startIndex) > sourceString.Length) ? (sourceString.Length - startIndex) : length);
+                }
+            }
+
+            //�����ַ�����"�й�����abcd123"
+            if (length <= 0)
+            {
+                return string.Empty;
+            }
+            byte[] bytesSource = Encoding.Default.GetBytes(sourceString);
+
+            //���ַ������ȴ�����ʼλ��
+            if (bytesSource.Length > startIndex)
+            {
+                int endIndex = bytesSource.Length;
+
+                //��Ҫ��ȡ�ij������ַ�������Ч���ȷ�Χ��
+                if (bytesSource.Length > (startIndex + length))
+                {
+                    endIndex = length + startIndex;
+                }
+                else
+                {   //��������Ч��Χ��ʱ,ֻȡ���ַ����Ľ�β
+                    length = bytesSource.Length - startIndex;
+                    tailString = "";
+                }
+
+                int[] anResultFlag = new int[length];
+                int nFlag = 0;
+                //�ֽڴ���127Ϊ˫�ֽ��ַ�
+                for (int i = startIndex; i < endIndex; i++)
+                {
+                    if (bytesSource[i] > 127)
+                    {
+                        nFlag++;
+                        if (nFlag == 3)
+                        {
+                            nFlag = 1;
+                        }
+                    }
+                    else
+                    {
+                        nFlag = 0;
+                    }
+                    anResultFlag[i] = nFlag;
+                }
+                //���һ���ֽ�Ϊ˫�ֽ��ַ���һ��
+                if ((bytesSource[endIndex - 1] > 127) && (anResultFlag[length - 1] == 1))
+                {
+                    length = length + 1;
+                }
+
+                byte[] bsResult = new byte[length];
+                Array.Copy(bytesSource, startIndex, bsResult, 0, length);
+                myResult = Encoding.Default.GetString(bsResult);
+                myResult = myResult + tailString;
+
+                return myResult;
+            }
+
+            return string.Empty;
+
+        }
+
+        /// <summary>
+        /// �����ļ���
+        /// </summary>
+        /// <param name="fs">�ļ�������</param>
+        /// <param name="encryptKey">���ܼ�</param>
+        /// <returns></returns>
+        public static CryptoStream AES_EncryptStrream(FileStream fs, string encryptKey)
+        {
+            encryptKey = GetSubString(encryptKey, 32, "");
+            encryptKey = encryptKey.PadRight(32, ' ');
+
+            RijndaelManaged rijndaelProvider = new RijndaelManaged();
+            rijndaelProvider.Key = Encoding.UTF8.GetBytes(encryptKey);
+            rijndaelProvider.IV = Keys;
+
+            ICryptoTransform encrypto = rijndaelProvider.CreateEncryptor();
+            CryptoStream cytptostreamEncr = new CryptoStream(fs, encrypto, CryptoStreamMode.Write);
+            return cytptostreamEncr;
+        }
+
+        /// <summary>
+        /// �����ļ���
+        /// </summary>
+        /// <param name="fs">�ļ�������</param>
+        /// <param name="decryptKey">���ܼ�</param>
+        /// <returns></returns>
+        public static CryptoStream AES_DecryptStream(FileStream fs, string decryptKey)
+        {
+            decryptKey = GetSubString(decryptKey, 32, "");
+            decryptKey = decryptKey.PadRight(32, ' ');
+
+            RijndaelManaged rijndaelProvider = new RijndaelManaged();
+            rijndaelProvider.Key = Encoding.UTF8.GetBytes(decryptKey);
+            rijndaelProvider.IV = Keys;
+            ICryptoTransform Decrypto = rijndaelProvider.CreateDecryptor();
+            CryptoStream cytptostreamDecr = new CryptoStream(fs, Decrypto, CryptoStreamMode.Read);
+            return cytptostreamDecr;
+        }
+
+        /// <summary>
+        /// ��ָ���ļ�����
+        /// </summary>
+        /// <param name="InputFile">�����ļ�</param>
+        /// <param name="OutputFile">����ļ�</param>
+        /// <returns></returns>
+        public static bool AES_EncryptFile(string InputFile, string OutputFile)
+        {
+            try
+            {
+                string decryptKey = "www.iqidi.com";
+
+                FileStream fr = new FileStream(InputFile, FileMode.Open);
+                FileStream fren = new FileStream(OutputFile, FileMode.Create);
+                CryptoStream Enfr = AES_EncryptStrream(fren, decryptKey);
+                byte[] bytearrayinput = new byte[fr.Length];
+                fr.Read(bytearrayinput, 0, bytearrayinput.Length);
+                Enfr.Write(bytearrayinput, 0, bytearrayinput.Length);
+                Enfr.Close();
+                fr.Close();
+                fren.Close();
+            }
+            catch
+            {
+                //�ļ��쳣
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// ��ָ�����ļ���ѹ��
+        /// </summary>
+        /// <param name="InputFile">�����ļ�</param>
+        /// <param name="OutputFile">����ļ�</param>
+        /// <returns></returns>
+        public static bool AES_DecryptFile(string InputFile, string OutputFile)
+        {
+            try
+            {
+                string decryptKey = "www.iqidi.com";
+                FileStream fr = new FileStream(InputFile, FileMode.Open);
+                FileStream frde = new FileStream(OutputFile, FileMode.Create);
+                CryptoStream Defr = AES_DecryptStream(fr, decryptKey);
+                byte[] bytearrayoutput = new byte[1024];
+                int m_count = 0;
+
+                do
+                {
+                    m_count = Defr.Read(bytearrayoutput, 0, bytearrayoutput.Length);
+                    frde.Write(bytearrayoutput, 0, m_count);
+                    if (m_count < bytearrayoutput.Length)
+                        break;
+                } while (true);
+
+                Defr.Close();
+                fr.Close();
+                frde.Close();
+            }
+            catch
+            {
+                //�ļ��쳣
+                return false;
+            }
+            return true;
+        }
+        
+        #endregion
+
+        #region Base64���ܽ���
+        /// <summary>
+        /// Base64��һ�Nʹ��64����λ��Ӌ��������ʹ��2�����η�������H����ӡ��ASCII ��Ԫ��
+        /// �@ʹ�����Á���������]���Ă�ݔ���a����Base64�е�׃��ʹ����ԪA-Z��a-z��0-9 ��
+        /// �@�ӹ���62����Ԫ���Á������_ʼ��64�����֣�����ɂ��Á����锵�ֵķ�̖�ڲ�ͬ��
+        /// ϵ�y�ж���ͬ��
+        /// Base64����
+        /// </summary>
+        /// <param name="str">Base64��ʽ�����ַ���</param>
+        /// <returns></returns>
+        public static string Base64Encrypt(string str)
+        {
+            byte[] encbuff = System.Text.Encoding.UTF8.GetBytes(str);
+            return Convert.ToBase64String(encbuff);
+        }
+
+        /// <summary>
+        /// Base64�����ַ���
+        /// </summary>
+        /// <param name="str">�����ܵ��ַ���</param>
+        /// <returns></returns>
+        public static string Base64Decrypt(string str)
+        {
+            byte[] decbuff = Convert.FromBase64String(str);
+            return System.Text.Encoding.UTF8.GetString(decbuff);
+        } 
+        #endregion
+
+        #region MD5����
+
+        /// <summary> 
+        /// ʹ��MD5�����ַ���
+        /// </summary> 
+        /// <param name="strText">�����ܵ��ַ���</param> 
+        /// <returns>MD5���ܺ���ַ���</returns> 
+        public static string MD5Encrypt(string strText)
+        {
+            MD5 md5 = new MD5CryptoServiceProvider();
+            byte[] result = md5.ComputeHash(Encoding.Default.GetBytes(strText));
+            return Encoding.Default.GetString(result);
+        }
+
+        /// <summary>
+        /// ʹ��MD5���ܵ�Hash��
+        /// </summary>
+        /// <param name="input">�������ַ���</param>
+        /// <returns></returns>
+        public static string MD5EncryptHash(String input)
+        {
+            MD5 md5 = new MD5CryptoServiceProvider();
+            //the GetBytes method returns byte array equavalent of a string
+            byte[] res = md5.ComputeHash(Encoding.Default.GetBytes(input), 0, input.Length);
+            char[] temp = new char[res.Length];
+            //copy to a char array which can be passed to a String constructor
+            Array.Copy(res, temp, res.Length);
+            //return the result as a string
+            return new String(temp);
+        }
+
+        /// <summary>
+        /// ʹ��Md5����Ϊ16�����ַ���
+        /// </summary>
+        /// <param name="input">�������ַ���</param>
+        /// <returns></returns>
+        public static string MD5EncryptHashHex(String input)
+        {
+            MD5 md5 = new MD5CryptoServiceProvider();
+            //the GetBytes method returns byte array equavalent of a string
+            byte[] res = md5.ComputeHash(Encoding.Default.GetBytes(input), 0, input.Length);
+
+            String returnThis = string.Empty;
+
+            for (int i = 0; i < res.Length; i++)
+            {
+                returnThis += Uri.HexEscape((char)res[i]);
+            }
+            returnThis = returnThis.Replace("%", "");
+            returnThis = returnThis.ToLower();
+
+            return returnThis;
+        }
+
+        /// <summary>
+        /// MD5 ���μ����㷨.�������: (QQʹ��)
+        /// 1. ��֤��תΪ��д
+        /// 2. ������ʹ����������������μ��ܺ�,����֤����е���
+        /// 3. Ȼ�󽫵��Ӻ�������ٴ�MD5һ��,�õ�������֤���ֵ
+        /// </summary>
+        /// <param name="s">�������ַ���</param>
+        /// <returns></returns>
+        public static string EncyptMD5_3_16(string s)
+        {
+            MD5 md5 = MD5CryptoServiceProvider.Create();
+            byte[] bytes = System.Text.Encoding.ASCII.GetBytes(s);
+            byte[] bytes1 = md5.ComputeHash(bytes);
+            byte[] bytes2 = md5.ComputeHash(bytes1);
+            byte[] bytes3 = md5.ComputeHash(bytes2);
+
+            StringBuilder sb = new StringBuilder();
+            foreach (var item in bytes3)
+            {
+                sb.Append(item.ToString("x").PadLeft(2, '0'));
+            }
+            return sb.ToString().ToUpper();
+        }
+        #endregion
+
+        /// <summary>
+        /// SHA256����
+        /// </summary>
+        /// <param name="str">ԭʼ�ַ���</param>
+        /// <returns>SHA256���(���س���Ϊ44�ֽڵ��ַ���)</returns>
+        public static string SHA256(string str)
+        {
+            byte[] SHA256Data = Encoding.UTF8.GetBytes(str);
+            SHA256Managed Sha256 = new SHA256Managed();
+            byte[] Result = Sha256.ComputeHash(SHA256Data);
+            return Convert.ToBase64String(Result);  //���س���Ϊ44�ֽڵ��ַ���
+        }
+
+        /// <summary>
+        /// �����ַ���
+        /// </summary>
+        /// <param name="input">�����ܵ��ַ���</param>
+        /// <returns></returns>
+        public static string EncryptString(string input)
+        {
+            return MD5Utils.AddMD5Profix(Base64Util.Encrypt(MD5Utils.AddMD5Profix(input)));
+            //return Base64.Encrypt(MD5.AddMD5Profix(Base64.Encrypt(input)));
+        }
+
+        /// <summary>
+        /// ���ܼӹ��ܵ��ַ���
+        /// </summary>
+        /// <param name="input">�����ܵ��ַ���</param>
+        /// <param name="throwException">����ʧ���Ƿ����쳣</param>
+        /// <returns></returns>
+        public static string DecryptString(string input, bool throwException)
+        {
+            string res = "";
+            try
+            {
+                res = input;// Base64.Decrypt(input);
+                if (MD5Utils.ValidateValue(res))
+                {
+                    return MD5Utils.RemoveMD5Profix(Base64Util.Decrypt(MD5Utils.RemoveMD5Profix(res)));
+                }
+                else
+                {
+                    throw new Exception("�ַ����޷�ת���ɹ���");
+                }
+            }
+            catch
+            {
+                if (throwException)
+                {
+                    throw;
+                }
+                else
+                {
+                    return "";
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame.Commons/MD5Utils.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/MD5Utils.cs
similarity index 100%
rename from WinformGeneralDeveloperFrame.Commons/MD5Utils.cs
rename to WinformGeneralDeveloperFrame.Commons/Encrypt/MD5Utils.cs
diff --git a/WinformGeneralDeveloperFrame.Commons/Encrypt/QQEncryptUtil.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/QQEncryptUtil.cs
new file mode 100644
index 0000000..b793561
--- /dev/null
+++ b/WinformGeneralDeveloperFrame.Commons/Encrypt/QQEncryptUtil.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WinformGeneralDeveloperFrame.Commons
+{
+    /// <summary>
+    /// QQ密码加密操作辅助类
+    /// </summary>
+    public class QQEncryptUtil
+    {
+        /// <summary>
+        /// QQ根据密码及验证码对数据进行加密
+        /// </summary>
+        /// <param name="password">原始密码</param>
+        /// <param name="verifyCode">验证码</param>
+        /// <returns></returns>
+        public static string EncodePasswordWithVerifyCode(string password, string verifyCode)
+        {
+            return MD5(MD5_3(password) + verifyCode.ToUpper());
+        }
+
+        static string MD5_3(string arg)
+        {
+            System.Security.Cryptography.MD5 md5 = System.Security.Cryptography.MD5.Create();
+
+            byte[] buffer = System.Text.Encoding.ASCII.GetBytes(arg);
+            buffer = md5.ComputeHash(buffer);
+            buffer = md5.ComputeHash(buffer);
+            buffer = md5.ComputeHash(buffer);
+
+            return BitConverter.ToString(buffer).Replace("-", "").ToUpper();
+        }
+        static string MD5(string arg)
+        {
+            System.Security.Cryptography.MD5 md5 = System.Security.Cryptography.MD5.Create();
+
+            byte[] buffer = System.Text.Encoding.ASCII.GetBytes(arg);
+            buffer = md5.ComputeHash(buffer);
+
+            return BitConverter.ToString(buffer).Replace("-", "").ToUpper();
+        }
+    }
+}
diff --git a/WinformGeneralDeveloperFrame.Commons/Encrypt/RSASecurityHelper.cs b/WinformGeneralDeveloperFrame.Commons/Encrypt/RSASecurityHelper.cs
new file mode 100644
index 0000000..55f2c41
--- /dev/null
+++ b/WinformGeneralDeveloperFrame.Commons/Encrypt/RSASecurityHelper.cs
@@ -0,0 +1,239 @@
+using System;
+using System.Security.Cryptography;
+using System.Text;
+using System.IO;
+
+namespace WinformGeneralDeveloperFrame.Commons
+{
+    /// <summary>
+    /// �ǶԳƼ��ܡ����ܡ���֤������
+    /// </summary>
+    public class RSASecurityHelper
+    {
+        /// <summary>
+        /// �ǶԳƼ������ɵ�˽Կ�͹�Կ 
+        /// </summary>
+        /// <param name="privateKey">˽Կ</param>
+        /// <param name="publicKey">��Կ</param>
+        public static void GenerateRSAKey(out string privateKey, out string publicKey)
+        {
+            RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
+            privateKey = rsa.ToXmlString(true);
+            publicKey = rsa.ToXmlString(false);
+        }
+        
+        #region �ǶԳ����ݼ��ܣ���Կ���ܣ�
+
+        /// <summary>
+        /// �ǶԳƼ����ַ������ݣ����ؼ��ܺ������
+        /// </summary>
+        /// <param name="publicKey">��Կ</param>
+        /// <param name="originalString">�����ܵ��ַ���</param>
+        /// <returns>���ܺ������</returns>
+        public static string RSAEncrypt(string publicKey, string originalString)
+        {
+            byte[] PlainTextBArray;
+            byte[] CypherTextBArray;
+            string Result;
+            RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
+            rsa.FromXmlString(publicKey);
+            PlainTextBArray = (new UnicodeEncoding()).GetBytes(originalString);
+            CypherTextBArray = rsa.Encrypt(PlainTextBArray, false);
+            Result = Convert.ToBase64String(CypherTextBArray);
+            return Result;
+        }
+
+        /// <summary>
+        /// �ǶԳƼ����ֽ����飬���ؼ��ܺ������
+        /// </summary>
+        /// <param name="publicKey">��Կ</param>
+        /// <param name="originalBytes">�����ܵ��ֽ�����</param>
+        /// <returns>���ؼ��ܺ������</returns>
+        public static string RSAEncrypt(string publicKey, byte[] originalBytes)
+        {
+            byte[] CypherTextBArray;
+            string Result;
+            RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
+            rsa.FromXmlString(publicKey);
+            CypherTextBArray = rsa.Encrypt(originalBytes, false);
+            Result = Convert.ToBase64String(CypherTextBArray);
+            return Result;
+        } 
+
+        #endregion
+
+        #region �ǶԳƽ��ܣ�˽Կ���ܣ�
+
+        /// <summary>
+        /// �ǶԳƽ����ַ��������ؽ��ܺ������
+        /// </summary>
+        /// <param name="privateKey">˽Կ</param>
+        /// <param name="encryptedString">����������</param>
+        /// <returns>���ؽ��ܺ������</returns>
+        public static string RSADecrypt(string privateKey, string encryptedString)
+        {
+            byte[] PlainTextBArray;
+            byte[] DypherTextBArray;
+            string Result;
+            System.Security.Cryptography.RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
+            rsa.FromXmlString(privateKey);
+            PlainTextBArray = Convert.FromBase64String(encryptedString);
+            DypherTextBArray = rsa.Decrypt(PlainTextBArray, false);
+            Result = (new UnicodeEncoding()).GetString(DypherTextBArray);
+            return Result;
+        }
+
+        /// <summary>
+        /// �ǶԳƽ����ֽ����飬���ؽ��ܺ������
+        /// </summary>
+        /// <param name="privateKey">˽Կ</param>
+        /// <param name="encryptedBytes">����������</param>
+        /// <returns></returns>
+        public static string RSADecrypt(string privateKey, byte[] encryptedBytes)
+        {
+            byte[] DypherTextBArray;
+            string Result;
+            System.Security.Cryptography.RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
+            rsa.FromXmlString(privateKey);
+            DypherTextBArray = rsa.Decrypt(encryptedBytes, false);
+            Result = (new UnicodeEncoding()).GetString(DypherTextBArray);
+            return Result;
+        } 
+        #endregion
+
+        #region �ǶԳƼ���ǩ������֤
+
+        /// <summary>
+        /// ʹ�÷ǶԳƼ���ǩ������
+        /// </summary>
+        /// <param name="privateKey">˽Կ</param>
+        /// <param name="originalString">�����ܵ��ַ���</param>
+        /// <returns>���ܺ������</returns>
+        public static string RSAEncrypSignature(string privateKey, string originalString)
+        {
+            string signature;
+            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+            {
+                rsa.FromXmlString(privateKey); //˽Կ
+                // ���ܶ��� 
+                RSAPKCS1SignatureFormatter f = new RSAPKCS1SignatureFormatter(rsa);
+                f.SetHashAlgorithm("SHA1");
+                byte[] source = ASCIIEncoding.ASCII.GetBytes(originalString);
+                SHA1Managed sha = new SHA1Managed();
+                byte[] result = sha.ComputeHash(source);
+                byte[] b = f.CreateSignature(result);
+                signature = Convert.ToBase64String(b);
+            }
+            return signature;
+        }
+              
+        /// <summary>
+        /// ��˽Կ����ǩ�����ַ�����ʹ�ù�Կ���������֤
+        /// </summary>
+        /// <param name="originalString">δ���ܵ��ı����������</param>
+        /// <param name="encrytedString">���ܺ���ı�����ע�����к�</param>
+        /// <returns>�����֤�ɹ�����True������ΪFalse</returns>
+        //public static bool Validate(string originalString, string encrytedString)
+        //{
+        //    return Validate(originalString, encrytedString, UIConstants.PublicKey);
+        //}
+
+        /// <summary>
+        /// ��˽Կ���ܵ��ַ�����ʹ�ù�Կ���������֤
+        /// </summary>
+        /// <param name="originalString">δ���ܵ��ı����������</param>
+        /// <param name="encrytedString">���ܺ���ı�����ע�����к�</param>
+        /// <param name="publicKey">�ǶԳƼ��ܵĹ�Կ</param>
+        /// <returns>�����֤�ɹ�����True������ΪFalse</returns>
+        public static bool Validate(string originalString, string encrytedString, string publicKey)
+        {
+            bool bPassed = false;
+            using (RSACryptoServiceProvider rsa = new RSACryptoServiceProvider())
+            {
+                try
+                {
+                    rsa.FromXmlString(publicKey); //��Կ
+                    RSAPKCS1SignatureDeformatter formatter = new RSAPKCS1SignatureDeformatter(rsa);
+                    formatter.SetHashAlgorithm("SHA1");
+
+                    byte[] key = Convert.FromBase64String(encrytedString); //��֤
+                    SHA1Managed sha = new SHA1Managed();
+                    byte[] name = sha.ComputeHash(ASCIIEncoding.ASCII.GetBytes(originalString));
+                    if (formatter.VerifySignature(name, key))
+                    {
+                        bPassed = true;
+                    }
+                }
+                catch
+                {
+                }
+            }
+            return bPassed;
+        }
+
+        #endregion
+
+        #region Hash ����
+
+        /// <summary> Hash ���� </summary>
+        /// <param name="str2Hash"></param>
+        /// <returns></returns>
+        public static int HashEncrypt(string str2Hash)
+        {
+            const int salt = 100716;    // ��ֵ
+            str2Hash += "Commons";       // ����һ�������ַ���
+
+            int len = str2Hash.Length;
+            int result = (str2Hash[len - 1] - 31) * 95 + salt;
+            for (int i = 0; i < len - 1; i++)
+            {
+                result = (result * 95) + (str2Hash[i] - 32);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// MD5����
+        /// </summary>
+        /// <param name="str">�������ִ�</param>
+        /// <returns>���ܺ���ִ�</returns>
+        public static string ComputeMD5(string str)
+        {
+            byte[] hashValue = ComputeMD5Data(str);
+            return BitConverter.ToString(hashValue).Replace("-", "");
+        }
+
+        /// <summary>
+        /// MD5����
+        /// </summary>
+        /// <param name="input">�������ִ�</param>
+        /// <returns>���ܺ���ִ�</returns>
+        public static byte[] ComputeMD5Data(string input)
+        {
+            byte[] buffer = Encoding.UTF8.GetBytes(input);
+            return MD5.Create().ComputeHash(buffer);
+        }
+
+        /// <summary>
+        /// MD5����
+        /// </summary>
+        /// <param name="data">����������</param>
+        /// <returns>���ܺ���ִ�</returns>
+        public static byte[] ComputeMD5Data(byte[] data)
+        {
+            return MD5.Create().ComputeHash(data);
+        }
+
+        /// <summary>
+        /// MD5����
+        /// </summary>
+        /// <param name="stream">��������</param>
+        /// <returns>���ܺ���ִ�</returns>
+        public static byte[] ComputeMD5Data(Stream stream)
+        {
+            return MD5.Create().ComputeHash(stream);
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs b/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs
index 20c1a94..fdbec5d 100644
--- a/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs
+++ b/WinformGeneralDeveloperFrame.Commons/GetDataTableUtils.cs
@@ -17,7 +17,7 @@ namespace WinformGeneralDeveloperFrame.Commons
 
         public static DataTable SqlTable(string name)
         {
-            string connstring = ConfigurationManager.ConnectionStrings["DB"].ConnectionString;
+            string connstring = EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString);
             string sql = "";
             string url = "";
             DataTable dt1 = new DataTable();
@@ -45,5 +45,20 @@ namespace WinformGeneralDeveloperFrame.Commons
             }
             return dt;
         }
+
+        public static DataTable SqlTableBySql(string sql)
+        {
+            string connstring = EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString);
+            DataTable dt = new DataTable();
+            using (var con = new SqlConnection(connstring))
+            {
+                con.Open();
+                SqlCommand cmd = new SqlCommand(sql, con);
+                cmd.CommandType = CommandType.Text;
+                SqlDataAdapter sqlda = new SqlDataAdapter(cmd);
+                sqlda.Fill(dt);
+            }
+            return dt;
+        }
     }
 }
diff --git a/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj b/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj
index 71d1d2a..f129f5c 100644
--- a/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj
+++ b/WinformGeneralDeveloperFrame.Commons/WinformGeneralDeveloperFrame.Commons.csproj
@@ -57,11 +57,15 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ConvertHelper.cs" />
+    <Compile Include="Encrypt\Base64Util.cs" />
+    <Compile Include="Encrypt\EncodeHelper.cs" />
+    <Compile Include="Encrypt\QQEncryptUtil.cs" />
+    <Compile Include="Encrypt\RSASecurityHelper.cs" />
     <Compile Include="ExtensionMethod.cs" />
     <Compile Include="FileDialogHelper.cs" />
     <Compile Include="FileUtil.cs" />
     <Compile Include="GetDataTableUtils.cs" />
-    <Compile Include="MD5Utils.cs" />
+    <Compile Include="Encrypt\MD5Utils.cs" />
     <Compile Include="ModelBindControlAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReflectionUtil.cs" />
diff --git a/WinformGeneralDeveloperFrame.Start/App.config b/WinformGeneralDeveloperFrame.Start/App.config
index 76fe7b1..a1a350d 100644
--- a/WinformGeneralDeveloperFrame.Start/App.config
+++ b/WinformGeneralDeveloperFrame.Start/App.config
@@ -51,8 +51,7 @@
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
   <connectionStrings>
-    <add name="DB" connectionString="data source=.;initial catalog=winformdevfarme;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
-    <add name="Model1" connectionString="data source=192.168.21.3;initial catalog=MESDEV;persist security info=True;user id=TEST;password=TEST123;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
+    <add name="DB" connectionString="SB16Jt39MD21ugTdYbOTj5/d7+MqcDuVilvBLoJ8OAEXPbuSrV6hZrXx67xblmuQ7fKaMYG+dVdcpDz7biJQmcsuIgxY2UbQm9Be5Kg6Gt/XgxyNiyyQ/Ua7WcUFxGOhUup+z1uyRwL8WU5Gb0o6R8+flGQhYRk/O1O4dns2+sU=" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <entityFramework>
     <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
diff --git a/WinformGeneralDeveloperFrame.Start/Program.cs b/WinformGeneralDeveloperFrame.Start/Program.cs
index b1f79fc..9662b73 100644
--- a/WinformGeneralDeveloperFrame.Start/Program.cs
+++ b/WinformGeneralDeveloperFrame.Start/Program.cs
@@ -19,7 +19,7 @@ namespace WinformGeneralDeveloperFrame.Start
         static void Main()
         {
             DevExpress.Skins.SkinManager.EnableFormSkins();
-            UserLookAndFeel.Default.SetSkinStyle("Office 2010 Blue");
+            UserLookAndFeel.Default.SetSkinStyle("Office 2007 Silver");
             BonusSkins.Register();
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
diff --git a/WinformGeneralDeveloperFrame/DB.cs b/WinformGeneralDeveloperFrame/DB.cs
index ebf2718..9d0ac89 100644
--- a/WinformGeneralDeveloperFrame/DB.cs
+++ b/WinformGeneralDeveloperFrame/DB.cs
@@ -1,8 +1,10 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Configuration;
 using System.Data.Entity;
 using System.Linq;
 using MES.Entity;
+using WinformGeneralDeveloperFrame.Commons;
 
 //using MES.Entity;
 
@@ -11,7 +13,7 @@ namespace WinformGeneralDeveloperFrame
     public partial class DB : DbContext
     {
         public DB()
-            : base("name=DB")
+            : base(EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString))
         {
         }
 
diff --git a/WinformGeneralDeveloperFrame/DB/MESDB.cs b/WinformGeneralDeveloperFrame/DB/MESDB.cs
index 9ee768a..4b224ee 100644
--- a/WinformGeneralDeveloperFrame/DB/MESDB.cs
+++ b/WinformGeneralDeveloperFrame/DB/MESDB.cs
@@ -1,15 +1,18 @@
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Configuration;
 using System.Data.Entity;
 using System.Linq;
 using MES.Entity;
+using WinformGeneralDeveloperFrame.Commons;
 
 namespace MES
 {
     public partial class MESDB : DbContext
     {
         public MESDB()
-            : base("name=DB")
+        //: base("name=DB")
+            : base(EncodeHelper.AES_Decrypt(ConfigurationManager.ConnectionStrings["DB"].ConnectionString))
         {
         }
         public virtual DbSet<stockDataInfo> stockDataInfo { get; set; }
@@ -67,5 +70,12 @@ namespace MES
 
         public virtual DbSet<workorderInfo> workorderInfo { get; set; }
 
+        public virtual DbSet<productionBOMInfo> productionBOMInfo { set; get; }
+
+
+        public virtual DbSet<productionRequisitionInfo> productionRequisitionInfo { get; set; }
+
+        public virtual DbSet<productionRequisitionDetailInfo> productionRequisitionDetailInfo { set; get; }
+
     }
 }
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs b/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs
index 667569d..24c1450 100644
--- a/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs
+++ b/WinformGeneralDeveloperFrame/Entity/productBOMInfo.cs
@@ -37,7 +37,7 @@ namespace MES.Entity
     public int warehouse{set;get;}
     ///版本号
     [ModelBindControl("txtversion")]
-    public int version{set;get;}
+    public string version{set;get;}
     ///BOM编号
     [ModelBindControl("txtproductBOMcode")]
     public string productBOMcode{set;get;}
diff --git a/WinformGeneralDeveloperFrame/Entity/productionBOMInfo.cs b/WinformGeneralDeveloperFrame/Entity/productionBOMInfo.cs
new file mode 100644
index 0000000..3ed785b
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Entity/productionBOMInfo.cs
@@ -0,0 +1,61 @@
+using WinformGeneralDeveloperFrame.Commons;
+
+namespace MES.Entity
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.DataAnnotations;
+    using System.ComponentModel.DataAnnotations.Schema;
+    using System.Data.Entity.Spatial;
+
+    [Table("productionBOM")]
+    public partial class productionBOMInfo
+    {
+    ///id
+    [ModelBindControl("txtid")]
+    public int id{set;get;}
+    ///工程BOM编号
+    [ModelBindControl("txtprojectBOMcode")]
+    public string projectBOMcode{set;get;}
+    ///生产BOM编号
+    [ModelBindControl("txtproductionBOMcode")]
+    public string productionBOMcode{set;get;}
+    ///产品生产数量
+    [ModelBindControl("txtnumber")]
+    public decimal number{set;get;}
+    ///物料编码
+    [ModelBindControl("txtmaterialcode")]
+    public string materialcode{set;get;}
+    ///物料名称
+    [ModelBindControl("txtmaterialid")]
+    public int materialid{set;get;}
+    ///规格型号
+    [ModelBindControl("txtspec")]
+    public string spec{set;get;}
+    ///物料类型
+    [ModelBindControl("txtmaterialtype")]
+    public int materialtype{set;get;}
+    ///单位用量
+    [ModelBindControl("txtuintnumber")]
+    public decimal uintnumber{set;get;}
+    ///需求总量
+    [ModelBindControl("txtneednumber")]
+    public decimal neednumber{set;get;}
+    ///计量单位
+    [ModelBindControl("txtunit")]
+    public int unit{set;get;}
+    ///单价
+    [ModelBindControl("txtunitprice")]
+    public decimal unitprice{set;get;}
+    ///总价
+    [ModelBindControl("txttotalprice")]
+    public decimal totalprice{set;get;}
+    ///仓库
+    [ModelBindControl("txtwarehouse")]
+    public int warehouse{set;get;}
+    ///备注
+    [ModelBindControl("txtremark")]
+    public string remark{set;get;}
+    
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Entity/productionRequisitionDetailInfo.cs b/WinformGeneralDeveloperFrame/Entity/productionRequisitionDetailInfo.cs
new file mode 100644
index 0000000..97b24b2
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Entity/productionRequisitionDetailInfo.cs
@@ -0,0 +1,61 @@
+using WinformGeneralDeveloperFrame.Commons;
+
+namespace MES.Entity
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.DataAnnotations;
+    using System.ComponentModel.DataAnnotations.Schema;
+    using System.Data.Entity.Spatial;
+
+    [Table("productionRequisitionDetail")]
+    public partial class productionRequisitionDetailInfo
+    {
+    ///id
+    [ModelBindControl("txtid")]
+    public int id{set;get;}
+    ///主表ID
+    [ModelBindControl("txtmasterid")]
+    public int masterid{set;get;}
+    ///领料单号
+    [ModelBindControl("txtmastercode")]
+    public string mastercode{set;get;}
+    ///领料明细单号
+    [ModelBindControl("txtdetailcode")]
+    public string detailcode{set;get;}
+    ///物料
+    [ModelBindControl("txtmaterialid")]
+    public int materialid{set;get;}
+    ///物料编码
+    [ModelBindControl("txtmaterialcode")]
+    public string materialcode{set;get;}
+    ///规格型号
+    [ModelBindControl("txtmaterialspec")]
+    public string materialspec{set;get;}
+    ///物料类型
+    [ModelBindControl("txtmaterialtype")]
+    public int materialtype{set;get;}
+    ///单位用量
+    [ModelBindControl("txtunitnumber")]
+    public decimal unitnumber{set;get;}
+    ///产品生产数量
+    [ModelBindControl("txtproductnumber")]
+    public decimal productnumber{set;get;}
+    ///领料数量
+    [ModelBindControl("txtpicknumber")]
+    public decimal picknumber{set;get;}
+    ///计量单位
+    [ModelBindControl("txtunit")]
+    public int unit{set;get;}
+    ///仓库
+    [ModelBindControl("txtwarehouse")]
+    public int warehouse{set;get;}
+    ///备注
+    [ModelBindControl("txtremark")]
+    public string remark{set;get;}
+    ///工单号
+    [ModelBindControl("txtwocode")]
+    public string wocode{set;get;}
+    
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Entity/productionRequisitionInfo.cs b/WinformGeneralDeveloperFrame/Entity/productionRequisitionInfo.cs
new file mode 100644
index 0000000..ddea2be
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Entity/productionRequisitionInfo.cs
@@ -0,0 +1,58 @@
+using WinformGeneralDeveloperFrame.Commons;
+
+namespace MES.Entity
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.DataAnnotations;
+    using System.ComponentModel.DataAnnotations.Schema;
+    using System.Data.Entity.Spatial;
+
+    [Table("productionRequisition")]
+    public partial class productionRequisitionInfo
+    {
+    ///id
+    [ModelBindControl("txtid")]
+    public int id{set;get;}
+    ///领料单号
+    [ModelBindControl("txtcode")]
+    public string code{set;get;}
+    ///工单号
+    [ModelBindControl("txtwocode")]
+    public string wocode{set;get;}
+    ///销售单号
+    [ModelBindControl("txtsalecode")]
+    public string salecode{set;get;}
+    ///领料日期
+    [ModelBindControl("txtpickingtime")]
+    public DateTime pickingtime{set;get;}=DateTime.Now;
+    ///产品
+    [ModelBindControl("txtproductID")]
+    public int productID{set;get;}
+    ///产品编号
+    [ModelBindControl("txtproductcode")]
+    public string productcode{set;get;}
+    ///规格型号
+    [ModelBindControl("txtproductspec")]
+    public string productspec{set;get;}
+    ///生产数量
+    [ModelBindControl("txtnumber")]
+    public decimal number{set;get;}
+    ///计量单位
+    [ModelBindControl("txtunit")]
+    public int unit{set;get;}
+    ///领料部门
+    [ModelBindControl("txtpickingdept")]
+    public int pickingdept{set;get;}
+    ///制单人
+    [ModelBindControl("txtcreatorId")]
+    public int creatorId{set;get;}
+    ///制单日期
+    [ModelBindControl("txtcreateTime")]
+    public DateTime createTime{set;get;}=DateTime.Now;
+    ///备注
+    [ModelBindControl("txtremark")]
+    public string remark{set;get;}
+    
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs b/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs
index cb92653..7e544cd 100644
--- a/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs
+++ b/WinformGeneralDeveloperFrame/Entity/workorderInfo.cs
@@ -65,6 +65,10 @@ namespace MES.Entity
     ///备注
     [ModelBindControl("txtremark")]
     public string remark{set;get;}
-    
+
+    ///BOM
+    [ModelBindControl("txtbomid")]
+    public int bomid { set; get; }
+
     }
 }
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs
index 25f9ec9..07b01df 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs
+++ b/WinformGeneralDeveloperFrame/Form/Frmbuyer.designer.cs
@@ -269,7 +269,7 @@ namespace MES.Form
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.tabDataList;
-            this.xtraTabControl1.Size = new System.Drawing.Size(992, 673);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1002, 679);
             this.xtraTabControl1.TabIndex = 1;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabDataList,
@@ -279,7 +279,7 @@ namespace MES.Form
             // 
             this.tabDataList.Controls.Add(this.grdList);
             this.tabDataList.Name = "tabDataList";
-            this.tabDataList.Size = new System.Drawing.Size(986, 644);
+            this.tabDataList.Size = new System.Drawing.Size(997, 653);
             this.tabDataList.Text = "数据列表";
             // 
             // grdList
@@ -288,7 +288,7 @@ namespace MES.Form
             this.grdList.Location = new System.Drawing.Point(0, 0);
             this.grdList.MainView = this.grdListView;
             this.grdList.Name = "grdList";
-            this.grdList.Size = new System.Drawing.Size(986, 644);
+            this.grdList.Size = new System.Drawing.Size(997, 653);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.grdListView});
@@ -314,7 +314,7 @@ namespace MES.Form
             // 
             this.tabDataDetail.Controls.Add(this.panelControl2);
             this.tabDataDetail.Name = "tabDataDetail";
-            this.tabDataDetail.Size = new System.Drawing.Size(986, 644);
+            this.tabDataDetail.Size = new System.Drawing.Size(997, 653);
             this.tabDataDetail.Text = "数据编辑";
             // 
             // panelControl2
@@ -323,7 +323,7 @@ namespace MES.Form
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(986, 644);
+            this.panelControl2.Size = new System.Drawing.Size(997, 653);
             this.panelControl2.TabIndex = 0;
             // 
             // layoutControl1
@@ -342,7 +342,7 @@ namespace MES.Form
             this.layoutControl1.Location = new System.Drawing.Point(2, 2);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(982, 640);
+            this.layoutControl1.Size = new System.Drawing.Size(993, 649);
             this.layoutControl1.TabIndex = 6;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -351,7 +351,7 @@ namespace MES.Form
             this.xtraTabControl2.Location = new System.Drawing.Point(12, 132);
             this.xtraTabControl2.Name = "xtraTabControl2";
             this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(958, 496);
+            this.xtraTabControl2.Size = new System.Drawing.Size(969, 505);
             this.xtraTabControl2.TabIndex = 10;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1});
@@ -360,7 +360,7 @@ namespace MES.Form
             // 
             this.xtraTabPage1.Controls.Add(this.gridControl1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(952, 467);
+            this.xtraTabPage1.Size = new System.Drawing.Size(964, 479);
             this.xtraTabPage1.Text = "采购明细";
             // 
             // gridControl1
@@ -378,7 +378,7 @@ namespace MES.Form
             this.repositoryItemSearchLookUpEditrequisitioncode,
             this.repositoryItemGridLookUpEditrequisitioncode,
             this.repositoryItemTextEditrequisitioncode});
-            this.gridControl1.Size = new System.Drawing.Size(952, 467);
+            this.gridControl1.Size = new System.Drawing.Size(964, 479);
             this.gridControl1.TabIndex = 1;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -390,19 +390,19 @@ namespace MES.Form
             this.toolStripMenuItemAdd,
             this.toolStripMenuItemDel});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48);
             // 
             // toolStripMenuItemAdd
             // 
             this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd";
-            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22);
             this.toolStripMenuItemAdd.Text = "新增行";
             this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click);
             // 
             // toolStripMenuItemDel
             // 
             this.toolStripMenuItemDel.Name = "toolStripMenuItemDel";
-            this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22);
             this.toolStripMenuItemDel.Text = "删除行";
             this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click);
             // 
@@ -713,15 +713,15 @@ namespace MES.Form
             // 
             this.txtid.Location = new System.Drawing.Point(75, 12);
             this.txtid.Name = "txtid";
-            this.txtid.Size = new System.Drawing.Size(414, 20);
+            this.txtid.Size = new System.Drawing.Size(419, 20);
             this.txtid.StyleController = this.layoutControl1;
             this.txtid.TabIndex = 1;
             // 
             // txtbuyercode
             // 
-            this.txtbuyercode.Location = new System.Drawing.Point(556, 12);
+            this.txtbuyercode.Location = new System.Drawing.Point(561, 12);
             this.txtbuyercode.Name = "txtbuyercode";
-            this.txtbuyercode.Size = new System.Drawing.Size(414, 20);
+            this.txtbuyercode.Size = new System.Drawing.Size(420, 20);
             this.txtbuyercode.StyleController = this.layoutControl1;
             this.txtbuyercode.TabIndex = 2;
             // 
@@ -737,7 +737,7 @@ namespace MES.Form
             new DevExpress.XtraEditors.Controls.EditorButton()});
             this.txtbuyerdate.Properties.DisplayFormat.FormatString = "G";
             this.txtbuyerdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtbuyerdate.Size = new System.Drawing.Size(414, 20);
+            this.txtbuyerdate.Size = new System.Drawing.Size(419, 20);
             this.txtbuyerdate.StyleController = this.layoutControl1;
             this.txtbuyerdate.TabIndex = 3;
             // 
@@ -752,15 +752,15 @@ namespace MES.Form
             this.txtsupplierid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
             this.txtsupplierid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
             this.txtsupplierid.Properties.ValueMember = "ID";
-            this.txtsupplierid.Size = new System.Drawing.Size(414, 20);
+            this.txtsupplierid.Size = new System.Drawing.Size(419, 20);
             this.txtsupplierid.StyleController = this.layoutControl1;
             this.txtsupplierid.TabIndex = 4;
             // 
             // txtsuppliercode
             // 
-            this.txtsuppliercode.Location = new System.Drawing.Point(556, 60);
+            this.txtsuppliercode.Location = new System.Drawing.Point(561, 60);
             this.txtsuppliercode.Name = "txtsuppliercode";
-            this.txtsuppliercode.Size = new System.Drawing.Size(414, 20);
+            this.txtsuppliercode.Size = new System.Drawing.Size(420, 20);
             this.txtsuppliercode.StyleController = this.layoutControl1;
             this.txtsuppliercode.TabIndex = 5;
             // 
@@ -768,7 +768,7 @@ namespace MES.Form
             // 
             this.txtdeliverdate.EditValue = null;
             this.txtdeliverdate.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtdeliverdate.Location = new System.Drawing.Point(556, 36);
+            this.txtdeliverdate.Location = new System.Drawing.Point(561, 36);
             this.txtdeliverdate.Name = "txtdeliverdate";
             this.txtdeliverdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -776,7 +776,7 @@ namespace MES.Form
             new DevExpress.XtraEditors.Controls.EditorButton()});
             this.txtdeliverdate.Properties.DisplayFormat.FormatString = "G";
             this.txtdeliverdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtdeliverdate.Size = new System.Drawing.Size(414, 20);
+            this.txtdeliverdate.Size = new System.Drawing.Size(420, 20);
             this.txtdeliverdate.StyleController = this.layoutControl1;
             this.txtdeliverdate.TabIndex = 6;
             // 
@@ -791,15 +791,15 @@ namespace MES.Form
             this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
             this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
             this.txtcreatorId.Properties.ValueMember = "ID";
-            this.txtcreatorId.Size = new System.Drawing.Size(414, 20);
+            this.txtcreatorId.Size = new System.Drawing.Size(419, 20);
             this.txtcreatorId.StyleController = this.layoutControl1;
             this.txtcreatorId.TabIndex = 7;
             // 
             // txttotalprice
             // 
-            this.txttotalprice.Location = new System.Drawing.Point(556, 84);
+            this.txttotalprice.Location = new System.Drawing.Point(561, 84);
             this.txttotalprice.Name = "txttotalprice";
-            this.txttotalprice.Size = new System.Drawing.Size(414, 20);
+            this.txttotalprice.Size = new System.Drawing.Size(420, 20);
             this.txttotalprice.StyleController = this.layoutControl1;
             this.txttotalprice.TabIndex = 8;
             // 
@@ -807,7 +807,7 @@ namespace MES.Form
             // 
             this.txtremark.Location = new System.Drawing.Point(75, 108);
             this.txtremark.Name = "txtremark";
-            this.txtremark.Size = new System.Drawing.Size(895, 20);
+            this.txtremark.Size = new System.Drawing.Size(906, 20);
             this.txtremark.StyleController = this.layoutControl1;
             this.txtremark.TabIndex = 9;
             // 
@@ -827,7 +827,7 @@ namespace MES.Form
             this.layoutControlItem5,
             this.layoutControlItem8});
             this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(982, 640);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(993, 649);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem1
@@ -836,7 +836,7 @@ namespace MES.Form
             this.layoutControlItem1.CustomizationFormText = "id";
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem1.Size = new System.Drawing.Size(486, 24);
             this.layoutControlItem1.Text = "id";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -846,7 +846,7 @@ namespace MES.Form
             this.layoutControlItem3.CustomizationFormText = "采购日期";
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 24);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem3.Size = new System.Drawing.Size(486, 24);
             this.layoutControlItem3.Text = "采购日期";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -856,7 +856,7 @@ namespace MES.Form
             this.layoutControlItem4.CustomizationFormText = "供应商";
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem4.Size = new System.Drawing.Size(486, 24);
             this.layoutControlItem4.Text = "供应商";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -866,7 +866,7 @@ namespace MES.Form
             this.layoutControlItem7.CustomizationFormText = "制单人";
             this.layoutControlItem7.Location = new System.Drawing.Point(0, 72);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem7.Size = new System.Drawing.Size(486, 24);
             this.layoutControlItem7.Text = "制单人";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -876,7 +876,7 @@ namespace MES.Form
             this.layoutControlItem9.CustomizationFormText = "备注";
             this.layoutControlItem9.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(962, 24);
+            this.layoutControlItem9.Size = new System.Drawing.Size(973, 24);
             this.layoutControlItem9.Text = "备注";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -885,7 +885,7 @@ namespace MES.Form
             this.layoutControlItem10.Control = this.xtraTabControl2;
             this.layoutControlItem10.Location = new System.Drawing.Point(0, 120);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(962, 500);
+            this.layoutControlItem10.Size = new System.Drawing.Size(973, 509);
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
             // 
@@ -893,9 +893,9 @@ namespace MES.Form
             // 
             this.layoutControlItem2.Control = this.txtbuyercode;
             this.layoutControlItem2.CustomizationFormText = "采购单号";
-            this.layoutControlItem2.Location = new System.Drawing.Point(481, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(486, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem2.Size = new System.Drawing.Size(487, 24);
             this.layoutControlItem2.Text = "采购单号";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -903,9 +903,9 @@ namespace MES.Form
             // 
             this.layoutControlItem6.Control = this.txtdeliverdate;
             this.layoutControlItem6.CustomizationFormText = "完货日期";
-            this.layoutControlItem6.Location = new System.Drawing.Point(481, 24);
+            this.layoutControlItem6.Location = new System.Drawing.Point(486, 24);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem6.Size = new System.Drawing.Size(487, 24);
             this.layoutControlItem6.Text = "完货日期";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -913,9 +913,9 @@ namespace MES.Form
             // 
             this.layoutControlItem5.Control = this.txtsuppliercode;
             this.layoutControlItem5.CustomizationFormText = "供应商编码";
-            this.layoutControlItem5.Location = new System.Drawing.Point(481, 48);
+            this.layoutControlItem5.Location = new System.Drawing.Point(486, 48);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem5.Size = new System.Drawing.Size(487, 24);
             this.layoutControlItem5.Text = "供应商编码";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -923,9 +923,9 @@ namespace MES.Form
             // 
             this.layoutControlItem8.Control = this.txttotalprice;
             this.layoutControlItem8.CustomizationFormText = "金额";
-            this.layoutControlItem8.Location = new System.Drawing.Point(481, 72);
+            this.layoutControlItem8.Location = new System.Drawing.Point(486, 72);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(481, 24);
+            this.layoutControlItem8.Size = new System.Drawing.Size(487, 24);
             this.layoutControlItem8.Text = "金额";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14);
             // 
@@ -933,7 +933,7 @@ namespace MES.Form
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(992, 707);
+            this.ClientSize = new System.Drawing.Size(1002, 713);
             this.Controls.Add(this.xtraTabControl1);
             this.Name = "Frmbuyer";
             this.Text = "采购单";
diff --git a/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs
index b74ad8b..562c52d 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs
+++ b/WinformGeneralDeveloperFrame/Form/Frmbuyerreturn.designer.cs
@@ -86,14 +86,14 @@ namespace MES.Form
             this.txtremark = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtsupplierid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -127,14 +127,14 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             this.SuspendLayout();
             // 
             // gridColumn1
@@ -244,7 +244,7 @@ namespace MES.Form
             // 
             this.tabDataList.Controls.Add(this.grdList);
             this.tabDataList.Name = "tabDataList";
-            this.tabDataList.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataList.Size = new System.Drawing.Size(1295, 740);
             this.tabDataList.Text = "数据列表";
             // 
             // grdList
@@ -253,7 +253,7 @@ namespace MES.Form
             this.grdList.Location = new System.Drawing.Point(0, 0);
             this.grdList.MainView = this.grdListView;
             this.grdList.Name = "grdList";
-            this.grdList.Size = new System.Drawing.Size(1294, 737);
+            this.grdList.Size = new System.Drawing.Size(1295, 740);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.grdListView});
@@ -278,7 +278,7 @@ namespace MES.Form
             // 
             this.tabDataDetail.Controls.Add(this.panelControl2);
             this.tabDataDetail.Name = "tabDataDetail";
-            this.tabDataDetail.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataDetail.Size = new System.Drawing.Size(1295, 740);
             this.tabDataDetail.Text = "数据编辑";
             // 
             // panelControl2
@@ -287,7 +287,7 @@ namespace MES.Form
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(1294, 737);
+            this.panelControl2.Size = new System.Drawing.Size(1295, 740);
             this.panelControl2.TabIndex = 0;
             // 
             // layoutControl1
@@ -305,7 +305,7 @@ namespace MES.Form
             this.layoutControl1.Location = new System.Drawing.Point(2, 2);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControl1.Size = new System.Drawing.Size(1291, 736);
             this.layoutControl1.TabIndex = 6;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -314,7 +314,7 @@ namespace MES.Form
             this.xtraTabControl2.Location = new System.Drawing.Point(12, 132);
             this.xtraTabControl2.Name = "xtraTabControl2";
             this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(1266, 589);
+            this.xtraTabControl2.Size = new System.Drawing.Size(1267, 592);
             this.xtraTabControl2.TabIndex = 9;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1});
@@ -323,7 +323,7 @@ namespace MES.Form
             // 
             this.xtraTabPage1.Controls.Add(this.gridControl1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1260, 560);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1262, 566);
             this.xtraTabPage1.Text = "明细";
             // 
             // gridControl1
@@ -338,7 +338,7 @@ namespace MES.Form
             this.repositoryItemLookUpEditunit,
             this.repositoryItemLookUpEditwarehouse,
             this.repositoryItemTextEditbuyerdetailcode});
-            this.gridControl1.Size = new System.Drawing.Size(1260, 560);
+            this.gridControl1.Size = new System.Drawing.Size(1262, 566);
             this.gridControl1.TabIndex = 1;
             this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -349,19 +349,19 @@ namespace MES.Form
             this.toolStripMenuItemAdd,
             this.toolStripMenuItemDel});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 70);
             // 
             // toolStripMenuItemAdd
             // 
             this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd";
-            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22);
+            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItemAdd.Text = "新增行";
             this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click);
             // 
             // toolStripMenuItemDel
             // 
             this.toolStripMenuItemDel.Name = "toolStripMenuItemDel";
-            this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22);
+            this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItemDel.Text = "删除行";
             this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click);
             // 
@@ -579,7 +579,7 @@ namespace MES.Form
             new DevExpress.XtraEditors.Controls.EditorButton()});
             this.txtreturndate.Properties.DisplayFormat.FormatString = "G";
             this.txtreturndate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtreturndate.Size = new System.Drawing.Size(556, 20);
+            this.txtreturndate.Size = new System.Drawing.Size(557, 20);
             this.txtreturndate.StyleController = this.layoutControl1;
             this.txtreturndate.TabIndex = 2;
             // 
@@ -587,7 +587,7 @@ namespace MES.Form
             // 
             this.txtsuppliercode.Location = new System.Drawing.Point(722, 36);
             this.txtsuppliercode.Name = "txtsuppliercode";
-            this.txtsuppliercode.Size = new System.Drawing.Size(556, 20);
+            this.txtsuppliercode.Size = new System.Drawing.Size(557, 20);
             this.txtsuppliercode.StyleController = this.layoutControl1;
             this.txtsuppliercode.TabIndex = 3;
             // 
@@ -626,7 +626,7 @@ namespace MES.Form
             // 
             this.txtreturnbuyercode.Location = new System.Drawing.Point(722, 12);
             this.txtreturnbuyercode.Name = "txtreturnbuyercode";
-            this.txtreturnbuyercode.Size = new System.Drawing.Size(556, 20);
+            this.txtreturnbuyercode.Size = new System.Drawing.Size(557, 20);
             this.txtreturnbuyercode.StyleController = this.layoutControl1;
             this.txtreturnbuyercode.TabIndex = 6;
             // 
@@ -634,7 +634,7 @@ namespace MES.Form
             // 
             this.txttotalprice.Location = new System.Drawing.Point(87, 84);
             this.txttotalprice.Name = "txttotalprice";
-            this.txttotalprice.Size = new System.Drawing.Size(1191, 20);
+            this.txttotalprice.Size = new System.Drawing.Size(1192, 20);
             this.txttotalprice.StyleController = this.layoutControl1;
             this.txttotalprice.TabIndex = 7;
             // 
@@ -642,7 +642,7 @@ namespace MES.Form
             // 
             this.txtremark.Location = new System.Drawing.Point(87, 108);
             this.txtremark.Name = "txtremark";
-            this.txtremark.Size = new System.Drawing.Size(1191, 20);
+            this.txtremark.Size = new System.Drawing.Size(1192, 20);
             this.txtremark.StyleController = this.layoutControl1;
             this.txtremark.TabIndex = 8;
             // 
@@ -661,7 +661,7 @@ namespace MES.Form
             this.layoutControlItem4,
             this.layoutControlItem3});
             this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1291, 736);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem1
@@ -674,16 +674,6 @@ namespace MES.Form
             this.layoutControlItem1.Text = "id";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txtsuppliercode;
-            this.layoutControlItem3.CustomizationFormText = "供应商编号";
-            this.layoutControlItem3.Location = new System.Drawing.Point(635, 24);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(635, 24);
-            this.layoutControlItem3.Text = "供应商编号";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
-            // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtcreatorId;
@@ -700,7 +690,7 @@ namespace MES.Form
             this.layoutControlItem7.CustomizationFormText = "金额";
             this.layoutControlItem7.Location = new System.Drawing.Point(0, 72);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem7.Size = new System.Drawing.Size(1271, 24);
             this.layoutControlItem7.Text = "金额";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -710,7 +700,7 @@ namespace MES.Form
             this.layoutControlItem8.CustomizationFormText = "备注";
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem8.Size = new System.Drawing.Size(1271, 24);
             this.layoutControlItem8.Text = "备注";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -720,10 +710,29 @@ namespace MES.Form
             this.layoutControlItem6.CustomizationFormText = "采购退货单号";
             this.layoutControlItem6.Location = new System.Drawing.Point(635, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(635, 24);
+            this.layoutControlItem6.Size = new System.Drawing.Size(636, 24);
             this.layoutControlItem6.Text = "采购退货单号";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
             // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtreturndate;
+            this.layoutControlItem2.CustomizationFormText = "退货日期";
+            this.layoutControlItem2.Location = new System.Drawing.Point(635, 48);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(636, 24);
+            this.layoutControlItem2.Text = "退货日期";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.xtraTabControl2;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(1271, 596);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtsupplierid;
@@ -734,24 +743,15 @@ namespace MES.Form
             this.layoutControlItem4.Text = "供应商名称";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem2
+            // layoutControlItem3
             // 
-            this.layoutControlItem2.Control = this.txtreturndate;
-            this.layoutControlItem2.CustomizationFormText = "退货日期";
-            this.layoutControlItem2.Location = new System.Drawing.Point(635, 48);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(635, 24);
-            this.layoutControlItem2.Text = "退货日期";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.xtraTabControl2;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 120);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(1270, 593);
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem9.TextVisible = false;
+            this.layoutControlItem3.Control = this.txtsuppliercode;
+            this.layoutControlItem3.CustomizationFormText = "供应商编号";
+            this.layoutControlItem3.Location = new System.Drawing.Point(635, 24);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(636, 24);
+            this.layoutControlItem3.Text = "供应商编号";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
             // 
             // Frmbuyerreturn
             // 
@@ -796,14 +796,14 @@ namespace MES.Form
             ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             this.ResumeLayout(false);
 
         }
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs
index 25cd097..25e7805 100644
--- a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.cs
@@ -358,10 +358,18 @@ namespace MES.Form
 
         private void treeList1_ValidateNode(object sender, ValidateNodeEventArgs e)
         {
-            treeList1.FocusedNode["money"] = decimal.Multiply(
-                treeList1.FocusedNode["unitprice"].ToDecimal(0),
-                treeList1.FocusedNode["unitusenumber"].ToDecimal(0));
-
+            if (e.Node.ParentNode != null)
+            {
+                e.Node["money"] = decimal.Multiply(
+                    e.Node["unitprice"].ToDecimal(0),
+                    e.Node["unitusenumber"].ToDecimal(0))* e.Node.ParentNode["unitusenumber"].ToDecimal(1);
+            }
+            else
+            {
+                e.Node["money"] = decimal.Multiply(
+                    e.Node["unitprice"].ToDecimal(0),
+                    e.Node["unitusenumber"].ToDecimal(0));
+            }
             treeList1.BestFitColumns();
             decimal totalprice = 0;
             foreach (TreeListNode node in treeList1.Nodes)
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs
index 25bb8ae..c285f3f 100644
--- a/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductBOM.designer.cs
@@ -87,6 +87,7 @@ namespace MES.Form
             this.treeListColumn14 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
             this.treeListColumn15 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
             this.treeListColumn16 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
+            this.treeListColumn6 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItemAddSon = new System.Windows.Forms.ToolStripMenuItem();
@@ -120,7 +121,6 @@ namespace MES.Form
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.treeListColumn6 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit();
@@ -328,7 +328,7 @@ namespace MES.Form
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.tabDataList;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1027, 710);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1037, 716);
             this.xtraTabControl1.TabIndex = 1;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabDataList,
@@ -338,7 +338,7 @@ namespace MES.Form
             // 
             this.tabDataList.Controls.Add(this.grdList);
             this.tabDataList.Name = "tabDataList";
-            this.tabDataList.Size = new System.Drawing.Size(1021, 681);
+            this.tabDataList.Size = new System.Drawing.Size(1032, 690);
             this.tabDataList.Text = "数据列表";
             // 
             // grdList
@@ -350,7 +350,7 @@ namespace MES.Form
             this.grdList.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemtxtcreatorId,
             this.repositoryItemtxteditorId});
-            this.grdList.Size = new System.Drawing.Size(1021, 681);
+            this.grdList.Size = new System.Drawing.Size(1032, 690);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.grdListView});
@@ -440,7 +440,7 @@ namespace MES.Form
             // 
             this.tabDataDetail.Controls.Add(this.panelControl2);
             this.tabDataDetail.Name = "tabDataDetail";
-            this.tabDataDetail.Size = new System.Drawing.Size(1021, 681);
+            this.tabDataDetail.Size = new System.Drawing.Size(1032, 690);
             this.tabDataDetail.Text = "数据编辑";
             // 
             // panelControl2
@@ -449,7 +449,7 @@ namespace MES.Form
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(1021, 681);
+            this.panelControl2.Size = new System.Drawing.Size(1032, 690);
             this.panelControl2.TabIndex = 0;
             // 
             // layoutControl1
@@ -475,14 +475,14 @@ namespace MES.Form
             this.layoutControl1.Location = new System.Drawing.Point(2, 2);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(1017, 677);
+            this.layoutControl1.Size = new System.Drawing.Size(1028, 686);
             this.layoutControl1.TabIndex = 6;
             this.layoutControl1.Text = "layoutControl1";
             // 
             // txteditTime
             // 
             this.txteditTime.EditValue = null;
-            this.txteditTime.Location = new System.Drawing.Point(562, 156);
+            this.txteditTime.Location = new System.Drawing.Point(567, 156);
             this.txteditTime.Name = "txteditTime";
             this.txteditTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -492,14 +492,14 @@ namespace MES.Form
             this.txteditTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.txteditTime.Properties.EditFormat.FormatString = "G";
             this.txteditTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txteditTime.Size = new System.Drawing.Size(443, 20);
+            this.txteditTime.Size = new System.Drawing.Size(449, 20);
             this.txteditTime.StyleController = this.layoutControl1;
             this.txteditTime.TabIndex = 1;
             // 
             // txtcreateTime
             // 
             this.txtcreateTime.EditValue = null;
-            this.txtcreateTime.Location = new System.Drawing.Point(562, 132);
+            this.txtcreateTime.Location = new System.Drawing.Point(567, 132);
             this.txtcreateTime.Name = "txtcreateTime";
             this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -509,7 +509,7 @@ namespace MES.Form
             this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.txtcreateTime.Properties.EditFormat.FormatString = "G";
             this.txtcreateTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtcreateTime.Size = new System.Drawing.Size(443, 20);
+            this.txtcreateTime.Size = new System.Drawing.Size(449, 20);
             this.txtcreateTime.StyleController = this.layoutControl1;
             this.txtcreateTime.TabIndex = 1;
             // 
@@ -521,7 +521,7 @@ namespace MES.Form
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txteditorId.Properties.DisplayMember = "Name";
             this.txteditorId.Properties.ValueMember = "ID";
-            this.txteditorId.Size = new System.Drawing.Size(442, 20);
+            this.txteditorId.Size = new System.Drawing.Size(447, 20);
             this.txteditorId.StyleController = this.layoutControl1;
             this.txteditorId.TabIndex = 1;
             // 
@@ -533,7 +533,7 @@ namespace MES.Form
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtcreatorId.Properties.DisplayMember = "Name";
             this.txtcreatorId.Properties.ValueMember = "ID";
-            this.txtcreatorId.Size = new System.Drawing.Size(442, 20);
+            this.txtcreatorId.Size = new System.Drawing.Size(447, 20);
             this.txtcreatorId.StyleController = this.layoutControl1;
             this.txtcreatorId.TabIndex = 1;
             // 
@@ -541,7 +541,7 @@ namespace MES.Form
             // 
             this.txtunitcost.Location = new System.Drawing.Point(64, 180);
             this.txtunitcost.Name = "txtunitcost";
-            this.txtunitcost.Size = new System.Drawing.Size(442, 20);
+            this.txtunitcost.Size = new System.Drawing.Size(447, 20);
             this.txtunitcost.StyleController = this.layoutControl1;
             this.txtunitcost.TabIndex = 1;
             // 
@@ -550,7 +550,7 @@ namespace MES.Form
             this.xtraTabControl2.Location = new System.Drawing.Point(12, 204);
             this.xtraTabControl2.Name = "xtraTabControl2";
             this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(993, 461);
+            this.xtraTabControl2.Size = new System.Drawing.Size(1004, 470);
             this.xtraTabControl2.TabIndex = 12;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1});
@@ -559,7 +559,7 @@ namespace MES.Form
             // 
             this.xtraTabPage1.Controls.Add(this.treeList1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(987, 432);
+            this.xtraTabPage1.Size = new System.Drawing.Size(999, 444);
             this.xtraTabPage1.Text = "物料清单";
             // 
             // treeList1
@@ -590,7 +590,7 @@ namespace MES.Form
             this.treeList1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemLookUpEditmaterialtype,
             this.repositoryItemLookUpEditmaterialname});
-            this.treeList1.Size = new System.Drawing.Size(987, 432);
+            this.treeList1.Size = new System.Drawing.Size(999, 444);
             this.treeList1.TabIndex = 0;
             this.treeList1.ValidateNode += new DevExpress.XtraTreeList.ValidateNodeEventHandler(this.treeList1_ValidateNode);
             // 
@@ -739,6 +739,14 @@ namespace MES.Form
             this.treeListColumn16.Visible = true;
             this.treeListColumn16.VisibleIndex = 9;
             // 
+            // treeListColumn6
+            // 
+            this.treeListColumn6.Caption = "明细编号";
+            this.treeListColumn6.FieldName = "productBOMdetailcode";
+            this.treeListColumn6.Name = "treeListColumn6";
+            this.treeListColumn6.Visible = true;
+            this.treeListColumn6.VisibleIndex = 10;
+            // 
             // contextMenuStrip1
             // 
             this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -746,26 +754,26 @@ namespace MES.Form
             this.toolStripMenuItemAddSon,
             this.toolStripMenuItemDel});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(125, 70);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(181, 92);
             // 
             // toolStripMenuItemAdd
             // 
             this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd";
-            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(124, 22);
+            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItemAdd.Text = "新增";
             this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click);
             // 
             // toolStripMenuItemAddSon
             // 
             this.toolStripMenuItemAddSon.Name = "toolStripMenuItemAddSon";
-            this.toolStripMenuItemAddSon.Size = new System.Drawing.Size(124, 22);
+            this.toolStripMenuItemAddSon.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItemAddSon.Text = "新增子级";
             this.toolStripMenuItemAddSon.Click += new System.EventHandler(this.toolStripMenuItemAddSon_Click);
             // 
             // toolStripMenuItemDel
             // 
             this.toolStripMenuItemDel.Name = "toolStripMenuItemDel";
-            this.toolStripMenuItemDel.Size = new System.Drawing.Size(124, 22);
+            this.toolStripMenuItemDel.Size = new System.Drawing.Size(180, 22);
             this.toolStripMenuItemDel.Text = "删除";
             this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click);
             // 
@@ -773,7 +781,7 @@ namespace MES.Form
             // 
             this.txtid.Location = new System.Drawing.Point(64, 12);
             this.txtid.Name = "txtid";
-            this.txtid.Size = new System.Drawing.Size(442, 20);
+            this.txtid.Size = new System.Drawing.Size(447, 20);
             this.txtid.StyleController = this.layoutControl1;
             this.txtid.TabIndex = 1;
             // 
@@ -788,24 +796,24 @@ namespace MES.Form
             this.txtcustomerid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
             this.txtcustomerid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
             this.txtcustomerid.Properties.ValueMember = "ID";
-            this.txtcustomerid.Size = new System.Drawing.Size(442, 20);
+            this.txtcustomerid.Size = new System.Drawing.Size(447, 20);
             this.txtcustomerid.StyleController = this.layoutControl1;
             this.txtcustomerid.TabIndex = 2;
             this.txtcustomerid.EditValueChanged += new System.EventHandler(this.txtcustomerid_EditValueChanged);
             // 
             // txtcustomercode
             // 
-            this.txtcustomercode.Location = new System.Drawing.Point(562, 36);
+            this.txtcustomercode.Location = new System.Drawing.Point(567, 36);
             this.txtcustomercode.Name = "txtcustomercode";
-            this.txtcustomercode.Size = new System.Drawing.Size(443, 20);
+            this.txtcustomercode.Size = new System.Drawing.Size(449, 20);
             this.txtcustomercode.StyleController = this.layoutControl1;
             this.txtcustomercode.TabIndex = 3;
             // 
             // txtproductcode
             // 
-            this.txtproductcode.Location = new System.Drawing.Point(562, 60);
+            this.txtproductcode.Location = new System.Drawing.Point(567, 60);
             this.txtproductcode.Name = "txtproductcode";
-            this.txtproductcode.Size = new System.Drawing.Size(443, 20);
+            this.txtproductcode.Size = new System.Drawing.Size(449, 20);
             this.txtproductcode.StyleController = this.layoutControl1;
             this.txtproductcode.TabIndex = 4;
             // 
@@ -820,7 +828,7 @@ namespace MES.Form
             this.txtproductid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
             this.txtproductid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
             this.txtproductid.Properties.ValueMember = "ID";
-            this.txtproductid.Size = new System.Drawing.Size(442, 20);
+            this.txtproductid.Size = new System.Drawing.Size(447, 20);
             this.txtproductid.StyleController = this.layoutControl1;
             this.txtproductid.TabIndex = 5;
             this.txtproductid.EditValueChanged += new System.EventHandler(this.txtproductid_EditValueChanged);
@@ -829,14 +837,14 @@ namespace MES.Form
             // 
             this.txtspec.Location = new System.Drawing.Point(64, 84);
             this.txtspec.Name = "txtspec";
-            this.txtspec.Size = new System.Drawing.Size(442, 20);
+            this.txtspec.Size = new System.Drawing.Size(447, 20);
             this.txtspec.StyleController = this.layoutControl1;
             this.txtspec.TabIndex = 6;
             // 
             // txtunit
             // 
             this.txtunit.EditValue = "";
-            this.txtunit.Location = new System.Drawing.Point(562, 84);
+            this.txtunit.Location = new System.Drawing.Point(567, 84);
             this.txtunit.Name = "txtunit";
             this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -844,7 +852,7 @@ namespace MES.Form
             this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
             this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
             this.txtunit.Properties.ValueMember = "ID";
-            this.txtunit.Size = new System.Drawing.Size(443, 20);
+            this.txtunit.Size = new System.Drawing.Size(449, 20);
             this.txtunit.StyleController = this.layoutControl1;
             this.txtunit.TabIndex = 7;
             // 
@@ -859,31 +867,31 @@ namespace MES.Form
             this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
             this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
             this.txtwarehouse.Properties.ValueMember = "ID";
-            this.txtwarehouse.Size = new System.Drawing.Size(442, 20);
+            this.txtwarehouse.Size = new System.Drawing.Size(447, 20);
             this.txtwarehouse.StyleController = this.layoutControl1;
             this.txtwarehouse.TabIndex = 8;
             // 
             // txtversion
             // 
-            this.txtversion.Location = new System.Drawing.Point(562, 108);
+            this.txtversion.Location = new System.Drawing.Point(567, 108);
             this.txtversion.Name = "txtversion";
-            this.txtversion.Size = new System.Drawing.Size(443, 20);
+            this.txtversion.Size = new System.Drawing.Size(449, 20);
             this.txtversion.StyleController = this.layoutControl1;
             this.txtversion.TabIndex = 9;
             // 
             // txtproductBOMcode
             // 
-            this.txtproductBOMcode.Location = new System.Drawing.Point(562, 12);
+            this.txtproductBOMcode.Location = new System.Drawing.Point(567, 12);
             this.txtproductBOMcode.Name = "txtproductBOMcode";
-            this.txtproductBOMcode.Size = new System.Drawing.Size(443, 20);
+            this.txtproductBOMcode.Size = new System.Drawing.Size(449, 20);
             this.txtproductBOMcode.StyleController = this.layoutControl1;
             this.txtproductBOMcode.TabIndex = 10;
             // 
             // txtremark
             // 
-            this.txtremark.Location = new System.Drawing.Point(562, 180);
+            this.txtremark.Location = new System.Drawing.Point(567, 180);
             this.txtremark.Name = "txtremark";
-            this.txtremark.Size = new System.Drawing.Size(443, 20);
+            this.txtremark.Size = new System.Drawing.Size(449, 20);
             this.txtremark.StyleController = this.layoutControl1;
             this.txtremark.TabIndex = 11;
             // 
@@ -910,7 +918,7 @@ namespace MES.Form
             this.layoutControlItem15,
             this.layoutControlItem16});
             this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1017, 677);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1028, 686);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem1
@@ -919,7 +927,7 @@ namespace MES.Form
             this.layoutControlItem1.CustomizationFormText = "id";
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem1.Size = new System.Drawing.Size(503, 24);
             this.layoutControlItem1.Text = "id";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -929,7 +937,7 @@ namespace MES.Form
             this.layoutControlItem2.CustomizationFormText = "客户";
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem2.Size = new System.Drawing.Size(503, 24);
             this.layoutControlItem2.Text = "客户";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -939,7 +947,7 @@ namespace MES.Form
             this.layoutControlItem6.CustomizationFormText = "规格型号";
             this.layoutControlItem6.Location = new System.Drawing.Point(0, 72);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem6.Size = new System.Drawing.Size(503, 24);
             this.layoutControlItem6.Text = "规格型号";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -949,7 +957,7 @@ namespace MES.Form
             this.layoutControlItem8.CustomizationFormText = "仓库";
             this.layoutControlItem8.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem8.Size = new System.Drawing.Size(503, 24);
             this.layoutControlItem8.Text = "仓库";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -957,9 +965,9 @@ namespace MES.Form
             // 
             this.layoutControlItem11.Control = this.txtremark;
             this.layoutControlItem11.CustomizationFormText = "备注";
-            this.layoutControlItem11.Location = new System.Drawing.Point(498, 168);
+            this.layoutControlItem11.Location = new System.Drawing.Point(503, 168);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem11.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem11.Text = "备注";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -967,9 +975,9 @@ namespace MES.Form
             // 
             this.layoutControlItem3.Control = this.txtcustomercode;
             this.layoutControlItem3.CustomizationFormText = "客户编码";
-            this.layoutControlItem3.Location = new System.Drawing.Point(498, 24);
+            this.layoutControlItem3.Location = new System.Drawing.Point(503, 24);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem3.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem3.Text = "客户编码";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -977,9 +985,9 @@ namespace MES.Form
             // 
             this.layoutControlItem10.Control = this.txtproductBOMcode;
             this.layoutControlItem10.CustomizationFormText = "BOM编号";
-            this.layoutControlItem10.Location = new System.Drawing.Point(498, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(503, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem10.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem10.Text = "BOM编号";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -987,9 +995,9 @@ namespace MES.Form
             // 
             this.layoutControlItem7.Control = this.txtunit;
             this.layoutControlItem7.CustomizationFormText = "计量单位";
-            this.layoutControlItem7.Location = new System.Drawing.Point(498, 72);
+            this.layoutControlItem7.Location = new System.Drawing.Point(503, 72);
             this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem7.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem7.Text = "计量单位";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -997,9 +1005,9 @@ namespace MES.Form
             // 
             this.layoutControlItem9.Control = this.txtversion;
             this.layoutControlItem9.CustomizationFormText = "版本号";
-            this.layoutControlItem9.Location = new System.Drawing.Point(498, 96);
+            this.layoutControlItem9.Location = new System.Drawing.Point(503, 96);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem9.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem9.Text = "版本号";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -1008,7 +1016,7 @@ namespace MES.Form
             this.layoutControlItem12.Control = this.xtraTabControl2;
             this.layoutControlItem12.Location = new System.Drawing.Point(0, 192);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(997, 465);
+            this.layoutControlItem12.Size = new System.Drawing.Size(1008, 474);
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
             // 
@@ -1018,7 +1026,7 @@ namespace MES.Form
             this.layoutControlItem5.CustomizationFormText = "产品";
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem5.Size = new System.Drawing.Size(503, 24);
             this.layoutControlItem5.Text = "产品";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -1026,9 +1034,9 @@ namespace MES.Form
             // 
             this.layoutControlItem4.Control = this.txtproductcode;
             this.layoutControlItem4.CustomizationFormText = "产品编号";
-            this.layoutControlItem4.Location = new System.Drawing.Point(498, 48);
+            this.layoutControlItem4.Location = new System.Drawing.Point(503, 48);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem4.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem4.Text = "产品编号";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -1037,7 +1045,7 @@ namespace MES.Form
             this.txtunitcost111.Control = this.txtunitcost;
             this.txtunitcost111.Location = new System.Drawing.Point(0, 168);
             this.txtunitcost111.Name = "txtunitcost111";
-            this.txtunitcost111.Size = new System.Drawing.Size(498, 24);
+            this.txtunitcost111.Size = new System.Drawing.Size(503, 24);
             this.txtunitcost111.Text = "单位成本";
             this.txtunitcost111.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -1046,7 +1054,7 @@ namespace MES.Form
             this.layoutControlItem13.Control = this.txtcreatorId;
             this.layoutControlItem13.Location = new System.Drawing.Point(0, 120);
             this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem13.Size = new System.Drawing.Size(503, 24);
             this.layoutControlItem13.Text = "创建人";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(49, 14);
             // 
@@ -1055,41 +1063,33 @@ namespace MES.Form
             this.layoutControlItem14.Control = this.txteditorId;
             this.layoutControlItem14.Location = new System.Drawing.Point(0, 144);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(498, 24);
+            this.layoutControlItem14.Size = new System.Drawing.Size(503, 24);
             this.layoutControlItem14.Text = "编辑人";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(49, 14);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txtcreateTime;
-            this.layoutControlItem15.Location = new System.Drawing.Point(498, 120);
+            this.layoutControlItem15.Location = new System.Drawing.Point(503, 120);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem15.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem15.Text = "创建时间";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(49, 14);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txteditTime;
-            this.layoutControlItem16.Location = new System.Drawing.Point(498, 144);
+            this.layoutControlItem16.Location = new System.Drawing.Point(503, 144);
             this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.Size = new System.Drawing.Size(499, 24);
+            this.layoutControlItem16.Size = new System.Drawing.Size(505, 24);
             this.layoutControlItem16.Text = "编辑时间";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(49, 14);
             // 
-            // treeListColumn6
-            // 
-            this.treeListColumn6.Caption = "明细编号";
-            this.treeListColumn6.FieldName = "productBOMdetailcode";
-            this.treeListColumn6.Name = "treeListColumn6";
-            this.treeListColumn6.Visible = true;
-            this.treeListColumn6.VisibleIndex = 10;
-            // 
             // FrmproductBOM
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1027, 744);
+            this.ClientSize = new System.Drawing.Size(1037, 750);
             this.Controls.Add(this.xtraTabControl1);
             this.Name = "FrmproductBOM";
             this.Text = "产品BOM";
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.cs
new file mode 100644
index 0000000..7180897
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.cs
@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using WinformGeneralDeveloperFrame;
+using WinformGeneralDeveloperFrame.Commons;
+using DevExpress.XtraLayout;
+using MES.Entity;
+using System.Data.Entity.Migrations;
+using System.Data.Entity;
+namespace MES.Form
+{
+	public partial class FrmproductionBOM : FrmBaseForm
+	{
+        private Dictionary<string, string> fieldDictionary = new Dictionary<string, string>();
+		public FrmproductionBOM()
+		{
+			InitializeComponent();
+		}
+		private void FrmproductionBOM_Load(object sender, EventArgs e)
+        {
+			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productionBOMInfo());
+            InitSearchDicData();
+        }
+        /// <summary>
+		/// 数据源初始化
+		/// </summary>
+		/// <returns></returns>
+		private void Init()
+		{
+			txtmaterialid.Properties.DataSource = GetDataTableUtils.SqlTable("物料");     
+			repositoryItemtxtmaterialid.DataSource= GetDataTableUtils.SqlTable("物料");  
+			txtmaterialtype.Properties.DataSource = GetDataTableUtils.SqlTable("物料类别");     
+			repositoryItemtxtmaterialtype.DataSource= GetDataTableUtils.SqlTable("物料类别");  
+			txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位");     
+			repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位");  
+			txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库");     
+			repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库");  
+		}
+        /// <summary>
+		/// 搜索字段
+		/// </summary>
+		/// <returns></returns>
+        private void InitSearchDicData()
+        {
+			fieldDictionary.Add("工程BOM编号","projectBOMcode");     
+			fieldDictionary.Add("生产BOM编号","productionBOMcode");     
+			fieldDictionary.Add("物料编码","materialcode");     
+			fieldDictionary.Add("物料名称","materialid");     
+        }
+
+		public override void InitgrdListDataSource()
+        {
+			 using (var con=new MESDB())///
+            {
+				grdList.DataSource=con.productionBOMInfo.ToList();
+            }
+            Init();
+		}
+	    /// <summary>
+		/// 字段为空校验
+		/// </summary>
+		/// <returns></returns>
+        public override bool CheckInput()
+        {
+			if(string.IsNullOrEmpty(txtprojectBOMcode.EditValue.ToString()))
+			{
+				"工程BOM编号不能为空".ShowWarning();
+				txtprojectBOMcode.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtproductionBOMcode.EditValue.ToString()))
+			{
+				"生产BOM编号不能为空".ShowWarning();
+				txtproductionBOMcode.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtnumber.EditValue.ToString()))
+			{
+				"产品生产数量不能为空".ShowWarning();
+				txtnumber.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtmaterialcode.EditValue.ToString()))
+			{
+				"物料编码不能为空".ShowWarning();
+				txtmaterialcode.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtmaterialid.EditValue.ToString()))
+			{
+				"物料名称不能为空".ShowWarning();
+				txtmaterialid.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtspec.EditValue.ToString()))
+			{
+				"规格型号不能为空".ShowWarning();
+				txtspec.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtmaterialtype.EditValue.ToString()))
+			{
+				"物料类型不能为空".ShowWarning();
+				txtmaterialtype.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtuintnumber.EditValue.ToString()))
+			{
+				"单位用量不能为空".ShowWarning();
+				txtuintnumber.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtneednumber.EditValue.ToString()))
+			{
+				"需求总量不能为空".ShowWarning();
+				txtneednumber.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtunit.EditValue.ToString()))
+			{
+				"计量单位不能为空".ShowWarning();
+				txtunit.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtunitprice.EditValue.ToString()))
+			{
+				"单价不能为空".ShowWarning();
+				txtunitprice.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txttotalprice.EditValue.ToString()))
+			{
+				"总价不能为空".ShowWarning();
+				txttotalprice.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtwarehouse.EditValue.ToString()))
+			{
+				"仓库不能为空".ShowWarning();
+				txtwarehouse.Focus();
+				return false;
+			}
+			return true;
+        }
+        /// <summary>
+		/// 保存
+		/// </summary>
+		/// <returns></returns>
+		public override bool SaveFunction()
+        {
+            try
+            {
+                productionBOMInfo info= (productionBOMInfo)this.ControlDataToModel(new productionBOMInfo());
+                using (var db = new MESDB())
+                {
+                    db.productionBOMInfo.AddOrUpdate(info);
+                    db.SaveChanges();
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.Message.ShowError();
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+		/// 删除
+		/// </summary>
+		/// <returns></returns>
+		public override bool DelFunction()
+        {
+            try
+            {
+                productionBOMInfo info = (productionBOMInfo)this.ControlDataToModel(new productionBOMInfo());
+                using (var db = new MESDB())
+                {
+                    db.Entry(info).State=EntityState.Deleted;
+                    db.SaveChanges();
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.Message.ShowError();
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+		/// 搜索
+		/// </summary>
+		/// <returns></returns>
+        public override void SearchFunction()
+        {
+            FrmSearch frm = new FrmSearch(fieldDictionary);
+            if (frm.ShowDialog()==DialogResult.OK)
+            {
+                string sql = frm.sql;
+                using (var db = new MESDB())
+                {
+                    if (string.IsNullOrEmpty(sql))
+                    {
+                        grdList.DataSource = db.productionBOMInfo.SqlQuery("select * from productionBOM").ToList();
+                    }
+                    else
+                    {
+                        grdList.DataSource = db.productionBOMInfo.SqlQuery($"select * from productionBOM where {sql}").ToList();
+                    }
+                }
+            }
+        }
+	}
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.designer.cs
new file mode 100644
index 0000000..03a79a5
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.designer.cs
@@ -0,0 +1,864 @@
+
+using DevExpress.XtraEditors;
+using DevExpress.XtraLayout;
+using DevExpress.XtraTab;
+
+namespace MES.Form
+{
+    partial class  FrmproductionBOM
+    {
+        /// <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.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtmaterialtype = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.tabDataList = new DevExpress.XtraTab.XtraTabPage();
+            this.grdList = new DevExpress.XtraGrid.GridControl();
+            this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage();
+            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtid = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtprojectBOMcode = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtproductionBOMcode = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtnumber = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtmaterialcode = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtmaterialid = new DevExpress.XtraEditors.LookUpEdit();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtspec = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtmaterialtype = new DevExpress.XtraEditors.LookUpEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtuintnumber = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtneednumber = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtunit = new DevExpress.XtraEditors.LookUpEdit();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtunitprice = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txttotalprice = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtwarehouse = new DevExpress.XtraEditors.LookUpEdit();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtremark = new DevExpress.XtraEditors.TextEdit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialid)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialtype)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.tabDataList.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit();
+            this.tabDataDetail.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+            this.panelControl2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtprojectBOMcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductionBOMcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtmaterialcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtmaterialid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtmaterialtype.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtuintnumber.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtneednumber.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunitprice.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "id";
+            this.gridColumn1.FieldName = "id";
+            this.gridColumn1.Name = "gridColumn1";
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "工程BOM编号";
+            this.gridColumn2.FieldName = "projectBOMcode";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 0;
+            this.gridColumn2.Width = 201;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "生产BOM编号";
+            this.gridColumn3.FieldName = "productionBOMcode";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 1;
+            this.gridColumn3.Width = 201;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "产品生产数量";
+            this.gridColumn4.FieldName = "number";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 2;
+            this.gridColumn4.Width = 201;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "物料编码";
+            this.gridColumn5.FieldName = "materialcode";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 201;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "物料名称";
+            this.gridColumn6.ColumnEdit = this.repositoryItemtxtmaterialid;
+            this.gridColumn6.FieldName = "materialid";
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 201;
+            // 
+            // repositoryItemtxtmaterialid
+            // 
+            this.repositoryItemtxtmaterialid.AutoHeight = false;
+            this.repositoryItemtxtmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtmaterialid.DisplayMember = "Name";
+            this.repositoryItemtxtmaterialid.Name = "repositoryItemtxtmaterialid";
+            this.repositoryItemtxtmaterialid.ValueMember = "ID";
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "规格型号";
+            this.gridColumn7.FieldName = "spec";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.Width = 201;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "物料类型";
+            this.gridColumn8.ColumnEdit = this.repositoryItemtxtmaterialtype;
+            this.gridColumn8.FieldName = "materialtype";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 6;
+            this.gridColumn8.Width = 201;
+            // 
+            // repositoryItemtxtmaterialtype
+            // 
+            this.repositoryItemtxtmaterialtype.AutoHeight = false;
+            this.repositoryItemtxtmaterialtype.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtmaterialtype.DisplayMember = "Name";
+            this.repositoryItemtxtmaterialtype.Name = "repositoryItemtxtmaterialtype";
+            this.repositoryItemtxtmaterialtype.ValueMember = "ID";
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "单位用量";
+            this.gridColumn9.FieldName = "uintnumber";
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 7;
+            this.gridColumn9.Width = 201;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "需求总量";
+            this.gridColumn10.FieldName = "neednumber";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 8;
+            this.gridColumn10.Width = 201;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "计量单位";
+            this.gridColumn11.ColumnEdit = this.repositoryItemtxtunit;
+            this.gridColumn11.FieldName = "unit";
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 9;
+            this.gridColumn11.Width = 201;
+            // 
+            // repositoryItemtxtunit
+            // 
+            this.repositoryItemtxtunit.AutoHeight = false;
+            this.repositoryItemtxtunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtunit.DisplayMember = "Name";
+            this.repositoryItemtxtunit.Name = "repositoryItemtxtunit";
+            this.repositoryItemtxtunit.ValueMember = "ID";
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "单价";
+            this.gridColumn12.FieldName = "unitprice";
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 10;
+            this.gridColumn12.Width = 201;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "总价";
+            this.gridColumn13.FieldName = "totalprice";
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 11;
+            this.gridColumn13.Width = 201;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "仓库";
+            this.gridColumn14.ColumnEdit = this.repositoryItemtxtwarehouse;
+            this.gridColumn14.FieldName = "warehouse";
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 12;
+            this.gridColumn14.Width = 201;
+            // 
+            // repositoryItemtxtwarehouse
+            // 
+            this.repositoryItemtxtwarehouse.AutoHeight = false;
+            this.repositoryItemtxtwarehouse.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtwarehouse.DisplayMember = "Name";
+            this.repositoryItemtxtwarehouse.Name = "repositoryItemtxtwarehouse";
+            this.repositoryItemtxtwarehouse.ValueMember = "ID";
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "备注";
+            this.gridColumn15.FieldName = "remark";
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 13;
+            this.gridColumn15.Width = 201;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.tabDataList;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1310, 772);
+            this.xtraTabControl1.TabIndex = 1;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabDataList,
+            this.tabDataDetail});
+            // 
+            // tabDataList
+            // 
+            this.tabDataList.Controls.Add(this.grdList);
+            this.tabDataList.Name = "tabDataList";
+            this.tabDataList.Size = new System.Drawing.Size(1305, 746);
+            this.tabDataList.Text = "数据列表";
+            // 
+            // grdList
+            // 
+            this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.grdList.Location = new System.Drawing.Point(0, 0);
+            this.grdList.MainView = this.grdListView;
+            this.grdList.Name = "grdList";
+            this.grdList.Size = new System.Drawing.Size(1305, 746);
+            this.grdList.TabIndex = 0;
+            this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.grdListView});
+            // 
+            // grdListView
+            // 
+            this.grdListView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15});
+            this.grdListView.GridControl = this.grdList;
+            this.grdListView.Name = "grdListView";
+            this.grdListView.OptionsBehavior.Editable = false;
+            this.grdListView.OptionsView.ColumnAutoWidth = false;
+            // 
+            // tabDataDetail
+            // 
+            this.tabDataDetail.Controls.Add(this.panelControl2);
+            this.tabDataDetail.Name = "tabDataDetail";
+            this.tabDataDetail.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataDetail.Text = "数据编辑";
+            // 
+            // panelControl2
+            // 
+            this.panelControl2.Controls.Add(this.layoutControl1);
+            this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelControl2.Location = new System.Drawing.Point(0, 0);
+            this.panelControl2.Name = "panelControl2";
+            this.panelControl2.Size = new System.Drawing.Size(1294, 737);
+            this.panelControl2.TabIndex = 0;
+            // 
+            // layoutControl1
+            // 
+            this.layoutControl1.Controls.Add(this.txtid);
+            this.layoutControl1.Controls.Add(this.txtprojectBOMcode);
+            this.layoutControl1.Controls.Add(this.txtproductionBOMcode);
+            this.layoutControl1.Controls.Add(this.txtnumber);
+            this.layoutControl1.Controls.Add(this.txtmaterialcode);
+            this.layoutControl1.Controls.Add(this.txtmaterialid);
+            this.layoutControl1.Controls.Add(this.txtspec);
+            this.layoutControl1.Controls.Add(this.txtmaterialtype);
+            this.layoutControl1.Controls.Add(this.txtuintnumber);
+            this.layoutControl1.Controls.Add(this.txtneednumber);
+            this.layoutControl1.Controls.Add(this.txtunit);
+            this.layoutControl1.Controls.Add(this.txtunitprice);
+            this.layoutControl1.Controls.Add(this.txttotalprice);
+            this.layoutControl1.Controls.Add(this.txtwarehouse);
+            this.layoutControl1.Controls.Add(this.txtremark);
+            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutControl1.Location = new System.Drawing.Point(2, 2);
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.Root = this.layoutControlGroup1;
+            this.layoutControl1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControl1.TabIndex = 6;
+            this.layoutControl1.Text = "layoutControl1";
+            // 
+            // layoutControlGroup1
+            // 
+            this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1";
+            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem9,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem12,
+            this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem15});
+            this.layoutControlGroup1.Name = "layoutControlGroup1";
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControlGroup1.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txtid;
+            this.layoutControlItem1.CustomizationFormText = "id";
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem1.Text = "id";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtid
+            // 
+            this.txtid.Location = new System.Drawing.Point(88, 12);
+            this.txtid.Name = "txtid";
+            this.txtid.Size = new System.Drawing.Size(1190, 20);
+            this.txtid.StyleController = this.layoutControl1;
+            this.txtid.TabIndex = 1;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtprojectBOMcode;
+            this.layoutControlItem2.CustomizationFormText = "工程BOM编号";
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem2.Text = "工程BOM编号";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtprojectBOMcode
+            // 
+            this.txtprojectBOMcode.Location = new System.Drawing.Point(88, 36);
+            this.txtprojectBOMcode.Name = "txtprojectBOMcode";
+            this.txtprojectBOMcode.Size = new System.Drawing.Size(1190, 20);
+            this.txtprojectBOMcode.StyleController = this.layoutControl1;
+            this.txtprojectBOMcode.TabIndex = 2;
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txtproductionBOMcode;
+            this.layoutControlItem3.CustomizationFormText = "生产BOM编号";
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem3.Text = "生产BOM编号";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtproductionBOMcode
+            // 
+            this.txtproductionBOMcode.Location = new System.Drawing.Point(88, 60);
+            this.txtproductionBOMcode.Name = "txtproductionBOMcode";
+            this.txtproductionBOMcode.Size = new System.Drawing.Size(1190, 20);
+            this.txtproductionBOMcode.StyleController = this.layoutControl1;
+            this.txtproductionBOMcode.TabIndex = 3;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txtnumber;
+            this.layoutControlItem4.CustomizationFormText = "产品生产数量";
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem4.Text = "产品生产数量";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtnumber
+            // 
+            this.txtnumber.Location = new System.Drawing.Point(88, 84);
+            this.txtnumber.Name = "txtnumber";
+            this.txtnumber.Size = new System.Drawing.Size(1190, 20);
+            this.txtnumber.StyleController = this.layoutControl1;
+            this.txtnumber.TabIndex = 4;
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txtmaterialcode;
+            this.layoutControlItem5.CustomizationFormText = "物料编码";
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem5.Text = "物料编码";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtmaterialcode
+            // 
+            this.txtmaterialcode.Location = new System.Drawing.Point(88, 108);
+            this.txtmaterialcode.Name = "txtmaterialcode";
+            this.txtmaterialcode.Size = new System.Drawing.Size(1190, 20);
+            this.txtmaterialcode.StyleController = this.layoutControl1;
+            this.txtmaterialcode.TabIndex = 5;
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txtmaterialid;
+            this.layoutControlItem6.CustomizationFormText = "物料名称";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem6.Text = "物料名称";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtmaterialid
+            // 
+            this.txtmaterialid.EditValue = "";
+            this.txtmaterialid.Location = new System.Drawing.Point(88, 132);
+            this.txtmaterialid.Name = "txtmaterialid";
+            this.txtmaterialid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtmaterialid.Properties.DisplayMember = "Name";
+            this.txtmaterialid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtmaterialid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtmaterialid.Properties.ValueMember = "ID";
+            this.txtmaterialid.Size = new System.Drawing.Size(1190, 20);
+            this.txtmaterialid.StyleController = this.layoutControl1;
+            this.txtmaterialid.TabIndex = 6;
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txtspec;
+            this.layoutControlItem7.CustomizationFormText = "规格型号";
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 144);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem7.Text = "规格型号";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtspec
+            // 
+            this.txtspec.Location = new System.Drawing.Point(88, 156);
+            this.txtspec.Name = "txtspec";
+            this.txtspec.Size = new System.Drawing.Size(1190, 20);
+            this.txtspec.StyleController = this.layoutControl1;
+            this.txtspec.TabIndex = 7;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtmaterialtype;
+            this.layoutControlItem8.CustomizationFormText = "物料类型";
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 168);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem8.Text = "物料类型";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtmaterialtype
+            // 
+            this.txtmaterialtype.EditValue = "";
+            this.txtmaterialtype.Location = new System.Drawing.Point(88, 180);
+            this.txtmaterialtype.Name = "txtmaterialtype";
+            this.txtmaterialtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtmaterialtype.Properties.DisplayMember = "Name";
+            this.txtmaterialtype.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtmaterialtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtmaterialtype.Properties.ValueMember = "ID";
+            this.txtmaterialtype.Size = new System.Drawing.Size(1190, 20);
+            this.txtmaterialtype.StyleController = this.layoutControl1;
+            this.txtmaterialtype.TabIndex = 8;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txtuintnumber;
+            this.layoutControlItem9.CustomizationFormText = "单位用量";
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 192);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem9.Text = "单位用量";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtuintnumber
+            // 
+            this.txtuintnumber.Location = new System.Drawing.Point(88, 204);
+            this.txtuintnumber.Name = "txtuintnumber";
+            this.txtuintnumber.Size = new System.Drawing.Size(1190, 20);
+            this.txtuintnumber.StyleController = this.layoutControl1;
+            this.txtuintnumber.TabIndex = 9;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txtneednumber;
+            this.layoutControlItem10.CustomizationFormText = "需求总量";
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 216);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem10.Text = "需求总量";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtneednumber
+            // 
+            this.txtneednumber.Location = new System.Drawing.Point(88, 228);
+            this.txtneednumber.Name = "txtneednumber";
+            this.txtneednumber.Size = new System.Drawing.Size(1190, 20);
+            this.txtneednumber.StyleController = this.layoutControl1;
+            this.txtneednumber.TabIndex = 10;
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txtunit;
+            this.layoutControlItem11.CustomizationFormText = "计量单位";
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 240);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem11.Text = "计量单位";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtunit
+            // 
+            this.txtunit.EditValue = "";
+            this.txtunit.Location = new System.Drawing.Point(88, 252);
+            this.txtunit.Name = "txtunit";
+            this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtunit.Properties.DisplayMember = "Name";
+            this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtunit.Properties.ValueMember = "ID";
+            this.txtunit.Size = new System.Drawing.Size(1190, 20);
+            this.txtunit.StyleController = this.layoutControl1;
+            this.txtunit.TabIndex = 11;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txtunitprice;
+            this.layoutControlItem12.CustomizationFormText = "单价";
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 264);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem12.Text = "单价";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtunitprice
+            // 
+            this.txtunitprice.Location = new System.Drawing.Point(88, 276);
+            this.txtunitprice.Name = "txtunitprice";
+            this.txtunitprice.Size = new System.Drawing.Size(1190, 20);
+            this.txtunitprice.StyleController = this.layoutControl1;
+            this.txtunitprice.TabIndex = 12;
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txttotalprice;
+            this.layoutControlItem13.CustomizationFormText = "总价";
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 288);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem13.Text = "总价";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txttotalprice
+            // 
+            this.txttotalprice.Location = new System.Drawing.Point(88, 300);
+            this.txttotalprice.Name = "txttotalprice";
+            this.txttotalprice.Size = new System.Drawing.Size(1190, 20);
+            this.txttotalprice.StyleController = this.layoutControl1;
+            this.txttotalprice.TabIndex = 13;
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txtwarehouse;
+            this.layoutControlItem14.CustomizationFormText = "仓库";
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 312);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem14.Text = "仓库";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtwarehouse
+            // 
+            this.txtwarehouse.EditValue = "";
+            this.txtwarehouse.Location = new System.Drawing.Point(88, 324);
+            this.txtwarehouse.Name = "txtwarehouse";
+            this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtwarehouse.Properties.DisplayMember = "Name";
+            this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtwarehouse.Properties.ValueMember = "ID";
+            this.txtwarehouse.Size = new System.Drawing.Size(1190, 20);
+            this.txtwarehouse.StyleController = this.layoutControl1;
+            this.txtwarehouse.TabIndex = 14;
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txtremark;
+            this.layoutControlItem15.CustomizationFormText = "备注";
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 336);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.Size = new System.Drawing.Size(1270, 377);
+            this.layoutControlItem15.Text = "备注";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(73, 14);
+            // 
+            // txtremark
+            // 
+            this.txtremark.Location = new System.Drawing.Point(88, 348);
+            this.txtremark.Name = "txtremark";
+            this.txtremark.Size = new System.Drawing.Size(1190, 20);
+            this.txtremark.StyleController = this.layoutControl1;
+            this.txtremark.TabIndex = 15;
+            // 
+            // FrmproductionBOM
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1310, 806);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Name = "FrmproductionBOM";
+            this.Text = "FrmproductionBOM";
+            this.Load += new System.EventHandler(this.FrmproductionBOM_Load);
+            this.Controls.SetChildIndex(this.xtraTabControl1, 0);
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialid)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtmaterialtype)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtwarehouse)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.tabDataList.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit();
+            this.tabDataDetail.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+            this.panelControl2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtprojectBOMcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductionBOMcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtmaterialcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtmaterialid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtmaterialtype.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtuintnumber.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtneednumber.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunitprice.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txttotalprice.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private XtraTabControl xtraTabControl1;
+        private XtraTabPage tabDataList;
+        private XtraTabPage tabDataDetail;
+        private DevExpress.XtraGrid.GridControl grdList;
+        private DevExpress.XtraGrid.Views.Grid.GridView grdListView;
+        private PanelControl panelControl2;
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtid;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtprojectBOMcode;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtproductionBOMcode;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtnumber;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtmaterialcode;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtmaterialid;
+
+        private DevExpress.XtraEditors.LookUpEdit txtmaterialid;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtspec;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtmaterialtype;
+
+        private DevExpress.XtraEditors.LookUpEdit txtmaterialtype;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtuintnumber;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtneednumber;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtunit;
+
+        private DevExpress.XtraEditors.LookUpEdit txtunit;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtunitprice;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txttotalprice;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtwarehouse;
+
+        private DevExpress.XtraEditors.LookUpEdit txtwarehouse;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtremark;
+
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.resx b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductionBOM.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>
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.cs
new file mode 100644
index 0000000..002d171
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.cs
@@ -0,0 +1,385 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using WinformGeneralDeveloperFrame;
+using WinformGeneralDeveloperFrame.Commons;
+using DevExpress.XtraLayout;
+using MES.Entity;
+using System.Data.Entity.Migrations;
+using System.Data.Entity;
+using CCWin.SkinClass;
+using DevExpress.XtraEditors;
+
+namespace MES.Form
+{
+	public partial class FrmproductionRequisition : FrmBaseForm
+	{
+        private Dictionary<string, string> fieldDictionary = new Dictionary<string, string>();
+		public FrmproductionRequisition()
+		{
+			InitializeComponent();
+		}
+		private void FrmproductionRequisition_Load(object sender, EventArgs e)
+        {
+			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new productionRequisitionInfo(),gridControl1,new string[]{ "txtcode" });
+            InitSearchDicData();
+            repositoryItemLookUpEditmaterialid.EditValueChanged += RepositoryItemLookUpEditmaterialid_EditValueChanged;
+        }
+
+        private void RepositoryItemLookUpEditmaterialid_EditValueChanged(object sender, EventArgs e)
+        {
+            LookUpEdit lookUpEdit = sender as LookUpEdit;
+            DataRowView data=lookUpEdit.GetSelectedDataRow() as DataRowView;
+            using (var db=new MESDB())
+            {
+                int id = data.Row["ID"].ToInt32();
+                int BOMid = data.Row["BOMid"].ToInt32();
+                productBOMdetailInfo productBoMdetail = db.productBOMdetailInfo.Where(p =>
+                    p.materialid ==  id&& p.productBOMid == BOMid).ToList().First();
+                gridView1.GetFocusedDataRow()["materialcode"] = productBoMdetail.materialcode;
+                gridView1.GetFocusedDataRow()["materialspec"] = productBoMdetail.materialspec;
+                gridView1.GetFocusedDataRow()["materialtype"] = productBoMdetail.materialtype;
+                gridView1.GetFocusedDataRow()["unitnumber"] = productBoMdetail.unitusenumber;
+
+                gridView1.GetFocusedDataRow()["productnumber"] = txtnumber.Text;
+                gridView1.GetFocusedDataRow()["unit"] = productBoMdetail.unit;
+                gridView1.GetFocusedDataRow()["warehouse"] = productBoMdetail.warehouse;
+               // gridView1.GetFocusedDataRow()["unitnumber"] = productBoMdetail.materialcode;
+
+            }
+        }
+
+        /// <summary>
+        /// 数据源初始化
+        /// </summary>
+        /// <returns></returns>
+        private void Init()
+		{
+			txtproductID.Properties.DataSource = GetDataTableUtils.SqlTable("产品");     
+			repositoryItemtxtproductID.DataSource= GetDataTableUtils.SqlTable("产品");  
+			txtunit.Properties.DataSource = GetDataTableUtils.SqlTable("计量单位");     
+			repositoryItemtxtunit.DataSource= GetDataTableUtils.SqlTable("计量单位");  
+			txtpickingdept.Properties.DataSource = GetDataTableUtils.SqlTable("部门");     
+			repositoryItemTreeListtxtpickingdept.DataSource= GetDataTableUtils.SqlTable("部门");  
+			txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户");     
+			repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户");
+
+            repositoryItemLookUpEditwarehouse.DataSource = GetDataTableUtils.SqlTable("仓库");
+            repositoryItemLookUpEditunit.DataSource = GetDataTableUtils.SqlTable("计量单位");
+            repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTable("物料");
+            repositoryItemLookUpEditmaterialtype.DataSource = GetDataTableUtils.SqlTable("物料类别");
+			
+        }
+		/// <summary>
+		/// 搜索字段
+		/// </summary>
+		/// <returns></returns>
+		private void InitSearchDicData()
+        {
+			fieldDictionary.Add("领料单号","code");     
+			fieldDictionary.Add("工单号","wocode");     
+			fieldDictionary.Add("销售单号","salecode");     
+        }
+
+		public override void InitgrdListDataSource()
+        {
+			 using (var con=new MESDB())///
+            {
+				grdList.DataSource=con.productionRequisitionInfo.ToList();
+            }
+            Init();
+		}
+	    /// <summary>
+		/// 字段为空校验
+		/// </summary>
+		/// <returns></returns>
+        public override bool CheckInput()
+        {
+			if(string.IsNullOrEmpty(txtwocode.EditValue.ToString()))
+			{
+				"工单号不能为空".ShowWarning();
+				txtwocode.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtpickingtime.EditValue.ToString()))
+			{
+				"领料日期不能为空".ShowWarning();
+				txtpickingtime.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtproductID.EditValue.ToString()))
+			{
+				"产品不能为空".ShowWarning();
+				txtproductID.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtproductcode.EditValue.ToString()))
+			{
+				"产品编号不能为空".ShowWarning();
+				txtproductcode.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtproductspec.EditValue.ToString()))
+			{
+				"规格型号不能为空".ShowWarning();
+				txtproductspec.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtnumber.EditValue.ToString()))
+			{
+				"生产数量不能为空".ShowWarning();
+				txtnumber.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtunit.EditValue.ToString()))
+			{
+				"计量单位不能为空".ShowWarning();
+				txtunit.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtpickingdept.EditValue.ToString()))
+			{
+				"领料部门不能为空".ShowWarning();
+				txtpickingdept.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtcreatorId.EditValue.ToString()))
+			{
+				"制单人不能为空".ShowWarning();
+				txtcreatorId.Focus();
+				return false;
+			}
+			if(string.IsNullOrEmpty(txtcreateTime.EditValue.ToString()))
+			{
+				"制单日期不能为空".ShowWarning();
+				txtcreateTime.Focus();
+				return false;
+			}
+			return true;
+        }
+        /// <summary>
+		/// 保存
+		/// </summary>
+		/// <returns></returns>
+		public override bool SaveFunction()
+        {
+            string code = "MOO" + DateTime.Now.GetDateTimeCode();
+
+            DataTable dt = gridControl1.DataSource as DataTable;
+            try
+            {
+                productionRequisitionInfo info = (productionRequisitionInfo)this.ControlDataToModel(new productionRequisitionInfo());
+                using (var db = new MESDB())
+                {
+                    using (var tran = db.Database.BeginTransaction())
+                    {
+                        try
+                        {
+                            Dictionary<string, List<productionRequisitionDetailInfo>> dic =
+                                dt.GetDataTableData<productionRequisitionDetailInfo>();
+                            if (info.id == 0) //新增
+                            {
+                                info.code = code;
+                                db.productionRequisitionInfo.Add(info);
+                                db.SaveChanges();
+                                txtid.Text = info.id.ToString();
+                                txtcode.Text = code;
+                                if (dt != null)
+                                {
+                                    List<productionRequisitionDetailInfo> detaiListAdd =
+                                        dic["Add"];
+                                    int num = 0;
+                                    detaiListAdd.ForEach(a =>
+                                    {
+                                        num++;
+                                        string codedetail = "MOOD" + DateTime.Now.GetDateTimeCode() + num;
+                                        a.masterid = info.id;
+                                        a.mastercode = info.code;
+                                        a.wocode = info.wocode;
+                                        a.detailcode = codedetail;
+                                    });
+                                    db.productionRequisitionDetailInfo.AddRange(detaiListAdd);
+                                    db.SaveChanges();
+                                }
+                            }
+                            else //更新
+                            {
+                                db.Entry(info).State = EntityState.Modified;
+                                db.SaveChanges();
+                                if (dt != null)
+                                {
+                                    List<productionRequisitionDetailInfo> detaiListAdd =
+                                        dic["Add"];
+                                    int num = 0;
+                                    detaiListAdd.ForEach(a =>
+                                    {
+                                        a.masterid = info.id;
+                                        a.mastercode = info.code;
+                                        num++;
+                                        string codedetail = "MOOD" + DateTime.Now.GetDateTimeCode() + num;
+                                        a.detailcode = codedetail;
+                                        a.wocode = info.wocode;
+                                    });
+                                    db.productionRequisitionDetailInfo.AddRange(detaiListAdd);
+
+                                    List<productionRequisitionDetailInfo> detaiListEdit =
+                                        dic["Edit"];
+
+                                    detaiListEdit.ForEach((a) =>
+                                    {
+                                        //a.buyercode = info.buyercode;
+                                        db.Entry(a).State = EntityState.Modified;
+                                    });
+
+                                    List<productionRequisitionDetailInfo> detaiListDel =
+                                        dic["Del"];
+                                    detaiListDel.ForEach((a) => { db.Entry(a).State = EntityState.Deleted; });
+                                    db.SaveChanges();
+                                }
+                            }
+
+                            tran.Commit();
+                        }
+                        catch (Exception ex)
+                        {
+                            tran.Rollback();
+                            ex.Message.ShowError();
+                            return false;
+                        }
+                        finally
+                        {
+                            tran.Dispose();
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.Message.ShowError();
+                return false;
+            }
+
+            return true;
+        }
+        /// <summary>
+		/// 删除
+		/// </summary>
+		/// <returns></returns>
+		public override bool DelFunction()
+        {
+            try
+            {
+                productionRequisitionInfo info = (productionRequisitionInfo)this.ControlDataToModel(new productionRequisitionInfo());
+                using (var db = new MESDB())
+                {
+                    db.Entry(info).State=EntityState.Deleted;
+                    db.SaveChanges();
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.Message.ShowError();
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+		/// 搜索
+		/// </summary>
+		/// <returns></returns>
+        public override void SearchFunction()
+        {
+            FrmSearch frm = new FrmSearch(fieldDictionary);
+            if (frm.ShowDialog()==DialogResult.OK)
+            {
+                string sql = frm.sql;
+                using (var db = new MESDB())
+                {
+                    if (string.IsNullOrEmpty(sql))
+                    {
+                        grdList.DataSource = db.productionRequisitionInfo.SqlQuery("select * from productionRequisition").ToList();
+                    }
+                    else
+                    {
+                        grdList.DataSource = db.productionRequisitionInfo.SqlQuery($"select * from productionRequisition where {sql}").ToList();
+                    }
+                }
+            }
+        }
+
+        public override void EditFunction()
+        {
+            using (var db = new MESDB())
+            {
+                var list = db.workorderInfo.Where(p => p.wordordercode == txtwocode.Text.ToUpper().Trim()).ToList();
+                {
+                    workorderInfo info = list.First();
+
+                    repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTableBySql(
+                        $"SELECT B.id ID,B.name Name,b.code Code,a.productBOMid BOMid FROM [winformdevfarme].[dbo].[productBOMdetail] A LEFT JOIN [winformdevfarme].[dbo].material B ON A.materialid = B.id where a.productBOMid = {info.bomid}");
+                }
+            }
+        }
+
+        public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e)
+        {
+            productionRequisitionInfo info = grdListView.GetFocusedRow() as productionRequisitionInfo;
+            if (info != null)
+            {
+                using (var db = new MESDB())
+                {
+                    gridControl1.DataSource = db.productionRequisitionDetailInfo.Where(p => p.masterid== info.id).ToList().ToDataTable();
+                    gridView1.BestFitColumns();
+                }
+            }
+        }
+
+        public override void AddFunction()
+        {
+            txtpickingdept.EditValue = AppInfo.LoginUserInfo.deptId;
+            gridControl1.DataSource = new List<productionRequisitionDetailInfo>().ToDataTable();
+        }
+
+        private void toolStripMenuItemAdd_Click(object sender, EventArgs e)
+        {
+            gridView1.AddNewRow();
+		}
+
+        private void toolStripMenuItemDel_Click(object sender, EventArgs e)
+        {
+            gridView1.DeleteRow(gridView1.FocusedRowHandle);
+		}
+        private void txtwocode_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == 13)
+            {
+                using (var db = new MESDB())
+                {
+                    var list = db.workorderInfo.Where(p => p.wordordercode == txtwocode.Text.ToUpper().Trim()).ToList();
+                    if (list.Count == 0)
+                    {
+                        "工单号不存在！".ShowTips();
+                    }
+                    else
+                    {
+                        workorderInfo info = list.First();
+                        txtsalecode.Text = info.salecode;
+                        txtproductID.EditValue = info.productid;
+                        txtproductcode.Text = info.productcode;
+                        txtproductspec.Text = info.spec;
+                        txtnumber.EditValue = info.productnumber;
+                        txtunit.EditValue = info.unit;
+
+                        repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTableBySql($"SELECT B.id ID,B.name Name,b.code Code,a.productBOMid BOMid FROM [winformdevfarme].[dbo].[productBOMdetail] A LEFT JOIN [winformdevfarme].[dbo].material B ON A.materialid = B.id where a.productBOMid = {info.bomid}");
+
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.designer.cs b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.designer.cs
new file mode 100644
index 0000000..0ba75a9
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.designer.cs
@@ -0,0 +1,1218 @@
+
+using DevExpress.XtraEditors;
+using DevExpress.XtraLayout;
+using DevExpress.XtraTab;
+
+namespace MES.Form
+{
+    partial class  FrmproductionRequisition
+    {
+        /// <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.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtproductID = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemTreeListtxtpickingdept = new DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit();
+            this.repositoryItemTreeListtxtpickingdeptTreeList = new DevExpress.XtraTreeList.TreeList();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemtxtcreatorId = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.tabDataList = new DevExpress.XtraTab.XtraTabPage();
+            this.grdList = new DevExpress.XtraGrid.GridControl();
+            this.grdListView = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage();
+            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripMenuItemAdd = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItemDel = new System.Windows.Forms.ToolStripMenuItem();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditmaterialtype = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditwarehouse = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.txtid = new DevExpress.XtraEditors.TextEdit();
+            this.txtcode = new DevExpress.XtraEditors.TextEdit();
+            this.txtwocode = new DevExpress.XtraEditors.TextEdit();
+            this.txtsalecode = new DevExpress.XtraEditors.TextEdit();
+            this.txtpickingtime = new DevExpress.XtraEditors.DateEdit();
+            this.txtproductID = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtproductcode = new DevExpress.XtraEditors.TextEdit();
+            this.txtproductspec = new DevExpress.XtraEditors.TextEdit();
+            this.txtnumber = new DevExpress.XtraEditors.TextEdit();
+            this.txtunit = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtpickingdept = new DevExpress.XtraEditors.TreeListLookUpEdit();
+            this.txtpickingdeptTreeList = new DevExpress.XtraTreeList.TreeList();
+            this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtcreateTime = new DevExpress.XtraEditors.DateEdit();
+            this.txtremark = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductID)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdept)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdeptTreeList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.tabDataList.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.grdListView)).BeginInit();
+            this.tabDataDetail.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+            this.panelControl2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
+            this.xtraTabControl2.SuspendLayout();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+            this.contextMenuStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtwocode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductID.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingdept.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingdeptTreeList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "id";
+            this.gridColumn1.FieldName = "id";
+            this.gridColumn1.Name = "gridColumn1";
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "领料单号";
+            this.gridColumn2.FieldName = "code";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 0;
+            this.gridColumn2.Width = 201;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "工单号";
+            this.gridColumn3.FieldName = "wocode";
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 1;
+            this.gridColumn3.Width = 201;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "销售单号";
+            this.gridColumn4.FieldName = "salecode";
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 2;
+            this.gridColumn4.Width = 201;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "领料日期";
+            this.gridColumn5.DisplayFormat.FormatString = "G";
+            this.gridColumn5.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn5.FieldName = "pickingtime";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 201;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "产品";
+            this.gridColumn6.ColumnEdit = this.repositoryItemtxtproductID;
+            this.gridColumn6.FieldName = "productID";
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 201;
+            // 
+            // repositoryItemtxtproductID
+            // 
+            this.repositoryItemtxtproductID.AutoHeight = false;
+            this.repositoryItemtxtproductID.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtproductID.DisplayMember = "Name";
+            this.repositoryItemtxtproductID.Name = "repositoryItemtxtproductID";
+            this.repositoryItemtxtproductID.ValueMember = "ID";
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "产品编号";
+            this.gridColumn7.FieldName = "productcode";
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.Width = 201;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "规格型号";
+            this.gridColumn8.FieldName = "productspec";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 6;
+            this.gridColumn8.Width = 201;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "生产数量";
+            this.gridColumn9.FieldName = "number";
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 7;
+            this.gridColumn9.Width = 201;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "计量单位";
+            this.gridColumn10.ColumnEdit = this.repositoryItemtxtunit;
+            this.gridColumn10.FieldName = "unit";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 8;
+            this.gridColumn10.Width = 201;
+            // 
+            // repositoryItemtxtunit
+            // 
+            this.repositoryItemtxtunit.AutoHeight = false;
+            this.repositoryItemtxtunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtunit.DisplayMember = "Name";
+            this.repositoryItemtxtunit.Name = "repositoryItemtxtunit";
+            this.repositoryItemtxtunit.ValueMember = "ID";
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "领料部门";
+            this.gridColumn11.ColumnEdit = this.repositoryItemTreeListtxtpickingdept;
+            this.gridColumn11.FieldName = "pickingdept";
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 9;
+            this.gridColumn11.Width = 201;
+            // 
+            // repositoryItemTreeListtxtpickingdept
+            // 
+            this.repositoryItemTreeListtxtpickingdept.AutoHeight = false;
+            this.repositoryItemTreeListtxtpickingdept.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemTreeListtxtpickingdept.DisplayMember = "Name";
+            this.repositoryItemTreeListtxtpickingdept.Name = "repositoryItemTreeListtxtpickingdept";
+            this.repositoryItemTreeListtxtpickingdept.TreeList = this.repositoryItemTreeListtxtpickingdeptTreeList;
+            this.repositoryItemTreeListtxtpickingdept.ValueMember = "ID";
+            // 
+            // repositoryItemTreeListtxtpickingdeptTreeList
+            // 
+            this.repositoryItemTreeListtxtpickingdeptTreeList.Location = new System.Drawing.Point(0, 0);
+            this.repositoryItemTreeListtxtpickingdeptTreeList.Name = "repositoryItemTreeListtxtpickingdeptTreeList";
+            this.repositoryItemTreeListtxtpickingdeptTreeList.OptionsView.ShowIndentAsRowStyle = true;
+            this.repositoryItemTreeListtxtpickingdeptTreeList.ParentFieldName = "PID";
+            this.repositoryItemTreeListtxtpickingdeptTreeList.Size = new System.Drawing.Size(400, 200);
+            this.repositoryItemTreeListtxtpickingdeptTreeList.TabIndex = 0;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "制单人";
+            this.gridColumn12.ColumnEdit = this.repositoryItemtxtcreatorId;
+            this.gridColumn12.FieldName = "creatorId";
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 10;
+            this.gridColumn12.Width = 201;
+            // 
+            // repositoryItemtxtcreatorId
+            // 
+            this.repositoryItemtxtcreatorId.AutoHeight = false;
+            this.repositoryItemtxtcreatorId.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemtxtcreatorId.DisplayMember = "Name";
+            this.repositoryItemtxtcreatorId.Name = "repositoryItemtxtcreatorId";
+            this.repositoryItemtxtcreatorId.ValueMember = "ID";
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "制单日期";
+            this.gridColumn13.DisplayFormat.FormatString = "G";
+            this.gridColumn13.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.gridColumn13.FieldName = "createTime";
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 11;
+            this.gridColumn13.Width = 201;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "备注";
+            this.gridColumn14.FieldName = "remark";
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 12;
+            this.gridColumn14.Width = 201;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.tabDataList;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766);
+            this.xtraTabControl1.TabIndex = 1;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabDataList,
+            this.tabDataDetail});
+            // 
+            // tabDataList
+            // 
+            this.tabDataList.Controls.Add(this.grdList);
+            this.tabDataList.Name = "tabDataList";
+            this.tabDataList.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataList.Text = "数据列表";
+            // 
+            // grdList
+            // 
+            this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.grdList.Location = new System.Drawing.Point(0, 0);
+            this.grdList.MainView = this.grdListView;
+            this.grdList.Name = "grdList";
+            this.grdList.Size = new System.Drawing.Size(1294, 737);
+            this.grdList.TabIndex = 0;
+            this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.grdListView});
+            // 
+            // grdListView
+            // 
+            this.grdListView.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14});
+            this.grdListView.GridControl = this.grdList;
+            this.grdListView.Name = "grdListView";
+            this.grdListView.OptionsBehavior.Editable = false;
+            this.grdListView.OptionsView.ColumnAutoWidth = false;
+            this.grdListView.OptionsView.ShowGroupPanel = false;
+            // 
+            // tabDataDetail
+            // 
+            this.tabDataDetail.Controls.Add(this.panelControl2);
+            this.tabDataDetail.Name = "tabDataDetail";
+            this.tabDataDetail.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataDetail.Text = "数据编辑";
+            // 
+            // panelControl2
+            // 
+            this.panelControl2.Controls.Add(this.layoutControl1);
+            this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelControl2.Location = new System.Drawing.Point(0, 0);
+            this.panelControl2.Name = "panelControl2";
+            this.panelControl2.Size = new System.Drawing.Size(1294, 737);
+            this.panelControl2.TabIndex = 0;
+            // 
+            // layoutControl1
+            // 
+            this.layoutControl1.Controls.Add(this.xtraTabControl2);
+            this.layoutControl1.Controls.Add(this.txtid);
+            this.layoutControl1.Controls.Add(this.txtcode);
+            this.layoutControl1.Controls.Add(this.txtwocode);
+            this.layoutControl1.Controls.Add(this.txtsalecode);
+            this.layoutControl1.Controls.Add(this.txtpickingtime);
+            this.layoutControl1.Controls.Add(this.txtproductID);
+            this.layoutControl1.Controls.Add(this.txtproductcode);
+            this.layoutControl1.Controls.Add(this.txtproductspec);
+            this.layoutControl1.Controls.Add(this.txtnumber);
+            this.layoutControl1.Controls.Add(this.txtunit);
+            this.layoutControl1.Controls.Add(this.txtpickingdept);
+            this.layoutControl1.Controls.Add(this.txtcreatorId);
+            this.layoutControl1.Controls.Add(this.txtcreateTime);
+            this.layoutControl1.Controls.Add(this.txtremark);
+            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutControl1.Location = new System.Drawing.Point(2, 2);
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.Root = this.layoutControlGroup1;
+            this.layoutControl1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControl1.TabIndex = 6;
+            this.layoutControl1.Text = "layoutControl1";
+            // 
+            // xtraTabControl2
+            // 
+            this.xtraTabControl2.Location = new System.Drawing.Point(12, 180);
+            this.xtraTabControl2.Name = "xtraTabControl2";
+            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage2;
+            this.xtraTabControl2.Size = new System.Drawing.Size(1266, 541);
+            this.xtraTabControl2.TabIndex = 15;
+            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.gridControl1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1260, 512);
+            this.xtraTabPage2.Text = "领料明细";
+            // 
+            // gridControl1
+            // 
+            this.gridControl1.ContextMenuStrip = this.contextMenuStrip1;
+            this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl1.Location = new System.Drawing.Point(0, 0);
+            this.gridControl1.MainView = this.gridView1;
+            this.gridControl1.Name = "gridControl1";
+            this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemLookUpEditmaterialid,
+            this.repositoryItemLookUpEditmaterialtype,
+            this.repositoryItemLookUpEditunit,
+            this.repositoryItemLookUpEditwarehouse});
+            this.gridControl1.Size = new System.Drawing.Size(1260, 512);
+            this.gridControl1.TabIndex = 1;
+            this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItemAdd,
+            this.toolStripMenuItemDel});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(113, 48);
+            // 
+            // toolStripMenuItemAdd
+            // 
+            this.toolStripMenuItemAdd.Name = "toolStripMenuItemAdd";
+            this.toolStripMenuItemAdd.Size = new System.Drawing.Size(112, 22);
+            this.toolStripMenuItemAdd.Text = "新增行";
+            this.toolStripMenuItemAdd.Click += new System.EventHandler(this.toolStripMenuItemAdd_Click);
+            // 
+            // toolStripMenuItemDel
+            // 
+            this.toolStripMenuItemDel.Name = "toolStripMenuItemDel";
+            this.toolStripMenuItemDel.Size = new System.Drawing.Size(112, 22);
+            this.toolStripMenuItemDel.Text = "删除行";
+            this.toolStripMenuItemDel.Click += new System.EventHandler(this.toolStripMenuItemDel_Click);
+            // 
+            // gridView1
+            // 
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29});
+            this.gridView1.GridControl = this.gridControl1;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsBehavior.Editable = false;
+            this.gridView1.OptionsView.ColumnAutoWidth = false;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "id";
+            this.gridColumn15.FieldName = "id";
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Width = 201;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "主表ID";
+            this.gridColumn16.FieldName = "masterid";
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Width = 201;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "领料单号";
+            this.gridColumn17.FieldName = "mastercode";
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 11;
+            this.gridColumn17.Width = 201;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "领料明细单号";
+            this.gridColumn18.FieldName = "detailcode";
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 12;
+            this.gridColumn18.Width = 201;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "物料";
+            this.gridColumn19.ColumnEdit = this.repositoryItemLookUpEditmaterialid;
+            this.gridColumn19.FieldName = "materialid";
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 0;
+            this.gridColumn19.Width = 201;
+            // 
+            // repositoryItemLookUpEditmaterialid
+            // 
+            this.repositoryItemLookUpEditmaterialid.AutoHeight = false;
+            this.repositoryItemLookUpEditmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditmaterialid.DisplayMember = "Name";
+            this.repositoryItemLookUpEditmaterialid.Name = "repositoryItemLookUpEditmaterialid";
+            this.repositoryItemLookUpEditmaterialid.NullText = "";
+            this.repositoryItemLookUpEditmaterialid.ValueMember = "ID";
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "物料编码";
+            this.gridColumn20.FieldName = "materialcode";
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 1;
+            this.gridColumn20.Width = 201;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "规格型号";
+            this.gridColumn21.FieldName = "materialspec";
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 2;
+            this.gridColumn21.Width = 201;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "物料类型";
+            this.gridColumn22.ColumnEdit = this.repositoryItemLookUpEditmaterialtype;
+            this.gridColumn22.FieldName = "materialtype";
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 3;
+            this.gridColumn22.Width = 201;
+            // 
+            // repositoryItemLookUpEditmaterialtype
+            // 
+            this.repositoryItemLookUpEditmaterialtype.AutoHeight = false;
+            this.repositoryItemLookUpEditmaterialtype.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditmaterialtype.DisplayMember = "Name";
+            this.repositoryItemLookUpEditmaterialtype.Name = "repositoryItemLookUpEditmaterialtype";
+            this.repositoryItemLookUpEditmaterialtype.NullText = "";
+            this.repositoryItemLookUpEditmaterialtype.ValueMember = "ID";
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "单位用量";
+            this.gridColumn23.FieldName = "unitnumber";
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 4;
+            this.gridColumn23.Width = 201;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "产品生产数量";
+            this.gridColumn24.FieldName = "productnumber";
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 5;
+            this.gridColumn24.Width = 201;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "领料数量";
+            this.gridColumn25.FieldName = "picknumber";
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 6;
+            this.gridColumn25.Width = 201;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "计量单位";
+            this.gridColumn26.ColumnEdit = this.repositoryItemLookUpEditunit;
+            this.gridColumn26.FieldName = "unit";
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 7;
+            this.gridColumn26.Width = 201;
+            // 
+            // repositoryItemLookUpEditunit
+            // 
+            this.repositoryItemLookUpEditunit.AutoHeight = false;
+            this.repositoryItemLookUpEditunit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditunit.DisplayMember = "Name";
+            this.repositoryItemLookUpEditunit.Name = "repositoryItemLookUpEditunit";
+            this.repositoryItemLookUpEditunit.NullText = "";
+            this.repositoryItemLookUpEditunit.ValueMember = "ID";
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "仓库";
+            this.gridColumn27.ColumnEdit = this.repositoryItemLookUpEditwarehouse;
+            this.gridColumn27.FieldName = "warehouse";
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 8;
+            this.gridColumn27.Width = 201;
+            // 
+            // repositoryItemLookUpEditwarehouse
+            // 
+            this.repositoryItemLookUpEditwarehouse.AutoHeight = false;
+            this.repositoryItemLookUpEditwarehouse.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditwarehouse.DisplayMember = "Name";
+            this.repositoryItemLookUpEditwarehouse.Name = "repositoryItemLookUpEditwarehouse";
+            this.repositoryItemLookUpEditwarehouse.NullText = "";
+            this.repositoryItemLookUpEditwarehouse.ValueMember = "ID";
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "备注";
+            this.gridColumn28.FieldName = "remark";
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 9;
+            this.gridColumn28.Width = 201;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "工单号";
+            this.gridColumn29.FieldName = "wocode";
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 10;
+            this.gridColumn29.Width = 201;
+            // 
+            // txtid
+            // 
+            this.txtid.Location = new System.Drawing.Point(63, 12);
+            this.txtid.Name = "txtid";
+            this.txtid.Size = new System.Drawing.Size(578, 20);
+            this.txtid.StyleController = this.layoutControl1;
+            this.txtid.TabIndex = 1;
+            // 
+            // txtcode
+            // 
+            this.txtcode.Location = new System.Drawing.Point(696, 12);
+            this.txtcode.Name = "txtcode";
+            this.txtcode.Size = new System.Drawing.Size(582, 20);
+            this.txtcode.StyleController = this.layoutControl1;
+            this.txtcode.TabIndex = 2;
+            // 
+            // txtwocode
+            // 
+            this.txtwocode.Location = new System.Drawing.Point(63, 36);
+            this.txtwocode.Name = "txtwocode";
+            this.txtwocode.Size = new System.Drawing.Size(578, 20);
+            this.txtwocode.StyleController = this.layoutControl1;
+            this.txtwocode.TabIndex = 3;
+            this.txtwocode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtwocode_KeyPress);
+            // 
+            // txtsalecode
+            // 
+            this.txtsalecode.Location = new System.Drawing.Point(696, 36);
+            this.txtsalecode.Name = "txtsalecode";
+            this.txtsalecode.Size = new System.Drawing.Size(582, 20);
+            this.txtsalecode.StyleController = this.layoutControl1;
+            this.txtsalecode.TabIndex = 4;
+            // 
+            // txtpickingtime
+            // 
+            this.txtpickingtime.EditValue = null;
+            this.txtpickingtime.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtpickingtime.Location = new System.Drawing.Point(63, 108);
+            this.txtpickingtime.Name = "txtpickingtime";
+            this.txtpickingtime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtpickingtime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtpickingtime.Properties.DisplayFormat.FormatString = "G";
+            this.txtpickingtime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtpickingtime.Size = new System.Drawing.Size(578, 20);
+            this.txtpickingtime.StyleController = this.layoutControl1;
+            this.txtpickingtime.TabIndex = 5;
+            // 
+            // txtproductID
+            // 
+            this.txtproductID.EditValue = "";
+            this.txtproductID.Location = new System.Drawing.Point(63, 60);
+            this.txtproductID.Name = "txtproductID";
+            this.txtproductID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtproductID.Properties.DisplayMember = "Name";
+            this.txtproductID.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtproductID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtproductID.Properties.ValueMember = "ID";
+            this.txtproductID.Size = new System.Drawing.Size(578, 20);
+            this.txtproductID.StyleController = this.layoutControl1;
+            this.txtproductID.TabIndex = 6;
+            // 
+            // txtproductcode
+            // 
+            this.txtproductcode.Location = new System.Drawing.Point(696, 60);
+            this.txtproductcode.Name = "txtproductcode";
+            this.txtproductcode.Size = new System.Drawing.Size(582, 20);
+            this.txtproductcode.StyleController = this.layoutControl1;
+            this.txtproductcode.TabIndex = 7;
+            // 
+            // txtproductspec
+            // 
+            this.txtproductspec.Location = new System.Drawing.Point(63, 84);
+            this.txtproductspec.Name = "txtproductspec";
+            this.txtproductspec.Size = new System.Drawing.Size(578, 20);
+            this.txtproductspec.StyleController = this.layoutControl1;
+            this.txtproductspec.TabIndex = 8;
+            // 
+            // txtnumber
+            // 
+            this.txtnumber.Location = new System.Drawing.Point(696, 84);
+            this.txtnumber.Name = "txtnumber";
+            this.txtnumber.Size = new System.Drawing.Size(263, 20);
+            this.txtnumber.StyleController = this.layoutControl1;
+            this.txtnumber.TabIndex = 9;
+            // 
+            // txtunit
+            // 
+            this.txtunit.EditValue = "";
+            this.txtunit.Location = new System.Drawing.Point(1014, 84);
+            this.txtunit.Name = "txtunit";
+            this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtunit.Properties.DisplayMember = "Name";
+            this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtunit.Properties.ValueMember = "ID";
+            this.txtunit.Size = new System.Drawing.Size(264, 20);
+            this.txtunit.StyleController = this.layoutControl1;
+            this.txtunit.TabIndex = 10;
+            // 
+            // txtpickingdept
+            // 
+            this.txtpickingdept.EditValue = "";
+            this.txtpickingdept.Location = new System.Drawing.Point(696, 108);
+            this.txtpickingdept.Name = "txtpickingdept";
+            this.txtpickingdept.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtpickingdept.Properties.DisplayMember = "Name";
+            this.txtpickingdept.Properties.TreeList = this.txtpickingdeptTreeList;
+            this.txtpickingdept.Properties.ValueMember = "ID";
+            this.txtpickingdept.Size = new System.Drawing.Size(582, 20);
+            this.txtpickingdept.StyleController = this.layoutControl1;
+            this.txtpickingdept.TabIndex = 11;
+            // 
+            // txtpickingdeptTreeList
+            // 
+            this.txtpickingdeptTreeList.Location = new System.Drawing.Point(0, 0);
+            this.txtpickingdeptTreeList.Name = "txtpickingdeptTreeList";
+            this.txtpickingdeptTreeList.OptionsView.ShowIndentAsRowStyle = true;
+            this.txtpickingdeptTreeList.ParentFieldName = "PID";
+            this.txtpickingdeptTreeList.Size = new System.Drawing.Size(400, 200);
+            this.txtpickingdeptTreeList.TabIndex = 0;
+            // 
+            // txtcreatorId
+            // 
+            this.txtcreatorId.EditValue = "";
+            this.txtcreatorId.Location = new System.Drawing.Point(63, 132);
+            this.txtcreatorId.Name = "txtcreatorId";
+            this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtcreatorId.Properties.DisplayMember = "Name";
+            this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtcreatorId.Properties.ValueMember = "ID";
+            this.txtcreatorId.Size = new System.Drawing.Size(578, 20);
+            this.txtcreatorId.StyleController = this.layoutControl1;
+            this.txtcreatorId.TabIndex = 12;
+            // 
+            // txtcreateTime
+            // 
+            this.txtcreateTime.EditValue = null;
+            this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtcreateTime.Location = new System.Drawing.Point(696, 132);
+            this.txtcreateTime.Name = "txtcreateTime";
+            this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtcreateTime.Properties.DisplayFormat.FormatString = "G";
+            this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtcreateTime.Size = new System.Drawing.Size(582, 20);
+            this.txtcreateTime.StyleController = this.layoutControl1;
+            this.txtcreateTime.TabIndex = 13;
+            // 
+            // txtremark
+            // 
+            this.txtremark.Location = new System.Drawing.Point(63, 156);
+            this.txtremark.Name = "txtremark";
+            this.txtremark.Size = new System.Drawing.Size(1215, 20);
+            this.txtremark.StyleController = this.layoutControl1;
+            this.txtremark.TabIndex = 14;
+            // 
+            // layoutControlGroup1
+            // 
+            this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1";
+            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem3,
+            this.layoutControlItem6,
+            this.layoutControlItem8,
+            this.layoutControlItem12,
+            this.layoutControlItem14,
+            this.layoutControlItem2,
+            this.layoutControlItem4,
+            this.layoutControlItem7,
+            this.layoutControlItem9,
+            this.layoutControlItem11,
+            this.layoutControlItem5,
+            this.layoutControlItem10,
+            this.layoutControlItem13,
+            this.layoutControlItem15});
+            this.layoutControlGroup1.Name = "layoutControlGroup1";
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControlGroup1.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txtid;
+            this.layoutControlItem1.CustomizationFormText = "id";
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(633, 24);
+            this.layoutControlItem1.Text = "id";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txtwocode;
+            this.layoutControlItem3.CustomizationFormText = "工单号";
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(633, 24);
+            this.layoutControlItem3.Text = "工单号";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txtproductID;
+            this.layoutControlItem6.CustomizationFormText = "产品";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(633, 24);
+            this.layoutControlItem6.Text = "产品";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtproductspec;
+            this.layoutControlItem8.CustomizationFormText = "规格型号";
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(633, 24);
+            this.layoutControlItem8.Text = "规格型号";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txtcreatorId;
+            this.layoutControlItem12.CustomizationFormText = "制单人";
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.Size = new System.Drawing.Size(633, 24);
+            this.layoutControlItem12.Text = "制单人";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txtremark;
+            this.layoutControlItem14.CustomizationFormText = "备注";
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 144);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem14.Text = "备注";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txtcode;
+            this.layoutControlItem2.CustomizationFormText = "领料单号";
+            this.layoutControlItem2.Location = new System.Drawing.Point(633, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(637, 24);
+            this.layoutControlItem2.Text = "领料单号";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txtsalecode;
+            this.layoutControlItem4.CustomizationFormText = "销售单号";
+            this.layoutControlItem4.Location = new System.Drawing.Point(633, 24);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(637, 24);
+            this.layoutControlItem4.Text = "销售单号";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txtproductcode;
+            this.layoutControlItem7.CustomizationFormText = "产品编号";
+            this.layoutControlItem7.Location = new System.Drawing.Point(633, 48);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(637, 24);
+            this.layoutControlItem7.Text = "产品编号";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txtnumber;
+            this.layoutControlItem9.CustomizationFormText = "生产数量";
+            this.layoutControlItem9.Location = new System.Drawing.Point(633, 72);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(318, 24);
+            this.layoutControlItem9.Text = "生产数量";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txtpickingdept;
+            this.layoutControlItem11.CustomizationFormText = "领料部门";
+            this.layoutControlItem11.Location = new System.Drawing.Point(633, 96);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.Size = new System.Drawing.Size(637, 24);
+            this.layoutControlItem11.Text = "领料部门";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txtpickingtime;
+            this.layoutControlItem5.CustomizationFormText = "领料日期";
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(633, 24);
+            this.layoutControlItem5.Text = "领料日期";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txtunit;
+            this.layoutControlItem10.CustomizationFormText = "计量单位";
+            this.layoutControlItem10.Location = new System.Drawing.Point(951, 72);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Size = new System.Drawing.Size(319, 24);
+            this.layoutControlItem10.Text = "计量单位";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txtcreateTime;
+            this.layoutControlItem13.CustomizationFormText = "制单日期";
+            this.layoutControlItem13.Location = new System.Drawing.Point(633, 120);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.Size = new System.Drawing.Size(637, 24);
+            this.layoutControlItem13.Text = "制单日期";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.xtraTabControl2;
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 168);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.Size = new System.Drawing.Size(1270, 545);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem15.TextVisible = false;
+            // 
+            // FrmproductionRequisition
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1300, 800);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Name = "FrmproductionRequisition";
+            this.Text = "生产领料申请单";
+            this.Load += new System.EventHandler(this.FrmproductionRequisition_Load);
+            this.Controls.SetChildIndex(this.xtraTabControl1, 0);
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductID)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtunit)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdept)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTreeListtxtpickingdeptTreeList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcreatorId)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.tabDataList.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.grdListView)).EndInit();
+            this.tabDataDetail.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+            this.panelControl2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
+            this.xtraTabControl2.ResumeLayout(false);
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+            this.contextMenuStrip1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditunit)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditwarehouse)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtwocode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingtime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductID.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproductspec.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtnumber.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingdept.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtpickingdeptTreeList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private XtraTabControl xtraTabControl1;
+        private XtraTabPage tabDataList;
+        private XtraTabPage tabDataDetail;
+        private DevExpress.XtraGrid.GridControl grdList;
+        private DevExpress.XtraGrid.Views.Grid.GridView grdListView;
+        private PanelControl panelControl2;
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+		private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtid;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtcode;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtwocode;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtsalecode;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.DateEdit txtpickingtime;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtproductID;
+
+        private DevExpress.XtraEditors.LookUpEdit txtproductID;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtproductcode;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtproductspec;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtnumber;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtunit;
+
+        private DevExpress.XtraEditors.LookUpEdit txtunit;
+        private DevExpress.XtraTreeList.TreeList txtpickingdeptTreeList;
+        private DevExpress.XtraEditors.Repository.RepositoryItemTreeListLookUpEdit repositoryItemTreeListtxtpickingdept;
+        private DevExpress.XtraTreeList.TreeList repositoryItemTreeListtxtpickingdeptTreeList;  
+
+        private DevExpress.XtraEditors.TreeListLookUpEdit txtpickingdept;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemtxtcreatorId;
+
+        private DevExpress.XtraEditors.LookUpEdit txtcreatorId;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.DateEdit txtcreateTime;
+        ///////////////////////////////
+        private DevExpress.XtraEditors.TextEdit txtremark;
+
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private XtraTabControl xtraTabControl2;
+        private XtraTabPage xtraTabPage2;
+        private LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraGrid.GridControl gridControl1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialid;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialtype;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditunit;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditwarehouse;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemAdd;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemDel;
+    }
+}
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.resx b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.resx
new file mode 100644
index 0000000..ad53752
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/Form/FrmproductionRequisition.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="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs
index 8bb3a05..7ed2466 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs
+++ b/WinformGeneralDeveloperFrame/Form/Frmquotation.designer.cs
@@ -284,7 +284,7 @@ namespace MES.Form
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.tabDataList;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1310, 772);
             this.xtraTabControl1.TabIndex = 1;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabDataList,
@@ -294,7 +294,7 @@ namespace MES.Form
             // 
             this.tabDataList.Controls.Add(this.grdList);
             this.tabDataList.Name = "tabDataList";
-            this.tabDataList.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataList.Size = new System.Drawing.Size(1305, 746);
             this.tabDataList.Text = "数据列表";
             // 
             // grdList
@@ -303,7 +303,7 @@ namespace MES.Form
             this.grdList.Location = new System.Drawing.Point(0, 0);
             this.grdList.MainView = this.grdListView;
             this.grdList.Name = "grdList";
-            this.grdList.Size = new System.Drawing.Size(1294, 737);
+            this.grdList.Size = new System.Drawing.Size(1305, 746);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.grdListView});
@@ -855,7 +855,7 @@ namespace MES.Form
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1300, 800);
+            this.ClientSize = new System.Drawing.Size(1310, 806);
             this.Controls.Add(this.xtraTabControl1);
             this.Name = "Frmquotation";
             this.Text = "客户报价单";
diff --git a/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs
index 8401d1a..dd296ae 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs
+++ b/WinformGeneralDeveloperFrame/Form/Frmreturnsale.designer.cs
@@ -76,6 +76,7 @@ namespace MES.Form
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemLookUpEditunit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemGridLookUpEdit = new DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit();
             this.repositoryItemGridLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.txtid = new DevExpress.XtraEditors.TextEdit();
@@ -100,7 +101,6 @@ namespace MES.Form
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcontactuser)).BeginInit();
@@ -284,7 +284,7 @@ namespace MES.Form
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.tabDataList;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1310, 772);
             this.xtraTabControl1.TabIndex = 1;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabDataList,
@@ -294,7 +294,7 @@ namespace MES.Form
             // 
             this.tabDataList.Controls.Add(this.grdList);
             this.tabDataList.Name = "tabDataList";
-            this.tabDataList.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataList.Size = new System.Drawing.Size(1305, 746);
             this.tabDataList.Text = "数据列表";
             // 
             // grdList
@@ -303,7 +303,7 @@ namespace MES.Form
             this.grdList.Location = new System.Drawing.Point(0, 0);
             this.grdList.MainView = this.grdListView;
             this.grdList.Name = "grdList";
-            this.grdList.Size = new System.Drawing.Size(1294, 737);
+            this.grdList.Size = new System.Drawing.Size(1305, 746);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.grdListView});
@@ -573,6 +573,15 @@ namespace MES.Form
             this.gridColumn22.VisibleIndex = 10;
             this.gridColumn22.Width = 201;
             // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "明细单号";
+            this.gridColumn23.FieldName = "returnsaledetailcode";
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.OptionsColumn.AllowEdit = false;
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 0;
+            // 
             // repositoryItemGridLookUpEdit
             // 
             this.repositoryItemGridLookUpEdit.AutoHeight = false;
@@ -834,20 +843,11 @@ namespace MES.Form
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
             // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "明细单号";
-            this.gridColumn23.FieldName = "returnsaledetailcode";
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.OptionsColumn.AllowEdit = false;
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 0;
-            // 
             // Frmreturnsale
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1300, 800);
+            this.ClientSize = new System.Drawing.Size(1310, 806);
             this.Controls.Add(this.xtraTabControl1);
             this.Name = "Frmreturnsale";
             this.Text = "销售退货单";
diff --git a/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs
index 3d8e0a2..b72552d 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs
+++ b/WinformGeneralDeveloperFrame/Form/Frmsale.designer.cs
@@ -92,6 +92,7 @@ namespace MES.Form
             this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemtxtproductid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
             this.txtid = new DevExpress.XtraEditors.TextEdit();
             this.txtsaleordercode = new DevExpress.XtraEditors.TextEdit();
@@ -123,7 +124,6 @@ namespace MES.Form
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomerid)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcustomertype)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtcontactuser)).BeginInit();
@@ -364,7 +364,7 @@ namespace MES.Form
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.tabDataList;
-            this.xtraTabControl1.Size = new System.Drawing.Size(944, 636);
+            this.xtraTabControl1.Size = new System.Drawing.Size(954, 642);
             this.xtraTabControl1.TabIndex = 1;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabDataList,
@@ -374,7 +374,7 @@ namespace MES.Form
             // 
             this.tabDataList.Controls.Add(this.grdList);
             this.tabDataList.Name = "tabDataList";
-            this.tabDataList.Size = new System.Drawing.Size(938, 607);
+            this.tabDataList.Size = new System.Drawing.Size(949, 616);
             this.tabDataList.Text = "数据列表";
             // 
             // grdList
@@ -383,7 +383,7 @@ namespace MES.Form
             this.grdList.Location = new System.Drawing.Point(0, 0);
             this.grdList.MainView = this.grdListView;
             this.grdList.Name = "grdList";
-            this.grdList.Size = new System.Drawing.Size(938, 607);
+            this.grdList.Size = new System.Drawing.Size(949, 616);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.grdListView});
@@ -783,6 +783,15 @@ namespace MES.Form
             this.gridColumn37.VisibleIndex = 21;
             this.gridColumn37.Width = 201;
             // 
+            // gridColumn38
+            // 
+            this.gridColumn38.Caption = "明细单号";
+            this.gridColumn38.FieldName = "saledetailcode";
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.OptionsColumn.AllowEdit = false;
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 0;
+            // 
             // repositoryItemtxtproductid
             // 
             this.repositoryItemtxtproductid.AutoHeight = false;
@@ -1127,20 +1136,11 @@ namespace MES.Form
             this.layoutControlItem14.Text = "备注";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
             // 
-            // gridColumn38
-            // 
-            this.gridColumn38.Caption = "明细单号";
-            this.gridColumn38.FieldName = "saledetailcode";
-            this.gridColumn38.Name = "gridColumn38";
-            this.gridColumn38.OptionsColumn.AllowEdit = false;
-            this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 0;
-            // 
             // Frmsale
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(944, 670);
+            this.ClientSize = new System.Drawing.Size(954, 676);
             this.Controls.Add(this.xtraTabControl1);
             this.Name = "Frmsale";
             this.Text = "销售订单";
diff --git a/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs b/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs
index 532c2af..80e6738 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs
+++ b/WinformGeneralDeveloperFrame/Form/Frmworkorder.cs
@@ -12,6 +12,8 @@ using DevExpress.XtraLayout;
 using MES.Entity;
 using System.Data.Entity.Migrations;
 using System.Data.Entity;
+using CCWin.SkinClass;
+
 namespace MES.Form
 {
 	public partial class Frmworkorder : FrmBaseForm
@@ -23,7 +25,7 @@ namespace MES.Form
 		}
 		private void Frmworkorder_Load(object sender, EventArgs e)
         {
-			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new workorderInfo());
+			InitFrom(xtraTabControl1,grdList,grdListView,new LayoutControlGroup[]{layoutControlGroup1},new workorderInfo(),gridControl1,new []{ "txtwordordercode", "txtsalecode" });
             InitSearchDicData();
         }
         /// <summary>
@@ -32,8 +34,8 @@ namespace MES.Form
 		/// <returns></returns>
 		private void Init()
 		{
-			txtworkordertype.Properties.DataSource = GetDataTableUtils.SqlTable("部门");     
-			repositoryItemtxtworkordertype.DataSource= GetDataTableUtils.SqlTable("部门");  
+			txtworkordertype.Properties.DataSource = GetDataTableUtils.SqlTable("工单类型");     
+			repositoryItemtxtworkordertype.DataSource= GetDataTableUtils.SqlTable("工单类型");  
 			txtproductdept.Properties.DataSource = GetDataTableUtils.SqlTable("部门");     
 			repositoryItemtxtproductdept.DataSource= GetDataTableUtils.SqlTable("部门");  
 			txtproductid.Properties.DataSource = GetDataTableUtils.SqlTable("产品");     
@@ -43,8 +45,11 @@ namespace MES.Form
 			txtwarehouse.Properties.DataSource = GetDataTableUtils.SqlTable("仓库");     
 			repositoryItemtxtwarehouse.DataSource= GetDataTableUtils.SqlTable("仓库");  
 			txtcreatorId.Properties.DataSource = GetDataTableUtils.SqlTable("用户");     
-			repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户");  
-		}
+			repositoryItemtxtcreatorId.DataSource= GetDataTableUtils.SqlTable("用户");
+            txtproducttype.Properties.DataSource = GetDataTableUtils.SqlTable("产品类别");
+            repositoryItemLookUpEditmaterialid.DataSource = GetDataTableUtils.SqlTable("物料");
+            repositoryItemLookUpEditmaterialtype.DataSource = GetDataTableUtils.SqlTable("物料类别");
+        }
         /// <summary>
 		/// 搜索字段
 		/// </summary>
@@ -73,7 +78,7 @@ namespace MES.Form
 
 		public override void InitgrdListDataSource()
         {
-			 using (var con=new MESDB())///
+            using (var con=new MESDB())
             {
 				grdList.DataSource=con.workorderInfo.ToList();
             }
@@ -85,24 +90,24 @@ namespace MES.Form
 		/// <returns></returns>
         public override bool CheckInput()
         {
-			if(string.IsNullOrEmpty(txtwordordercode.EditValue.ToString()))
-			{
-				"工单号不能为空".ShowWarning();
-				txtwordordercode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString()))
-			{
-				"销售单号不能为空".ShowWarning();
-				txtsalecode.Focus();
-				return false;
-			}
-			if(string.IsNullOrEmpty(txtsaledetailcode.EditValue.ToString()))
-			{
-				"销售明细单号不能为空".ShowWarning();
-				txtsaledetailcode.Focus();
-				return false;
-			}
+			//if(string.IsNullOrEmpty(txtwordordercode.EditValue.ToString()))
+			//{
+			//	"工单号不能为空".ShowWarning();
+			//	txtwordordercode.Focus();
+			//	return false;
+			//}
+			//if(string.IsNullOrEmpty(txtsalecode.EditValue.ToString()))
+			//{
+			//	"销售单号不能为空".ShowWarning();
+			//	txtsalecode.Focus();
+			//	return false;
+			//}
+			//if(string.IsNullOrEmpty(txtsaledetailcode.EditValue.ToString()))
+			//{
+			//	"销售明细单号不能为空".ShowWarning();
+			//	txtsaledetailcode.Focus();
+			//	return false;
+			//}
 			if(string.IsNullOrEmpty(txtworkordertype.EditValue.ToString()))
 			{
 				"工单类型不能为空".ShowWarning();
@@ -192,10 +197,21 @@ namespace MES.Form
             try
             {
                 workorderInfo info= (workorderInfo)this.ControlDataToModel(new workorderInfo());
-                using (var db = new MESDB())
+                
+				using (var db = new MESDB())
                 {
-                    db.workorderInfo.AddOrUpdate(info);
-                    db.SaveChanges();
+                    if (info.id == 0) //新增
+                    {
+                        string code = "GD" + DateTime.Now.GetDateTimeCode();
+                        info.wordordercode = code;
+						db.workorderInfo.Add(info);
+                        db.SaveChanges();
+					}
+                    else
+                    {
+                        db.Entry(info).State = EntityState.Modified;
+                        db.SaveChanges();
+					}
                 }
             }
             catch (Exception ex)
@@ -250,5 +266,120 @@ namespace MES.Form
                 }
             }
         }
-	}
+
+        public override void AddFunction()
+        {
+            gridControl1.DataSource = null;
+        }
+
+        public override void gridControlMouseDoubleClickFunction(object sender, EventArgs e)
+        {
+			using (var db = new MESDB())
+            {
+                productBOMInfo info = db.productBOMInfo.Find(txtbomid.EditValue);
+                List<productBOMdetailInfo> boMdetailInfo =
+                    db.productBOMdetailInfo.Where(p => p.productBOMid == info.id).ToList();
+                List<productionBOMInfo> list = new List<productionBOMInfo>();
+                foreach (var item in boMdetailInfo)
+                {
+                    productionBOMInfo info1 = new productionBOMInfo()
+                    {
+                        number = txtproductnumber.Text.ToDecimal(1),
+                        materialcode = item.materialcode,
+                        materialid = item.materialid,
+                        materialtype = item.materialtype,
+                        spec = item.materialspec,
+                        uintnumber = item.unitusenumber,
+                        neednumber = item.unitusenumber * txtproductnumber.Text.ToDecimal(1),
+                        unit = item.unit,
+                        unitprice = item.unitprice,
+                        totalprice = item.unitprice * txtproductnumber.Text.ToDecimal(1) * item.unitusenumber,
+                        warehouse = item.warehouse,
+                        remark = item.remark
+                    };
+                    list.Add(info1);
+                }
+
+                gridControl1.DataSource = list;
+
+            }
+		}
+
+        private void txtsaledetailcode_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == 13)
+            {
+                using (var db=new MESDB())
+                {
+                    var list= db.saledetailInfo
+                        .Where(p => p.saledetailcode == txtsaledetailcode.Text.ToUpper()).ToList();
+                    if (list.Count > 0)
+                    {
+                        saledetailInfo info = list[0];
+                        txtsalecode.Text = info.salecode;
+                        txtproductid.EditValue = info.productid;
+                        txtproductcode.Text = info.productcode;
+                        txtspec.Text = info.productspec;
+                        txtproductnumber.Text = info.salenumber.ToString();
+                        txtunit.EditValue = info.unit;
+                        txtdeliverdate.DateTime = info.deliverdate;
+                        txtwarehouse.EditValue = info.warehouse;
+                        txtbomid.Properties.DataSource = db.productBOMInfo.Where(p => p.productid == info.productid)
+                            .Select(p => new { ID=p.productid,Name=p.version}).ToList();
+                    }
+                }
+            }
+        }
+
+        private void txtproductid_EditValueChanged(object sender, EventArgs e)
+        {
+            using (var db = new MESDB())
+            {
+                productInfo info = db.productInfo.Find(txtproductid.EditValue);
+                var list = db.productBOMInfo.Where(p => p.productid == info.id)
+                    .Select(p => new {ID = p.id, Name = p.version}).ToList();
+                txtbomid.Properties.DataSource = list;
+                txtproducttype.EditValue = info.producttype;
+                txtproductcode.Text = info.productcode;
+                txtunit.EditValue = info.unit;
+                txtwarehouse.EditValue = info.warehouse;
+            }
+        }
+
+        private void toolStripMenuItem1_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(txtproductid.Text) && !string.IsNullOrEmpty(txtbomid.Text))
+            {
+                using (var db = new MESDB())
+                {
+                    productBOMInfo info = db.productBOMInfo.Find(txtbomid.EditValue);
+                    List<productBOMdetailInfo> boMdetailInfo =
+                        db.productBOMdetailInfo.Where(p => p.productBOMid == info.id).ToList();
+                    List<productionBOMInfo> list = new List<productionBOMInfo>();
+                    foreach (var item in boMdetailInfo)
+                    {
+                        productionBOMInfo info1 = new productionBOMInfo()
+                        {
+							number = txtproductnumber.Text.ToDecimal(1),
+							materialcode = item.materialcode,
+							materialid = item.materialid,
+							materialtype = item.materialtype,
+							spec = item.materialspec,
+                            uintnumber=item.unitusenumber,
+                            neednumber=item.unitusenumber * txtproductnumber.Text.ToDecimal(1),
+							unit=item.unit,
+                            unitprice=item.unitprice,
+							totalprice = item.unitprice * txtproductnumber.Text.ToDecimal(1)* item.unitusenumber,
+							warehouse = item.warehouse,
+							remark = item.remark
+						};
+						list.Add(info1);
+                    }
+
+                    gridControl1.DataSource = list;
+
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs b/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs
index 2fb3ad3..4efd0c7 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs
+++ b/WinformGeneralDeveloperFrame/Form/Frmworkorder.designer.cs
@@ -33,6 +33,7 @@ namespace MES.Form
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -64,43 +65,74 @@ namespace MES.Form
             this.tabDataDetail = new DevExpress.XtraTab.XtraTabPage();
             this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txtproducttype = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtbomid = new DevExpress.XtraEditors.LookUpEdit();
+            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditmaterialid = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemLookUpEditmaterialtype = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridControl2 = new DevExpress.XtraGrid.GridControl();
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.txtid = new DevExpress.XtraEditors.TextEdit();
+            this.txtwordordercode = new DevExpress.XtraEditors.TextEdit();
+            this.txtsalecode = new DevExpress.XtraEditors.TextEdit();
+            this.txtsaledetailcode = new DevExpress.XtraEditors.TextEdit();
+            this.txtworkordertype = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtproductdate = new DevExpress.XtraEditors.DateEdit();
+            this.txtproductdept = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtproductcode = new DevExpress.XtraEditors.TextEdit();
+            this.txtproductid = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtspec = new DevExpress.XtraEditors.TextEdit();
+            this.txtproductnumber = new DevExpress.XtraEditors.TextEdit();
+            this.txtunit = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtfinishdate = new DevExpress.XtraEditors.DateEdit();
+            this.txtdeliverdate = new DevExpress.XtraEditors.DateEdit();
+            this.txtwarehouse = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit();
+            this.txtcreateTime = new DevExpress.XtraEditors.DateEdit();
+            this.txtremark = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtid = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtwordordercode = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtsalecode = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtsaledetailcode = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtworkordertype = new DevExpress.XtraEditors.LookUpEdit();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductdate = new DevExpress.XtraEditors.DateEdit();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductdept = new DevExpress.XtraEditors.LookUpEdit();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductcode = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductid = new DevExpress.XtraEditors.LookUpEdit();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtspec = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtproductnumber = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtunit = new DevExpress.XtraEditors.LookUpEdit();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtfinishdate = new DevExpress.XtraEditors.DateEdit();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtdeliverdate = new DevExpress.XtraEditors.DateEdit();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtwarehouse = new DevExpress.XtraEditors.LookUpEdit();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtcreatorId = new DevExpress.XtraEditors.LookUpEdit();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtcreateTime = new DevExpress.XtraEditors.DateEdit();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtremark = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtworkordertype)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductdept)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtproductid)).BeginInit();
@@ -117,47 +149,63 @@ namespace MES.Form
             this.panelControl2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproducttype.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtbomid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
+            this.xtraTabControl2.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+            this.contextMenuStrip1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtwordordercode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsaledetailcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtworkordertype.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductdept.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductnumber.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             this.SuspendLayout();
             // 
             // gridColumn1
@@ -305,6 +353,7 @@ namespace MES.Form
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemtxtunit.DisplayMember = "Name";
             this.repositoryItemtxtunit.Name = "repositoryItemtxtunit";
+            this.repositoryItemtxtunit.NullText = "";
             this.repositoryItemtxtunit.ValueMember = "ID";
             // 
             // gridColumn13
@@ -393,7 +442,7 @@ namespace MES.Form
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 34);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.tabDataList;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1300, 766);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1072, 655);
             this.xtraTabControl1.TabIndex = 1;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabDataList,
@@ -403,7 +452,7 @@ namespace MES.Form
             // 
             this.tabDataList.Controls.Add(this.grdList);
             this.tabDataList.Name = "tabDataList";
-            this.tabDataList.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataList.Size = new System.Drawing.Size(1067, 629);
             this.tabDataList.Text = "数据列表";
             // 
             // grdList
@@ -412,7 +461,7 @@ namespace MES.Form
             this.grdList.Location = new System.Drawing.Point(0, 0);
             this.grdList.MainView = this.grdListView;
             this.grdList.Name = "grdList";
-            this.grdList.Size = new System.Drawing.Size(1294, 737);
+            this.grdList.Size = new System.Drawing.Size(1067, 629);
             this.grdList.TabIndex = 0;
             this.grdList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.grdListView});
@@ -447,7 +496,7 @@ namespace MES.Form
             // 
             this.tabDataDetail.Controls.Add(this.panelControl2);
             this.tabDataDetail.Name = "tabDataDetail";
-            this.tabDataDetail.Size = new System.Drawing.Size(1294, 737);
+            this.tabDataDetail.Size = new System.Drawing.Size(1067, 629);
             this.tabDataDetail.Text = "数据编辑";
             // 
             // panelControl2
@@ -456,11 +505,14 @@ namespace MES.Form
             this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(1294, 737);
+            this.panelControl2.Size = new System.Drawing.Size(1067, 629);
             this.panelControl2.TabIndex = 0;
             // 
             // layoutControl1
             // 
+            this.layoutControl1.Controls.Add(this.txtproducttype);
+            this.layoutControl1.Controls.Add(this.txtbomid);
+            this.layoutControl1.Controls.Add(this.xtraTabControl2);
             this.layoutControl1.Controls.Add(this.txtid);
             this.layoutControl1.Controls.Add(this.txtwordordercode);
             this.layoutControl1.Controls.Add(this.txtsalecode);
@@ -483,35 +535,530 @@ namespace MES.Form
             this.layoutControl1.Location = new System.Drawing.Point(2, 2);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControl1.Size = new System.Drawing.Size(1063, 625);
             this.layoutControl1.TabIndex = 6;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // txtproducttype
+            // 
+            this.txtproducttype.Location = new System.Drawing.Point(87, 84);
+            this.txtproducttype.Name = "txtproducttype";
+            this.txtproducttype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtproducttype.Properties.DisplayMember = "Name";
+            this.txtproducttype.Properties.NullText = "";
+            this.txtproducttype.Properties.ReadOnly = true;
+            this.txtproducttype.Properties.ValueMember = "ID";
+            this.txtproducttype.Size = new System.Drawing.Size(442, 20);
+            this.txtproducttype.StyleController = this.layoutControl1;
+            this.txtproducttype.TabIndex = 21;
+            // 
+            // txtbomid
+            // 
+            this.txtbomid.Location = new System.Drawing.Point(87, 132);
+            this.txtbomid.Name = "txtbomid";
+            this.txtbomid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtbomid.Properties.DisplayMember = "Name";
+            this.txtbomid.Properties.NullText = "";
+            this.txtbomid.Properties.ValueMember = "ID";
+            this.txtbomid.Size = new System.Drawing.Size(442, 20);
+            this.txtbomid.StyleController = this.layoutControl1;
+            this.txtbomid.TabIndex = 20;
+            // 
+            // xtraTabControl2
+            // 
+            this.xtraTabControl2.Location = new System.Drawing.Point(12, 252);
+            this.xtraTabControl2.Name = "xtraTabControl2";
+            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl2.Size = new System.Drawing.Size(1039, 361);
+            this.xtraTabControl2.TabIndex = 19;
+            this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.gridControl1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1034, 335);
+            this.xtraTabPage1.Text = "物料需求明细";
+            // 
+            // gridControl1
+            // 
+            this.gridControl1.ContextMenuStrip = this.contextMenuStrip1;
+            this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl1.Location = new System.Drawing.Point(0, 0);
+            this.gridControl1.MainView = this.gridView1;
+            this.gridControl1.Name = "gridControl1";
+            this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemLookUpEditmaterialid,
+            this.repositoryItemLookUpEditmaterialtype});
+            this.gridControl1.Size = new System.Drawing.Size(1034, 335);
+            this.gridControl1.TabIndex = 1;
+            this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem1});
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(149, 26);
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(148, 22);
+            this.toolStripMenuItem1.Text = "物料需求明细";
+            this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
+            // 
+            // gridView1
+            // 
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn31,
+            this.gridColumn32,
+            this.gridColumn33});
+            this.gridView1.GridControl = this.gridControl1;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsBehavior.Editable = false;
+            this.gridView1.OptionsView.ColumnAutoWidth = false;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "id";
+            this.gridColumn19.FieldName = "id";
+            this.gridColumn19.Name = "gridColumn19";
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "工程BOM编号";
+            this.gridColumn20.FieldName = "projectBOMcode";
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Width = 201;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "生产BOM编号";
+            this.gridColumn21.FieldName = "productionBOMcode";
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Width = 201;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "产品生产数量";
+            this.gridColumn22.FieldName = "number";
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 0;
+            this.gridColumn22.Width = 201;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "物料编码";
+            this.gridColumn23.FieldName = "materialcode";
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 1;
+            this.gridColumn23.Width = 201;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "物料名称";
+            this.gridColumn24.ColumnEdit = this.repositoryItemLookUpEditmaterialid;
+            this.gridColumn24.FieldName = "materialid";
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 2;
+            this.gridColumn24.Width = 201;
+            // 
+            // repositoryItemLookUpEditmaterialid
+            // 
+            this.repositoryItemLookUpEditmaterialid.AutoHeight = false;
+            this.repositoryItemLookUpEditmaterialid.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditmaterialid.DisplayMember = "Name";
+            this.repositoryItemLookUpEditmaterialid.Name = "repositoryItemLookUpEditmaterialid";
+            this.repositoryItemLookUpEditmaterialid.NullText = "";
+            this.repositoryItemLookUpEditmaterialid.ValueMember = "ID";
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "规格型号";
+            this.gridColumn25.FieldName = "spec";
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 3;
+            this.gridColumn25.Width = 201;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "物料类型";
+            this.gridColumn26.ColumnEdit = this.repositoryItemLookUpEditmaterialtype;
+            this.gridColumn26.FieldName = "materialtype";
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 4;
+            this.gridColumn26.Width = 201;
+            // 
+            // repositoryItemLookUpEditmaterialtype
+            // 
+            this.repositoryItemLookUpEditmaterialtype.AutoHeight = false;
+            this.repositoryItemLookUpEditmaterialtype.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemLookUpEditmaterialtype.DisplayMember = "Name";
+            this.repositoryItemLookUpEditmaterialtype.Name = "repositoryItemLookUpEditmaterialtype";
+            this.repositoryItemLookUpEditmaterialtype.NullText = "";
+            this.repositoryItemLookUpEditmaterialtype.ValueMember = "ID";
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "单位用量";
+            this.gridColumn27.FieldName = "uintnumber";
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 5;
+            this.gridColumn27.Width = 201;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "需求总量";
+            this.gridColumn28.FieldName = "neednumber";
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 7;
+            this.gridColumn28.Width = 201;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "计量单位";
+            this.gridColumn29.ColumnEdit = this.repositoryItemtxtunit;
+            this.gridColumn29.FieldName = "unit";
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 6;
+            this.gridColumn29.Width = 201;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "单价";
+            this.gridColumn30.FieldName = "unitprice";
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 8;
+            this.gridColumn30.Width = 201;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "总价";
+            this.gridColumn31.FieldName = "totalprice";
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 10;
+            this.gridColumn31.Width = 201;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "仓库";
+            this.gridColumn32.ColumnEdit = this.repositoryItemtxtwarehouse;
+            this.gridColumn32.FieldName = "warehouse";
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 9;
+            this.gridColumn32.Width = 201;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.Caption = "备注";
+            this.gridColumn33.FieldName = "remark";
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.Visible = true;
+            this.gridColumn33.VisibleIndex = 11;
+            this.gridColumn33.Width = 201;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.gridControl2);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1034, 335);
+            this.xtraTabPage2.Text = "入库明细";
+            // 
+            // gridControl2
+            // 
+            this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl2.Location = new System.Drawing.Point(0, 0);
+            this.gridControl2.MainView = this.gridView2;
+            this.gridControl2.Name = "gridControl2";
+            this.gridControl2.Size = new System.Drawing.Size(1034, 335);
+            this.gridControl2.TabIndex = 0;
+            this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView2});
+            // 
+            // gridView2
+            // 
+            this.gridView2.GridControl = this.gridControl2;
+            this.gridView2.Name = "gridView2";
+            // 
+            // txtid
+            // 
+            this.txtid.Location = new System.Drawing.Point(87, 12);
+            this.txtid.Name = "txtid";
+            this.txtid.Size = new System.Drawing.Size(442, 20);
+            this.txtid.StyleController = this.layoutControl1;
+            this.txtid.TabIndex = 1;
+            // 
+            // txtwordordercode
+            // 
+            this.txtwordordercode.Location = new System.Drawing.Point(608, 12);
+            this.txtwordordercode.Name = "txtwordordercode";
+            this.txtwordordercode.Size = new System.Drawing.Size(443, 20);
+            this.txtwordordercode.StyleController = this.layoutControl1;
+            this.txtwordordercode.TabIndex = 2;
+            // 
+            // txtsalecode
+            // 
+            this.txtsalecode.Location = new System.Drawing.Point(608, 108);
+            this.txtsalecode.Name = "txtsalecode";
+            this.txtsalecode.Size = new System.Drawing.Size(443, 20);
+            this.txtsalecode.StyleController = this.layoutControl1;
+            this.txtsalecode.TabIndex = 3;
+            // 
+            // txtsaledetailcode
+            // 
+            this.txtsaledetailcode.Location = new System.Drawing.Point(87, 108);
+            this.txtsaledetailcode.Name = "txtsaledetailcode";
+            this.txtsaledetailcode.Size = new System.Drawing.Size(442, 20);
+            this.txtsaledetailcode.StyleController = this.layoutControl1;
+            this.txtsaledetailcode.TabIndex = 4;
+            this.txtsaledetailcode.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtsaledetailcode_KeyPress);
+            // 
+            // txtworkordertype
+            // 
+            this.txtworkordertype.EditValue = "";
+            this.txtworkordertype.Location = new System.Drawing.Point(87, 36);
+            this.txtworkordertype.Name = "txtworkordertype";
+            this.txtworkordertype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtworkordertype.Properties.DisplayMember = "Name";
+            this.txtworkordertype.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtworkordertype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtworkordertype.Properties.ValueMember = "ID";
+            this.txtworkordertype.Size = new System.Drawing.Size(442, 20);
+            this.txtworkordertype.StyleController = this.layoutControl1;
+            this.txtworkordertype.TabIndex = 5;
+            // 
+            // txtproductdate
+            // 
+            this.txtproductdate.EditValue = null;
+            this.txtproductdate.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtproductdate.Location = new System.Drawing.Point(608, 36);
+            this.txtproductdate.Name = "txtproductdate";
+            this.txtproductdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtproductdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtproductdate.Properties.DisplayFormat.FormatString = "G";
+            this.txtproductdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtproductdate.Size = new System.Drawing.Size(443, 20);
+            this.txtproductdate.StyleController = this.layoutControl1;
+            this.txtproductdate.TabIndex = 6;
+            // 
+            // txtproductdept
+            // 
+            this.txtproductdept.EditValue = "";
+            this.txtproductdept.Location = new System.Drawing.Point(608, 84);
+            this.txtproductdept.Name = "txtproductdept";
+            this.txtproductdept.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtproductdept.Properties.DisplayMember = "Name";
+            this.txtproductdept.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtproductdept.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtproductdept.Properties.ValueMember = "ID";
+            this.txtproductdept.Size = new System.Drawing.Size(443, 20);
+            this.txtproductdept.StyleController = this.layoutControl1;
+            this.txtproductdept.TabIndex = 7;
+            // 
+            // txtproductcode
+            // 
+            this.txtproductcode.Location = new System.Drawing.Point(608, 60);
+            this.txtproductcode.Name = "txtproductcode";
+            this.txtproductcode.Size = new System.Drawing.Size(443, 20);
+            this.txtproductcode.StyleController = this.layoutControl1;
+            this.txtproductcode.TabIndex = 8;
+            // 
+            // txtproductid
+            // 
+            this.txtproductid.EditValue = "";
+            this.txtproductid.Location = new System.Drawing.Point(87, 60);
+            this.txtproductid.Name = "txtproductid";
+            this.txtproductid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtproductid.Properties.DisplayMember = "Name";
+            this.txtproductid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtproductid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtproductid.Properties.ValueMember = "ID";
+            this.txtproductid.Size = new System.Drawing.Size(442, 20);
+            this.txtproductid.StyleController = this.layoutControl1;
+            this.txtproductid.TabIndex = 9;
+            this.txtproductid.EditValueChanged += new System.EventHandler(this.txtproductid_EditValueChanged);
+            // 
+            // txtspec
+            // 
+            this.txtspec.Location = new System.Drawing.Point(608, 132);
+            this.txtspec.Name = "txtspec";
+            this.txtspec.Size = new System.Drawing.Size(443, 20);
+            this.txtspec.StyleController = this.layoutControl1;
+            this.txtspec.TabIndex = 10;
+            // 
+            // txtproductnumber
+            // 
+            this.txtproductnumber.Location = new System.Drawing.Point(87, 156);
+            this.txtproductnumber.Name = "txtproductnumber";
+            this.txtproductnumber.Size = new System.Drawing.Size(442, 20);
+            this.txtproductnumber.StyleController = this.layoutControl1;
+            this.txtproductnumber.TabIndex = 11;
+            // 
+            // txtunit
+            // 
+            this.txtunit.EditValue = "";
+            this.txtunit.Location = new System.Drawing.Point(608, 156);
+            this.txtunit.Name = "txtunit";
+            this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtunit.Properties.DisplayMember = "Name";
+            this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtunit.Properties.ValueMember = "ID";
+            this.txtunit.Size = new System.Drawing.Size(443, 20);
+            this.txtunit.StyleController = this.layoutControl1;
+            this.txtunit.TabIndex = 12;
+            // 
+            // txtfinishdate
+            // 
+            this.txtfinishdate.EditValue = null;
+            this.txtfinishdate.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtfinishdate.Location = new System.Drawing.Point(87, 180);
+            this.txtfinishdate.Name = "txtfinishdate";
+            this.txtfinishdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtfinishdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtfinishdate.Properties.DisplayFormat.FormatString = "G";
+            this.txtfinishdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtfinishdate.Size = new System.Drawing.Size(442, 20);
+            this.txtfinishdate.StyleController = this.layoutControl1;
+            this.txtfinishdate.TabIndex = 13;
+            // 
+            // txtdeliverdate
+            // 
+            this.txtdeliverdate.EditValue = null;
+            this.txtdeliverdate.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtdeliverdate.Location = new System.Drawing.Point(608, 180);
+            this.txtdeliverdate.Name = "txtdeliverdate";
+            this.txtdeliverdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtdeliverdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtdeliverdate.Properties.DisplayFormat.FormatString = "G";
+            this.txtdeliverdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtdeliverdate.Size = new System.Drawing.Size(443, 20);
+            this.txtdeliverdate.StyleController = this.layoutControl1;
+            this.txtdeliverdate.TabIndex = 14;
+            // 
+            // txtwarehouse
+            // 
+            this.txtwarehouse.EditValue = "";
+            this.txtwarehouse.Location = new System.Drawing.Point(87, 204);
+            this.txtwarehouse.Name = "txtwarehouse";
+            this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtwarehouse.Properties.DisplayMember = "Name";
+            this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtwarehouse.Properties.ValueMember = "ID";
+            this.txtwarehouse.Size = new System.Drawing.Size(442, 20);
+            this.txtwarehouse.StyleController = this.layoutControl1;
+            this.txtwarehouse.TabIndex = 15;
+            // 
+            // txtcreatorId
+            // 
+            this.txtcreatorId.EditValue = "";
+            this.txtcreatorId.Location = new System.Drawing.Point(87, 228);
+            this.txtcreatorId.Name = "txtcreatorId";
+            this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtcreatorId.Properties.DisplayMember = "Name";
+            this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
+            this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
+            this.txtcreatorId.Properties.ValueMember = "ID";
+            this.txtcreatorId.Size = new System.Drawing.Size(442, 20);
+            this.txtcreatorId.StyleController = this.layoutControl1;
+            this.txtcreatorId.TabIndex = 16;
+            // 
+            // txtcreateTime
+            // 
+            this.txtcreateTime.EditValue = null;
+            this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off;
+            this.txtcreateTime.Location = new System.Drawing.Point(608, 228);
+            this.txtcreateTime.Name = "txtcreateTime";
+            this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txtcreateTime.Properties.DisplayFormat.FormatString = "G";
+            this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txtcreateTime.Size = new System.Drawing.Size(443, 20);
+            this.txtcreateTime.StyleController = this.layoutControl1;
+            this.txtcreateTime.TabIndex = 17;
+            // 
+            // txtremark
+            // 
+            this.txtremark.Location = new System.Drawing.Point(608, 204);
+            this.txtremark.Name = "txtremark";
+            this.txtremark.Size = new System.Drawing.Size(443, 20);
+            this.txtremark.StyleController = this.layoutControl1;
+            this.txtremark.TabIndex = 18;
+            // 
             // layoutControlGroup1
             // 
             this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1";
             this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
-            this.layoutControlItem2,
-            this.layoutControlItem3,
             this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem8,
-            this.layoutControlItem9,
-            this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem12,
             this.layoutControlItem13,
-            this.layoutControlItem14,
             this.layoutControlItem15,
             this.layoutControlItem16,
+            this.layoutControlItem2,
+            this.layoutControlItem10,
+            this.layoutControlItem14,
+            this.layoutControlItem18,
             this.layoutControlItem17,
-            this.layoutControlItem18});
+            this.layoutControlItem19,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem20,
+            this.layoutControlItem12,
+            this.layoutControlItem9,
+            this.layoutControlItem8,
+            this.layoutControlItem3,
+            this.layoutControlItem21,
+            this.layoutControlItem7});
             this.layoutControlGroup1.Name = "layoutControlGroup1";
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1290, 733);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1063, 625);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem1
@@ -520,406 +1067,215 @@ namespace MES.Form
             this.layoutControlItem1.CustomizationFormText = "id";
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem1.Size = new System.Drawing.Size(521, 24);
             this.layoutControlItem1.Text = "id";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtid
-            // 
-            this.txtid.Location = new System.Drawing.Point(87, 12);
-            this.txtid.Name = "txtid";
-            this.txtid.Size = new System.Drawing.Size(1191, 20);
-            this.txtid.StyleController = this.layoutControl1;
-            this.txtid.TabIndex = 1;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txtwordordercode;
-            this.layoutControlItem2.CustomizationFormText = "工单号";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem2.Text = "工单号";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtwordordercode
-            // 
-            this.txtwordordercode.Location = new System.Drawing.Point(87, 36);
-            this.txtwordordercode.Name = "txtwordordercode";
-            this.txtwordordercode.Size = new System.Drawing.Size(1191, 20);
-            this.txtwordordercode.StyleController = this.layoutControl1;
-            this.txtwordordercode.TabIndex = 2;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txtsalecode;
-            this.layoutControlItem3.CustomizationFormText = "销售单号";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem3.Text = "销售单号";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtsalecode
-            // 
-            this.txtsalecode.Location = new System.Drawing.Point(87, 60);
-            this.txtsalecode.Name = "txtsalecode";
-            this.txtsalecode.Size = new System.Drawing.Size(1191, 20);
-            this.txtsalecode.StyleController = this.layoutControl1;
-            this.txtsalecode.TabIndex = 3;
-            // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtsaledetailcode;
             this.layoutControlItem4.CustomizationFormText = "销售明细单号";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem4.Size = new System.Drawing.Size(521, 24);
             this.layoutControlItem4.Text = "销售明细单号";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtsaledetailcode
-            // 
-            this.txtsaledetailcode.Location = new System.Drawing.Point(87, 84);
-            this.txtsaledetailcode.Name = "txtsaledetailcode";
-            this.txtsaledetailcode.Size = new System.Drawing.Size(1191, 20);
-            this.txtsaledetailcode.StyleController = this.layoutControl1;
-            this.txtsaledetailcode.TabIndex = 4;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txtworkordertype;
-            this.layoutControlItem5.CustomizationFormText = "工单类型";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem5.Text = "工单类型";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtworkordertype
-            // 
-            this.txtworkordertype.EditValue = "";
-            this.txtworkordertype.Location = new System.Drawing.Point(87, 108);
-            this.txtworkordertype.Name = "txtworkordertype";
-            this.txtworkordertype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtworkordertype.Properties.DisplayMember = "Name";
-            this.txtworkordertype.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
-            this.txtworkordertype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
-            this.txtworkordertype.Properties.ValueMember = "ID";
-            this.txtworkordertype.Size = new System.Drawing.Size(1191, 20);
-            this.txtworkordertype.StyleController = this.layoutControl1;
-            this.txtworkordertype.TabIndex = 5;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txtproductdate;
-            this.layoutControlItem6.CustomizationFormText = "生产日期";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 120);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem6.Text = "生产日期";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtproductdate
-            // 
-            this.txtproductdate.EditValue = null;
-            this.txtproductdate.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtproductdate.Location = new System.Drawing.Point(87, 132);
-            this.txtproductdate.Name = "txtproductdate";
-            this.txtproductdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtproductdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.txtproductdate.Properties.DisplayFormat.FormatString = "G";
-            this.txtproductdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtproductdate.Size = new System.Drawing.Size(1191, 20);
-            this.txtproductdate.StyleController = this.layoutControl1;
-            this.txtproductdate.TabIndex = 6;
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtproductdept;
-            this.layoutControlItem7.CustomizationFormText = "生产单位";
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 144);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem7.Text = "生产单位";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtproductdept
-            // 
-            this.txtproductdept.EditValue = "";
-            this.txtproductdept.Location = new System.Drawing.Point(87, 156);
-            this.txtproductdept.Name = "txtproductdept";
-            this.txtproductdept.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtproductdept.Properties.DisplayMember = "Name";
-            this.txtproductdept.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
-            this.txtproductdept.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
-            this.txtproductdept.Properties.ValueMember = "ID";
-            this.txtproductdept.Size = new System.Drawing.Size(1191, 20);
-            this.txtproductdept.StyleController = this.layoutControl1;
-            this.txtproductdept.TabIndex = 7;
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txtproductcode;
-            this.layoutControlItem8.CustomizationFormText = "产品编号";
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 168);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem8.Text = "产品编号";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtproductcode
-            // 
-            this.txtproductcode.Location = new System.Drawing.Point(87, 180);
-            this.txtproductcode.Name = "txtproductcode";
-            this.txtproductcode.Size = new System.Drawing.Size(1191, 20);
-            this.txtproductcode.StyleController = this.layoutControl1;
-            this.txtproductcode.TabIndex = 8;
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txtproductid;
-            this.layoutControlItem9.CustomizationFormText = "产品名称";
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 192);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem9.Text = "产品名称";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtproductid
-            // 
-            this.txtproductid.EditValue = "";
-            this.txtproductid.Location = new System.Drawing.Point(87, 204);
-            this.txtproductid.Name = "txtproductid";
-            this.txtproductid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtproductid.Properties.DisplayMember = "Name";
-            this.txtproductid.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
-            this.txtproductid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
-            this.txtproductid.Properties.ValueMember = "ID";
-            this.txtproductid.Size = new System.Drawing.Size(1191, 20);
-            this.txtproductid.StyleController = this.layoutControl1;
-            this.txtproductid.TabIndex = 9;
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txtspec;
-            this.layoutControlItem10.CustomizationFormText = "规格型号";
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 216);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem10.Text = "规格型号";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtspec
-            // 
-            this.txtspec.Location = new System.Drawing.Point(87, 228);
-            this.txtspec.Name = "txtspec";
-            this.txtspec.Size = new System.Drawing.Size(1191, 20);
-            this.txtspec.StyleController = this.layoutControl1;
-            this.txtspec.TabIndex = 10;
-            // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txtproductnumber;
             this.layoutControlItem11.CustomizationFormText = "生产数量";
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 240);
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 144);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem11.Size = new System.Drawing.Size(521, 24);
             this.layoutControlItem11.Text = "生产数量";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtproductnumber
-            // 
-            this.txtproductnumber.Location = new System.Drawing.Point(87, 252);
-            this.txtproductnumber.Name = "txtproductnumber";
-            this.txtproductnumber.Size = new System.Drawing.Size(1191, 20);
-            this.txtproductnumber.StyleController = this.layoutControl1;
-            this.txtproductnumber.TabIndex = 11;
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txtunit;
-            this.layoutControlItem12.CustomizationFormText = "计量单位";
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 264);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem12.Text = "计量单位";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtunit
-            // 
-            this.txtunit.EditValue = "";
-            this.txtunit.Location = new System.Drawing.Point(87, 276);
-            this.txtunit.Name = "txtunit";
-            this.txtunit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtunit.Properties.DisplayMember = "Name";
-            this.txtunit.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
-            this.txtunit.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
-            this.txtunit.Properties.ValueMember = "ID";
-            this.txtunit.Size = new System.Drawing.Size(1191, 20);
-            this.txtunit.StyleController = this.layoutControl1;
-            this.txtunit.TabIndex = 12;
-            // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txtfinishdate;
             this.layoutControlItem13.CustomizationFormText = "完工日期";
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 288);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 168);
             this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem13.Size = new System.Drawing.Size(521, 24);
             this.layoutControlItem13.Text = "完工日期";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtfinishdate
-            // 
-            this.txtfinishdate.EditValue = null;
-            this.txtfinishdate.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtfinishdate.Location = new System.Drawing.Point(87, 300);
-            this.txtfinishdate.Name = "txtfinishdate";
-            this.txtfinishdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtfinishdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.txtfinishdate.Properties.DisplayFormat.FormatString = "G";
-            this.txtfinishdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtfinishdate.Size = new System.Drawing.Size(1191, 20);
-            this.txtfinishdate.StyleController = this.layoutControl1;
-            this.txtfinishdate.TabIndex = 13;
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txtdeliverdate;
-            this.layoutControlItem14.CustomizationFormText = "交货日期";
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 312);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem14.Text = "交货日期";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // txtdeliverdate
-            // 
-            this.txtdeliverdate.EditValue = null;
-            this.txtdeliverdate.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtdeliverdate.Location = new System.Drawing.Point(87, 324);
-            this.txtdeliverdate.Name = "txtdeliverdate";
-            this.txtdeliverdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtdeliverdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.txtdeliverdate.Properties.DisplayFormat.FormatString = "G";
-            this.txtdeliverdate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtdeliverdate.Size = new System.Drawing.Size(1191, 20);
-            this.txtdeliverdate.StyleController = this.layoutControl1;
-            this.txtdeliverdate.TabIndex = 14;
-            // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txtwarehouse;
             this.layoutControlItem15.CustomizationFormText = "仓库";
-            this.layoutControlItem15.Location = new System.Drawing.Point(0, 336);
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 192);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem15.Size = new System.Drawing.Size(521, 24);
             this.layoutControlItem15.Text = "仓库";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtwarehouse
-            // 
-            this.txtwarehouse.EditValue = "";
-            this.txtwarehouse.Location = new System.Drawing.Point(87, 348);
-            this.txtwarehouse.Name = "txtwarehouse";
-            this.txtwarehouse.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtwarehouse.Properties.DisplayMember = "Name";
-            this.txtwarehouse.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
-            this.txtwarehouse.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
-            this.txtwarehouse.Properties.ValueMember = "ID";
-            this.txtwarehouse.Size = new System.Drawing.Size(1191, 20);
-            this.txtwarehouse.StyleController = this.layoutControl1;
-            this.txtwarehouse.TabIndex = 15;
-            // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txtcreatorId;
             this.layoutControlItem16.CustomizationFormText = "制单人";
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 360);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 216);
             this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.Size = new System.Drawing.Size(1270, 24);
+            this.layoutControlItem16.Size = new System.Drawing.Size(521, 24);
             this.layoutControlItem16.Text = "制单人";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtcreatorId
+            // layoutControlItem2
             // 
-            this.txtcreatorId.EditValue = "";
-            this.txtcreatorId.Location = new System.Drawing.Point(87, 372);
-            this.txtcreatorId.Name = "txtcreatorId";
-            this.txtcreatorId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtcreatorId.Properties.DisplayMember = "Name";
-            this.txtcreatorId.Properties.PopupFilterMode = DevExpress.XtraEditors.PopupFilterMode.Contains;
-            this.txtcreatorId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard;
-            this.txtcreatorId.Properties.ValueMember = "ID";
-            this.txtcreatorId.Size = new System.Drawing.Size(1191, 20);
-            this.txtcreatorId.StyleController = this.layoutControl1;
-            this.txtcreatorId.TabIndex = 16;
+            this.layoutControlItem2.Control = this.txtwordordercode;
+            this.layoutControlItem2.CustomizationFormText = "工单号";
+            this.layoutControlItem2.Location = new System.Drawing.Point(521, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem2.Text = "工单号";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem17
+            // layoutControlItem10
             // 
-            this.layoutControlItem17.Control = this.txtcreateTime;
-            this.layoutControlItem17.CustomizationFormText = "制单日期";
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 384);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.Size = new System.Drawing.Size(1270, 24);
-            this.layoutControlItem17.Text = "制单日期";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem10.Control = this.txtspec;
+            this.layoutControlItem10.CustomizationFormText = "规格型号";
+            this.layoutControlItem10.Location = new System.Drawing.Point(521, 120);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem10.Text = "规格型号";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtcreateTime
+            // layoutControlItem14
             // 
-            this.txtcreateTime.EditValue = null;
-            this.txtcreateTime.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.txtcreateTime.Location = new System.Drawing.Point(87, 396);
-            this.txtcreateTime.Name = "txtcreateTime";
-            this.txtcreateTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtcreateTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.txtcreateTime.Properties.DisplayFormat.FormatString = "G";
-            this.txtcreateTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
-            this.txtcreateTime.Size = new System.Drawing.Size(1191, 20);
-            this.txtcreateTime.StyleController = this.layoutControl1;
-            this.txtcreateTime.TabIndex = 17;
+            this.layoutControlItem14.Control = this.txtdeliverdate;
+            this.layoutControlItem14.CustomizationFormText = "交货日期";
+            this.layoutControlItem14.Location = new System.Drawing.Point(521, 168);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem14.Text = "交货日期";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txtremark;
             this.layoutControlItem18.CustomizationFormText = "备注";
-            this.layoutControlItem18.Location = new System.Drawing.Point(0, 408);
+            this.layoutControlItem18.Location = new System.Drawing.Point(521, 192);
             this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.Size = new System.Drawing.Size(1270, 305);
+            this.layoutControlItem18.Size = new System.Drawing.Size(522, 24);
             this.layoutControlItem18.Text = "备注";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // txtremark
+            // layoutControlItem17
             // 
-            this.txtremark.Location = new System.Drawing.Point(87, 420);
-            this.txtremark.Name = "txtremark";
-            this.txtremark.Size = new System.Drawing.Size(1191, 20);
-            this.txtremark.StyleController = this.layoutControl1;
-            this.txtremark.TabIndex = 18;
+            this.layoutControlItem17.Control = this.txtcreateTime;
+            this.layoutControlItem17.CustomizationFormText = "制单日期";
+            this.layoutControlItem17.Location = new System.Drawing.Point(521, 216);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem17.Text = "制单日期";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.xtraTabControl2;
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 240);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.Size = new System.Drawing.Size(1043, 365);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem19.TextVisible = false;
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txtworkordertype;
+            this.layoutControlItem5.CustomizationFormText = "工单类型";
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 24);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(521, 24);
+            this.layoutControlItem5.Text = "工单类型";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txtproductdate;
+            this.layoutControlItem6.CustomizationFormText = "生产日期";
+            this.layoutControlItem6.Location = new System.Drawing.Point(521, 24);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem6.Text = "生产日期";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txtbomid;
+            this.layoutControlItem20.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.Size = new System.Drawing.Size(521, 24);
+            this.layoutControlItem20.Text = "bom";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txtunit;
+            this.layoutControlItem12.CustomizationFormText = "计量单位";
+            this.layoutControlItem12.Location = new System.Drawing.Point(521, 144);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem12.Text = "计量单位";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txtproductid;
+            this.layoutControlItem9.CustomizationFormText = "产品名称";
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(521, 24);
+            this.layoutControlItem9.Text = "产品名称";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txtproductcode;
+            this.layoutControlItem8.CustomizationFormText = "产品编号";
+            this.layoutControlItem8.Location = new System.Drawing.Point(521, 48);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem8.Text = "产品编号";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txtsalecode;
+            this.layoutControlItem3.CustomizationFormText = "销售单号";
+            this.layoutControlItem3.Location = new System.Drawing.Point(521, 96);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem3.Text = "销售单号";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txtproducttype;
+            this.layoutControlItem21.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.Size = new System.Drawing.Size(521, 24);
+            this.layoutControlItem21.Text = "产品类型";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txtproductdept;
+            this.layoutControlItem7.CustomizationFormText = "生产单位";
+            this.layoutControlItem7.Location = new System.Drawing.Point(521, 72);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(522, 24);
+            this.layoutControlItem7.Text = "生产单位";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
             // 
             // Frmworkorder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1300, 800);
+            this.ClientSize = new System.Drawing.Size(1072, 689);
             this.Controls.Add(this.xtraTabControl1);
             this.Name = "Frmworkorder";
-            this.Text = "Frmworkorder";
+            this.Text = "工单";
             this.Load += new System.EventHandler(this.Frmworkorder_Load);
             this.Controls.SetChildIndex(this.xtraTabControl1, 0);
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemtxtworkordertype)).EndInit();
@@ -938,47 +1294,63 @@ namespace MES.Form
             this.panelControl2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtproducttype.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtbomid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
+            this.xtraTabControl2.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+            this.contextMenuStrip1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialid)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEditmaterialtype)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtwordordercode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsalecode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtsaledetailcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtworkordertype.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductdate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductdept.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductcode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtspec.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtproductnumber.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtunit.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtfinishdate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtdeliverdate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtwarehouse.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcreatorId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtcreateTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtremark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1073,5 +1445,36 @@ namespace MES.Form
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private XtraTabControl xtraTabControl2;
+        private XtraTabPage xtraTabPage1;
+        private XtraTabPage xtraTabPage2;
+        private LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraGrid.GridControl gridControl2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        private LookUpEdit txtbomid;
+        private LayoutControlItem layoutControlItem20;
+        private LookUpEdit txtproducttype;
+        private LayoutControlItem layoutControlItem21;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
+        private DevExpress.XtraGrid.GridControl gridControl1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialid;
+        private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEditmaterialtype;
     }
 }
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx b/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx
index 1af7de1..ad53752 100644
--- a/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx
+++ b/WinformGeneralDeveloperFrame/Form/Frmworkorder.resx
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/FrmBaseForm.cs b/WinformGeneralDeveloperFrame/FrmBaseForm.cs
index 34d2d91..00044c0 100644
--- a/WinformGeneralDeveloperFrame/FrmBaseForm.cs
+++ b/WinformGeneralDeveloperFrame/FrmBaseForm.cs
@@ -19,6 +19,7 @@ using MES.Entity;
 using WinformGeneralDeveloperFrame.Commons;
 using MES;
 
+
 namespace WinformGeneralDeveloperFrame
 {
     public partial class FrmBaseForm : XtraForm
@@ -47,6 +48,12 @@ namespace WinformGeneralDeveloperFrame
             InitFrom(xtraTab, gridControl, gridView, controlGroups);
             this.DataType = DataType;
         }
+        public void InitFrom(XtraTabControl xtraTab, GridControl gridControl, GridView gridView, LayoutControlGroup[] controlGroups, object DataType, string[] readcontrols)
+        {
+            InitFrom(xtraTab, gridControl, gridView, controlGroups);
+            this.DataType = DataType;
+            readonlycon = readcontrols;
+        }
         public void InitFrom(XtraTabControl xtraTab, GridControl gridControl, GridView gridView, LayoutControlGroup[] controlGroups)
         {
             initTools();
diff --git a/WinformGeneralDeveloperFrame/MainForm.Designer.cs b/WinformGeneralDeveloperFrame/MainForm.Designer.cs
index 060c8d1..48ce2b1 100644
--- a/WinformGeneralDeveloperFrame/MainForm.Designer.cs
+++ b/WinformGeneralDeveloperFrame/MainForm.Designer.cs
@@ -53,6 +53,7 @@ namespace WinformGeneralDeveloperFrame
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.bsi_UserName = new DevExpress.XtraBars.BarStaticItem();
             this.barStaticItem1 = new DevExpress.XtraBars.BarStaticItem();
+            this.defaultLookAndFeel1 = new DevExpress.LookAndFeel.DefaultLookAndFeel(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.ribbonControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTimeEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabbedMdiManager1)).BeginInit();
@@ -61,7 +62,12 @@ namespace WinformGeneralDeveloperFrame
             // 
             // ribbonControl1
             // 
+            resources.ApplyResources(this.ribbonControl1, "ribbonControl1");
             this.ribbonControl1.ExpandCollapseItem.Id = 0;
+            this.ribbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex = ((int)(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex")));
+            this.ribbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex")));
+            this.ribbonControl1.ExpandCollapseItem.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("ribbonControl1.ExpandCollapseItem.ImageOptions.SvgImage")));
+            this.ribbonControl1.ExpandCollapseItem.SearchTags = resources.GetString("ribbonControl1.ExpandCollapseItem.SearchTags");
             this.ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
             this.ribbonControl1.ExpandCollapseItem,
             this.ribbonControl1.SearchEditItem,
@@ -77,7 +83,6 @@ namespace WinformGeneralDeveloperFrame
             this.barButtonItem2,
             this.barStaticItem2,
             this.barButtonItem3});
-            this.ribbonControl1.Location = new System.Drawing.Point(0, 0);
             this.ribbonControl1.MaxItemId = 13;
             this.ribbonControl1.Name = "ribbonControl1";
             this.ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
@@ -85,105 +90,141 @@ namespace WinformGeneralDeveloperFrame
             this.ribbonControl1.QuickToolbarItemLinks.Add(this.ribbonGalleryBarItem1);
             this.ribbonControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemTimeEdit1});
-            this.ribbonControl1.Size = new System.Drawing.Size(1157, 148);
             this.ribbonControl1.StatusBar = this.ribbonStatusBar1;
             this.ribbonControl1.Click += new System.EventHandler(this.ribbonControl1_Click);
             // 
             // ribbonGalleryBarItem1
             // 
-            this.ribbonGalleryBarItem1.Caption = "ribbonGalleryBarItem1";
+            resources.ApplyResources(this.ribbonGalleryBarItem1, "ribbonGalleryBarItem1");
             this.ribbonGalleryBarItem1.Id = 1;
+            this.ribbonGalleryBarItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("ribbonGalleryBarItem1.ImageOptions.ImageIndex")));
+            this.ribbonGalleryBarItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("ribbonGalleryBarItem1.ImageOptions.LargeImageIndex")));
+            this.ribbonGalleryBarItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("ribbonGalleryBarItem1.ImageOptions.SvgImage")));
             this.ribbonGalleryBarItem1.Name = "ribbonGalleryBarItem1";
             // 
             // skinPaletteRibbonGalleryBarItem1
             // 
+            resources.ApplyResources(this.skinPaletteRibbonGalleryBarItem1, "skinPaletteRibbonGalleryBarItem1");
             this.skinPaletteRibbonGalleryBarItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.skinPaletteRibbonGalleryBarItem1.Caption = "skinPaletteRibbonGalleryBarItem1";
             this.skinPaletteRibbonGalleryBarItem1.Id = 2;
+            this.skinPaletteRibbonGalleryBarItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("skinPaletteRibbonGalleryBarItem1.ImageOptions.ImageIndex")));
+            this.skinPaletteRibbonGalleryBarItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("skinPaletteRibbonGalleryBarItem1.ImageOptions.LargeImageIndex")));
+            this.skinPaletteRibbonGalleryBarItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("skinPaletteRibbonGalleryBarItem1.ImageOptions.SvgImage")));
             this.skinPaletteRibbonGalleryBarItem1.Name = "skinPaletteRibbonGalleryBarItem1";
             // 
             // barEditItem1
             // 
+            resources.ApplyResources(this.barEditItem1, "barEditItem1");
             this.barEditItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.barEditItem1.Caption = "barEditItem1";
             this.barEditItem1.Edit = this.repositoryItemTimeEdit1;
             this.barEditItem1.Id = 3;
+            this.barEditItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barEditItem1.ImageOptions.ImageIndex")));
+            this.barEditItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barEditItem1.ImageOptions.LargeImageIndex")));
+            this.barEditItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barEditItem1.ImageOptions.SvgImage")));
             this.barEditItem1.Name = "barEditItem1";
             // 
             // repositoryItemTimeEdit1
             // 
-            this.repositoryItemTimeEdit1.AutoHeight = false;
+            resources.ApplyResources(this.repositoryItemTimeEdit1, "repositoryItemTimeEdit1");
             this.repositoryItemTimeEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            new DevExpress.XtraEditors.Controls.EditorButton(((DevExpress.XtraEditors.Controls.ButtonPredefines)(resources.GetObject("repositoryItemTimeEdit1.Buttons"))))});
+            this.repositoryItemTimeEdit1.Mask.EditMask = resources.GetString("repositoryItemTimeEdit1.Mask.EditMask");
             this.repositoryItemTimeEdit1.Name = "repositoryItemTimeEdit1";
             // 
             // bsi_Date
             // 
+            resources.ApplyResources(this.bsi_Date, "bsi_Date");
             this.bsi_Date.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right;
-            this.bsi_Date.Caption = "DateTime";
             this.bsi_Date.Id = 4;
             this.bsi_Date.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.time_16x16;
+            this.bsi_Date.ImageOptions.ImageIndex = ((int)(resources.GetObject("bsi_Date.ImageOptions.ImageIndex")));
             this.bsi_Date.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.time_32x32;
+            this.bsi_Date.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("bsi_Date.ImageOptions.LargeImageIndex")));
+            this.bsi_Date.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsi_Date.ImageOptions.SvgImage")));
             this.bsi_Date.Name = "bsi_Date";
             this.bsi_Date.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
             // 
             // barListItem1
             // 
-            this.barListItem1.Caption = "barListItem1";
+            resources.ApplyResources(this.barListItem1, "barListItem1");
             this.barListItem1.Id = 5;
+            this.barListItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barListItem1.ImageOptions.ImageIndex")));
+            this.barListItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barListItem1.ImageOptions.LargeImageIndex")));
+            this.barListItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barListItem1.ImageOptions.SvgImage")));
             this.barListItem1.Name = "barListItem1";
             // 
             // barUserName
             // 
-            this.barUserName.Caption = "用户名:admin";
+            resources.ApplyResources(this.barUserName, "barUserName");
             this.barUserName.Id = 6;
             this.barUserName.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.bocustomer_16x16;
+            this.barUserName.ImageOptions.ImageIndex = ((int)(resources.GetObject("barUserName.ImageOptions.ImageIndex")));
             this.barUserName.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.bocustomer_32x321;
+            this.barUserName.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barUserName.ImageOptions.LargeImageIndex")));
+            this.barUserName.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barUserName.ImageOptions.SvgImage")));
             this.barUserName.Name = "barUserName";
             this.barUserName.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
             // 
             // barStaticItem3
             // 
-            this.barStaticItem3.Caption = "barStaticItem3";
+            resources.ApplyResources(this.barStaticItem3, "barStaticItem3");
             this.barStaticItem3.Id = 7;
+            this.barStaticItem3.ImageOptions.ImageIndex = ((int)(resources.GetObject("barStaticItem3.ImageOptions.ImageIndex")));
+            this.barStaticItem3.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barStaticItem3.ImageOptions.LargeImageIndex")));
+            this.barStaticItem3.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barStaticItem3.ImageOptions.SvgImage")));
             this.barStaticItem3.Name = "barStaticItem3";
             // 
             // btnabout
             // 
-            this.btnabout.Caption = "关于";
+            resources.ApplyResources(this.btnabout, "btnabout");
             this.btnabout.Id = 8;
             this.btnabout.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.operatingsystem_16x16;
+            this.btnabout.ImageOptions.ImageIndex = ((int)(resources.GetObject("btnabout.ImageOptions.ImageIndex")));
             this.btnabout.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.operatingsystem_32x32;
+            this.btnabout.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("btnabout.ImageOptions.LargeImageIndex")));
+            this.btnabout.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnabout.ImageOptions.SvgImage")));
             this.btnabout.Name = "btnabout";
             this.btnabout.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
             // 
             // barButtonItem1
             // 
-            this.barButtonItem1.Caption = "bug反馈           ";
+            resources.ApplyResources(this.barButtonItem1, "barButtonItem1");
             this.barButtonItem1.Id = 9;
             this.barButtonItem1.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.mail_16x16;
+            this.barButtonItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barButtonItem1.ImageOptions.ImageIndex")));
             this.barButtonItem1.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.mail_32x32;
+            this.barButtonItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barButtonItem1.ImageOptions.LargeImageIndex")));
+            this.barButtonItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItem1.ImageOptions.SvgImage")));
             this.barButtonItem1.Name = "barButtonItem1";
             this.barButtonItem1.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem1_ItemClick);
             // 
             // barButtonItem2
             // 
-            this.barButtonItem2.Caption = "barButtonItem2";
+            resources.ApplyResources(this.barButtonItem2, "barButtonItem2");
             this.barButtonItem2.Id = 10;
+            this.barButtonItem2.ImageOptions.ImageIndex = ((int)(resources.GetObject("barButtonItem2.ImageOptions.ImageIndex")));
+            this.barButtonItem2.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barButtonItem2.ImageOptions.LargeImageIndex")));
+            this.barButtonItem2.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItem2.ImageOptions.SvgImage")));
             this.barButtonItem2.Name = "barButtonItem2";
             // 
             // barStaticItem2
             // 
-            this.barStaticItem2.Caption = "barStaticItem2";
+            resources.ApplyResources(this.barStaticItem2, "barStaticItem2");
             this.barStaticItem2.Id = 11;
+            this.barStaticItem2.ImageOptions.ImageIndex = ((int)(resources.GetObject("barStaticItem2.ImageOptions.ImageIndex")));
+            this.barStaticItem2.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barStaticItem2.ImageOptions.LargeImageIndex")));
+            this.barStaticItem2.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barStaticItem2.ImageOptions.SvgImage")));
             this.barStaticItem2.Name = "barStaticItem2";
             // 
             // barButtonItem3
             // 
-            this.barButtonItem3.Caption = "注销";
+            resources.ApplyResources(this.barButtonItem3, "barButtonItem3");
             this.barButtonItem3.Id = 12;
             this.barButtonItem3.ImageOptions.Image = global::WinformGeneralDeveloperFrame.Properties.Resources.removepivotfield_16x16;
+            this.barButtonItem3.ImageOptions.ImageIndex = ((int)(resources.GetObject("barButtonItem3.ImageOptions.ImageIndex")));
             this.barButtonItem3.ImageOptions.LargeImage = global::WinformGeneralDeveloperFrame.Properties.Resources.removepivotfield_32x32;
+            this.barButtonItem3.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barButtonItem3.ImageOptions.LargeImageIndex")));
+            this.barButtonItem3.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barButtonItem3.ImageOptions.SvgImage")));
             this.barButtonItem3.Name = "barButtonItem3";
             this.barButtonItem3.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.barButtonItem3_ItemClick);
             // 
@@ -192,7 +233,7 @@ namespace WinformGeneralDeveloperFrame
             this.ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
             this.ribbonPageGroup1});
             this.ribbonPage1.Name = "ribbonPage1";
-            this.ribbonPage1.Text = "帮助";
+            resources.ApplyResources(this.ribbonPage1, "ribbonPage1");
             // 
             // ribbonPageGroup1
             // 
@@ -203,12 +244,11 @@ namespace WinformGeneralDeveloperFrame
             // 
             // ribbonStatusBar1
             // 
+            resources.ApplyResources(this.ribbonStatusBar1, "ribbonStatusBar1");
             this.ribbonStatusBar1.ItemLinks.Add(this.bsi_Date);
             this.ribbonStatusBar1.ItemLinks.Add(this.barUserName);
-            this.ribbonStatusBar1.Location = new System.Drawing.Point(0, 766);
             this.ribbonStatusBar1.Name = "ribbonStatusBar1";
             this.ribbonStatusBar1.Ribbon = this.ribbonControl1;
-            this.ribbonStatusBar1.Size = new System.Drawing.Size(1157, 32);
             // 
             // xtraTabbedMdiManager1
             // 
@@ -216,16 +256,12 @@ namespace WinformGeneralDeveloperFrame
             // 
             // navBarControl1
             // 
+            resources.ApplyResources(this.navBarControl1, "navBarControl1");
             this.navBarControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
-            this.navBarControl1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.navBarControl1.Location = new System.Drawing.Point(0, 148);
             this.navBarControl1.Name = "navBarControl1";
-            this.navBarControl1.OptionsNavPane.ExpandedWidth = 184;
+            this.navBarControl1.OptionsNavPane.ExpandedWidth = ((int)(resources.GetObject("resource.ExpandedWidth")));
             this.navBarControl1.PaintStyleKind = DevExpress.XtraNavBar.NavBarViewKind.NavigationPane;
-            this.navBarControl1.Size = new System.Drawing.Size(184, 618);
             this.navBarControl1.StoreDefaultPaintStyleName = true;
-            this.navBarControl1.TabIndex = 8;
-            this.navBarControl1.Text = "navBarControl1";
             this.navBarControl1.Click += new System.EventHandler(this.navBarControl1_Click);
             // 
             // timer1
@@ -236,34 +272,46 @@ namespace WinformGeneralDeveloperFrame
             // 
             // bsi_UserName
             // 
-            this.bsi_UserName.Caption = "用戶名: 管理員";
+            resources.ApplyResources(this.bsi_UserName, "bsi_UserName");
             this.bsi_UserName.Id = 29;
             this.bsi_UserName.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("bsi_UserName.ImageOptions.Image")));
+            this.bsi_UserName.ImageOptions.ImageIndex = ((int)(resources.GetObject("bsi_UserName.ImageOptions.ImageIndex")));
+            this.bsi_UserName.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("bsi_UserName.ImageOptions.LargeImageIndex")));
+            this.bsi_UserName.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("bsi_UserName.ImageOptions.SvgImage")));
             this.bsi_UserName.Name = "bsi_UserName";
             this.bsi_UserName.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
             // 
             // barStaticItem1
             // 
-            this.barStaticItem1.Caption = "用戶名: 管理員";
+            resources.ApplyResources(this.barStaticItem1, "barStaticItem1");
             this.barStaticItem1.Id = 29;
             this.barStaticItem1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barStaticItem1.ImageOptions.Image")));
+            this.barStaticItem1.ImageOptions.ImageIndex = ((int)(resources.GetObject("barStaticItem1.ImageOptions.ImageIndex")));
+            this.barStaticItem1.ImageOptions.LargeImageIndex = ((int)(resources.GetObject("barStaticItem1.ImageOptions.LargeImageIndex")));
+            this.barStaticItem1.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("barStaticItem1.ImageOptions.SvgImage")));
             this.barStaticItem1.Name = "barStaticItem1";
             this.barStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
             // 
+            // defaultLookAndFeel1
+            // 
+            this.defaultLookAndFeel1.LookAndFeel.SkinName = "Office 2007 Silver";
+            // 
             // MainForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            resources.ApplyResources(this, "$this");
+            this.Appearance.BackColor = System.Drawing.Color.White;
+            this.Appearance.ForeColor = System.Drawing.Color.Transparent;
+            this.Appearance.Options.UseBackColor = true;
+            this.Appearance.Options.UseForeColor = true;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1157, 798);
             this.Controls.Add(this.navBarControl1);
             this.Controls.Add(this.ribbonStatusBar1);
             this.Controls.Add(this.ribbonControl1);
             this.IsMdiContainer = true;
             this.Name = "MainForm";
             this.Ribbon = this.ribbonControl1;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.StatusBar = this.ribbonStatusBar1;
-            this.Text = "主界面";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.Load += new System.EventHandler(this.MainForm_Load);
             ((System.ComponentModel.ISupportInitialize)(this.ribbonControl1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemTimeEdit1)).EndInit();
@@ -298,6 +346,7 @@ namespace WinformGeneralDeveloperFrame
         private DevExpress.XtraBars.BarButtonItem barButtonItem2;
         private DevExpress.XtraBars.BarStaticItem barStaticItem2;
         private DevExpress.XtraBars.BarButtonItem barButtonItem3;
+        private DevExpress.LookAndFeel.DefaultLookAndFeel defaultLookAndFeel1;
     }
 }
 
diff --git a/WinformGeneralDeveloperFrame/MainForm.resx b/WinformGeneralDeveloperFrame/MainForm.resx
index 15d85cb..0b1030d 100644
--- a/WinformGeneralDeveloperFrame/MainForm.resx
+++ b/WinformGeneralDeveloperFrame/MainForm.resx
@@ -117,61 +117,194 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="xtraTabbedMdiManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>219, 17</value>
-  </metadata>
+  <data name="skinPaletteRibbonGalleryBarItem1.Caption" xml:space="preserve">
+    <value>skinPaletteRibbonGalleryBarItem1</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="bsi_UserName.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="skinPaletteRibbonGalleryBarItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;barStaticItem1.Name" xml:space="preserve">
+    <value>barStaticItem1</value>
+  </data>
+  <data name="&gt;&gt;ribbonControl1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="barEditItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="barButtonItem1.Caption" xml:space="preserve">
+    <value>bug反馈           </value>
+  </data>
+  <data name="&gt;&gt;barStaticItem3.Name" xml:space="preserve">
+    <value>barStaticItem3</value>
+  </data>
+  <data name="barUserName.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="barButtonItem3.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="ribbonControl1.ExpandCollapseItem.SearchTags" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="barStaticItem2.Caption" xml:space="preserve">
+    <value>barStaticItem2</value>
+  </data>
+  <data name="&gt;&gt;barButtonItem1.Name" xml:space="preserve">
+    <value>barButtonItem1</value>
+  </data>
+  <data name="&gt;&gt;ribbonStatusBar1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="skinPaletteRibbonGalleryBarItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;ribbonStatusBar1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="btnabout.Caption" xml:space="preserve">
+    <value>关于</value>
+  </data>
+  <data name="&gt;&gt;ribbonStatusBar1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;barListItem1.Name" xml:space="preserve">
+    <value>barListItem1</value>
+  </data>
+  <data name="&gt;&gt;defaultLookAndFeel1.Name" xml:space="preserve">
+    <value>defaultLookAndFeel1</value>
+  </data>
+  <data name="barUserName.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;bsi_Date.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barEditItem1.Caption" xml:space="preserve">
+    <value>barEditItem1</value>
+  </data>
+  <data name="barUserName.Caption" xml:space="preserve">
+    <value>用户名:admin</value>
+  </data>
+  <data name="&gt;&gt;barUserName.Name" xml:space="preserve">
+    <value>barUserName</value>
+  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="bsi_UserName.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAADJ0RVh0VGl0
-        bGUAQ3VzdG9tZXI7RW1wbG95ZWU7UGVyc29uO0NvbnRhY3Q7VXNlcjtDbGllbnR+ETboAAAJ8ElEQVRY
-        R8WWd1RU1xbGr0ls0agpdnqPjIJIr4qIAwhqpAQR6VWkhSKDVEFGCBa6gPQiA1ICCEaNj6IRQQ3qA6LE
-        FhOfRo1kJZqXqF/2GYKatUjWW4s/3l7rN3fmnnv2t/c++5w7HID/K+PefJ1GH21Cl2vdbsCdCDPmOqNN
-        +WcT1+7v223Zcz7F8k5vsgXOxK95fCrSuK8tULepwWu57eGtqlOqnFS4is3K4/p8nXFvjsGs3kuLq/fU
-        XNrordXSuk33eWeMMa4UbcXd03vx6FIxnt6uw8PzqbjZGoSL2dZoDVyGCkfFh6X2CtoldnJiH+P5HmPc
-        m2Mwq3NfvrjJX2fkSslWXMo0IrEs/HKrAb/cEOGn4Qr8dLUUIwO5eNATjYc9sbhW7YiOnWoodZR7cnCD
-        pOGEA6hxWZrSnWKB6w0e6Ihagvs9qXhw/gAe9O3FD+fScP/LFPynKw63W/0IX9xs8sKpYAWU2C/CXrP3
-        uiYcQMVmlWsXsm1wIdMC1c6SaIvQxPXGbbjZHILrTYG4JvLEYLE9Bg5twhWiJ9kQx/1lUWq3CHtWzXk2
-        4QCK7RSe9aatwWdBaijatBCiQGOUOcrgRMQKdMXp4XSiEU5F66I9VAMiNwUc9ZBGi5sUiunZZONZYifj
-        +R5j3JtjMMtbL/nfE5R1hZMMsjdK47fHg2gTumGv+fvIspyLPOt5yLGahzTT97BTdxa8VabhyMeLUWgz
-        H/H6M59MOIAMiwW36jyVSWQuCW8Ffr0O/NyLO+cK0S7chJzNSthnK48ifw3UClairyYKu1fOfp5jMRfR
-        2tO/JheTxvM9xrg3x2AmNH2vodhBmjJ8FzfOlANPh4GfOoCRL4AfPwdupeLFdSFGvtyOH7v88KgvFQLt
-        6chctwDhK6Y2TjiAWP2ZbunmHyDJZBae/zwIPLkKPDoxKv6IuJGMF9fi8eCkB+610fnwRTiitN9Gosls
-        BKq95TPhAIwlJk9J5S98nuMghWePz1MAFMTDtlEeNAFfx+PZvwW42+yAOw22uN3shRi92QjTnP5CZ/4b
-        MyccANmb9cErB9tijfDkDmX8ywAJHwV+aAa+LwOGovBrbyBui6xxo9oGgxWOSOPLYhdfjq3/ZOKfA/gf
-        7I0CV22XGn/e73fPZlIDXqYAjgH364HhPcCVcGoHF3xTaorhciucTrdAnN7s30KMJL1orjgAsZe/s/ii
-        lWJSKvhcQYvrX/jT3iBm5DvLZ12p9qfSn6Ls24Fv9gOXgoH+YHwnssJQrh6ullmgMVQLgUun7aM57xJv
-        EZN2ZBtykURElgEXnqHPfXKAoUdDZGMB7K/d9HcBsAymCcwXWjRHGlDZq6jz84GLAcQ2/NrtjuECQwzm
-        6GGoyIy6fxFsZCavpTls/VnwXFimARdGgqH79biQfXpccLouF/SpLht6FUBOo9M/BcBK+X7m+oVf3e1M
-        Ar4rw4v+T/BbtwvuivgYytHGUKEpulMMINCYdoGeXURMJcQBvBLV4ban6XABqdrcNqE2G3oVQG7TFu7W
-        yGExt0eqicOjD4wG8Cbxjq/WbHvRdl38fqMITy8l4V6dFW5VmNH6r8VA4Spkb1iMddKTP6Zn3yfE5Se4
-        0tN2XMlpW66oeyNX1LWB89utyfkka7Kh1yrQ5MTdfFw1ykglXStGH3gVwNs7AlYFp9jyUOWjhastsXh4
-        bg9uN7nh7D4zFDjIIsRwPjasFjffLOJlAxZ3f0TiG7hDneu5wk5rzitRg/NM0GBDHBd3yISLK1zJHaiz
-        5755VMZdZ/xYyobY5DHxqfGJlublyVued1RFIHOLOpJNPsAu3ZnEDOwynAOhpQSy3HkQ2Ko8s7OTX0Nz
-        ZhAsCDZ/UmGnDVfQsY7LJ9xi1TnXnWp0mywm34Qw5oQV67jhh4fYLSbK1o6VcEpkOl9rd8nGytx61+cD
-        ZzJxn/4FXRBFoSp0NQ56aCHPVR1FnstxJEQPbTv0kU9vxZA0/d9dBGrlli6KWuSDNSPrB+aP+Z3kLFjG
-        bYlaSl/JBHlGnCDXiH19XXhqeLq56a4im6NZ9VvQflGAwft5qDsZgGE6C+715WCwUYAz2S7oSrfFv/ZY
-        44tEc3oZGcAvSh2VXzohpcYMfkItOIbzWvku8pbkczYx/U//kz4O49GFjO1Pspeljty31jah0PpcDgkf
-        749G/9009N6JReeN7ThxzRt5LZvQUOuLnsYIXG2MxIVCdzQKrSCM0YdXvAZyj1ti7zEdpDRrYG+7ERKq
-        jOCTrAH7YNVe860KzqTBAplCiHcIF0YHA9mb0spzZgSl6dfmNDjj5OWdOP/tbnTfDMexr13QMmCP5gFb
-        ujrg2JALyjvskFrDR1iGAQL26CAi2xDJlabIP8VH2lEtJDbyEFu3BNEiFcSIVJHcqInYch14Jqljnbdy
-        DemxQ4oFwRIXf0zxjNUIFlZbovWKHz4f9EfTZQcc6V+POjE2hDVqv7KC6KIV6i99hKZLDvjsshMa+h1R
-        0m2JjOPGSP5sGRLqeYip/RCCw8rYUamEyApFhJcrIKJCGTureXBN4GGlvUwAabLeYFUXl+Jt32TN/pKO
-        zSjs4mPfcW0Un1mNyj4+KnvXooqo7F2D8l4zlPWsRunZVSg6bYLcDn2kHtVAUtMyJJJwbC1lXaOMqCol
-        ElREWJkCPimRR0gxbdEiWYQWySEgUxl8d4UzpMnOCrZLxFHM8tm14mlNjzPS27Wxp2050to1cOCkDokY
-        Ir/LCIXdxnQ1RM4pPWSc0KFSa1BplyLhCA9xoiXYeVgFUZRxRDkJl8ojtFhOLBpUKIPAAhlsz5cipBF8
-        UAkWngoPSHMhwZZB3JVz3OOW4zAFsLtFjVCHkK6MlFZ1pNDvlGba+1TipKal4mzjaY1jSFhQrUKlpjKL
-        syVREmaiQWJRaQQclMK2XEn45RDZEgjKU8Bad/mfSXMxwbbnaAW2RqshscyMnPKQ0KCKBGokJpTQQFCW
-        8UdUxSWOqfkQ0STKso18mS2V+RBl+xdRKfjnSMCXRH2zJOCTuRge6RJwipMD31OB/RFYQIgrwHpg+ip7
-        WeP1fipZ9qGq3ztFqcI1fgk8hUuwLeNDKpsKQgqUEZyvhMA8JQQdVEAYW1taU3GJ82XgmyEDz3RpeHwq
-        Dfc0KbgIJeEULw3bCBlsCJaFlZ881rjK3zO0lTrEM55nQZrsuGbVf3kGTCPYHp3LM5i3wnCj1GbTzbIx
-        Fu6KIktvpR4rb8UBSy/FQYp+0MJT8dt1vkqw8lGEpbciLLwUYO4mf8fMRW5ojNXOsn0mDtINutYSSeqr
-        F3jI8Oaw006amEe8Q4y+K+xCVTm7kCX0/eUpyMrCTiy2TVhArFvZpPkEaxz2qpUgpAjmcAz2W/JP2Dhb
-        YzbnA2IOwfwxv8w/S5gS57g/AGl5Af+OTEZOAAAAAElFTkSuQmCC
-</value>
+  <data name="navBarControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>184, 626</value>
+  </data>
+  <data name="ribbonGalleryBarItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;barButtonItem3.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barButtonItem2.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="skinPaletteRibbonGalleryBarItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;barEditItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarEditItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="repositoryItemTimeEdit1.AutoHeight" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;bsi_UserName.Name" xml:space="preserve">
+    <value>bsi_UserName</value>
+  </data>
+  <data name="&gt;&gt;ribbonPage1.Name" xml:space="preserve">
+    <value>ribbonPage1</value>
+  </data>
+  <data name="barButtonItem2.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;barStaticItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;navBarControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barStaticItem3.Caption" xml:space="preserve">
+    <value>barStaticItem3</value>
+  </data>
+  <data name="&gt;&gt;ribbonControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;skinPaletteRibbonGalleryBarItem1.Name" xml:space="preserve">
+    <value>skinPaletteRibbonGalleryBarItem1</value>
+  </data>
+  <data name="barListItem1.Caption" xml:space="preserve">
+    <value>barListItem1</value>
+  </data>
+  <data name="&gt;&gt;ribbonPageGroup1.Name" xml:space="preserve">
+    <value>ribbonPageGroup1</value>
+  </data>
+  <data name="barStaticItem2.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="barStaticItem2.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;barListItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarListItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>1165, 798</value>
+  </data>
+  <data name="barStaticItem2.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="barButtonItem2.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;navBarControl1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="bsi_UserName.Caption" xml:space="preserve">
+    <value>用戶名: 管理員</value>
+  </data>
+  <data name="barButtonItem3.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="resource.ExpandedWidth" type="System.Int32, mscorlib">
+    <value>184</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>7, 14</value>
+  </data>
+  <data name="&gt;&gt;bsi_Date.Name" xml:space="preserve">
+    <value>bsi_Date</value>
+  </data>
+  <data name="&gt;&gt;ribbonControl1.Name" xml:space="preserve">
+    <value>ribbonControl1</value>
+  </data>
+  <data name="barStaticItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;barButtonItem2.Name" xml:space="preserve">
+    <value>barButtonItem2</value>
+  </data>
+  <data name="barButtonItem2.Caption" xml:space="preserve">
+    <value>barButtonItem2</value>
+  </data>
+  <data name="barListItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;skinPaletteRibbonGalleryBarItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.SkinPaletteRibbonGalleryBarItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="btnabout.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="ribbonGalleryBarItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
   </data>
   <data name="barStaticItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -222,4 +355,279 @@
         YzbnA2IOwfwxv8w/S5gS57g/AGl5Af+OTEZOAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
+  <data name="ribbonGalleryBarItem1.Caption" xml:space="preserve">
+    <value>ribbonGalleryBarItem1</value>
+  </data>
+  <data name="barListItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;barEditItem1.Name" xml:space="preserve">
+    <value>barEditItem1</value>
+  </data>
+  <data name="ribbonControl1.ExpandCollapseItem.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="barUserName.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;ribbonGalleryBarItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.RibbonGalleryBarItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;barStaticItem3.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barStaticItem3.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="bsi_UserName.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAADJ0RVh0VGl0
+        bGUAQ3VzdG9tZXI7RW1wbG95ZWU7UGVyc29uO0NvbnRhY3Q7VXNlcjtDbGllbnR+ETboAAAJ8ElEQVRY
+        R8WWd1RU1xbGr0ls0agpdnqPjIJIr4qIAwhqpAQR6VWkhSKDVEFGCBa6gPQiA1ICCEaNj6IRQQ3qA6LE
+        FhOfRo1kJZqXqF/2GYKatUjWW4s/3l7rN3fmnnv2t/c++5w7HID/K+PefJ1GH21Cl2vdbsCdCDPmOqNN
+        +WcT1+7v223Zcz7F8k5vsgXOxK95fCrSuK8tULepwWu57eGtqlOqnFS4is3K4/p8nXFvjsGs3kuLq/fU
+        XNrordXSuk33eWeMMa4UbcXd03vx6FIxnt6uw8PzqbjZGoSL2dZoDVyGCkfFh6X2CtoldnJiH+P5HmPc
+        m2Mwq3NfvrjJX2fkSslWXMo0IrEs/HKrAb/cEOGn4Qr8dLUUIwO5eNATjYc9sbhW7YiOnWoodZR7cnCD
+        pOGEA6hxWZrSnWKB6w0e6Ihagvs9qXhw/gAe9O3FD+fScP/LFPynKw63W/0IX9xs8sKpYAWU2C/CXrP3
+        uiYcQMVmlWsXsm1wIdMC1c6SaIvQxPXGbbjZHILrTYG4JvLEYLE9Bg5twhWiJ9kQx/1lUWq3CHtWzXk2
+        4QCK7RSe9aatwWdBaijatBCiQGOUOcrgRMQKdMXp4XSiEU5F66I9VAMiNwUc9ZBGi5sUiunZZONZYifj
+        +R5j3JtjMMtbL/nfE5R1hZMMsjdK47fHg2gTumGv+fvIspyLPOt5yLGahzTT97BTdxa8VabhyMeLUWgz
+        H/H6M59MOIAMiwW36jyVSWQuCW8Ffr0O/NyLO+cK0S7chJzNSthnK48ifw3UClairyYKu1fOfp5jMRfR
+        2tO/JheTxvM9xrg3x2AmNH2vodhBmjJ8FzfOlANPh4GfOoCRL4AfPwdupeLFdSFGvtyOH7v88KgvFQLt
+        6chctwDhK6Y2TjiAWP2ZbunmHyDJZBae/zwIPLkKPDoxKv6IuJGMF9fi8eCkB+610fnwRTiitN9Gosls
+        BKq95TPhAIwlJk9J5S98nuMghWePz1MAFMTDtlEeNAFfx+PZvwW42+yAOw22uN3shRi92QjTnP5CZ/4b
+        MyccANmb9cErB9tijfDkDmX8ywAJHwV+aAa+LwOGovBrbyBui6xxo9oGgxWOSOPLYhdfjq3/ZOKfA/gf
+        7I0CV22XGn/e73fPZlIDXqYAjgH364HhPcCVcGoHF3xTaorhciucTrdAnN7s30KMJL1orjgAsZe/s/ii
+        lWJSKvhcQYvrX/jT3iBm5DvLZ12p9qfSn6Ls24Fv9gOXgoH+YHwnssJQrh6ullmgMVQLgUun7aM57xJv
+        EZN2ZBtykURElgEXnqHPfXKAoUdDZGMB7K/d9HcBsAymCcwXWjRHGlDZq6jz84GLAcQ2/NrtjuECQwzm
+        6GGoyIy6fxFsZCavpTls/VnwXFimARdGgqH79biQfXpccLouF/SpLht6FUBOo9M/BcBK+X7m+oVf3e1M
+        Ar4rw4v+T/BbtwvuivgYytHGUKEpulMMINCYdoGeXURMJcQBvBLV4ban6XABqdrcNqE2G3oVQG7TFu7W
+        yGExt0eqicOjD4wG8Cbxjq/WbHvRdl38fqMITy8l4V6dFW5VmNH6r8VA4Spkb1iMddKTP6Zn3yfE5Se4
+        0tN2XMlpW66oeyNX1LWB89utyfkka7Kh1yrQ5MTdfFw1ykglXStGH3gVwNs7AlYFp9jyUOWjhastsXh4
+        bg9uN7nh7D4zFDjIIsRwPjasFjffLOJlAxZ3f0TiG7hDneu5wk5rzitRg/NM0GBDHBd3yISLK1zJHaiz
+        5755VMZdZ/xYyobY5DHxqfGJlublyVued1RFIHOLOpJNPsAu3ZnEDOwynAOhpQSy3HkQ2Ko8s7OTX0Nz
+        ZhAsCDZ/UmGnDVfQsY7LJ9xi1TnXnWp0mywm34Qw5oQV67jhh4fYLSbK1o6VcEpkOl9rd8nGytx61+cD
+        ZzJxn/4FXRBFoSp0NQ56aCHPVR1FnstxJEQPbTv0kU9vxZA0/d9dBGrlli6KWuSDNSPrB+aP+Z3kLFjG
+        bYlaSl/JBHlGnCDXiH19XXhqeLq56a4im6NZ9VvQflGAwft5qDsZgGE6C+715WCwUYAz2S7oSrfFv/ZY
+        44tEc3oZGcAvSh2VXzohpcYMfkItOIbzWvku8pbkczYx/U//kz4O49GFjO1Pspeljty31jah0PpcDgkf
+        749G/9009N6JReeN7ThxzRt5LZvQUOuLnsYIXG2MxIVCdzQKrSCM0YdXvAZyj1ti7zEdpDRrYG+7ERKq
+        jOCTrAH7YNVe860KzqTBAplCiHcIF0YHA9mb0spzZgSl6dfmNDjj5OWdOP/tbnTfDMexr13QMmCP5gFb
+        ujrg2JALyjvskFrDR1iGAQL26CAi2xDJlabIP8VH2lEtJDbyEFu3BNEiFcSIVJHcqInYch14Jqljnbdy
+        DemxQ4oFwRIXf0zxjNUIFlZbovWKHz4f9EfTZQcc6V+POjE2hDVqv7KC6KIV6i99hKZLDvjsshMa+h1R
+        0m2JjOPGSP5sGRLqeYip/RCCw8rYUamEyApFhJcrIKJCGTureXBN4GGlvUwAabLeYFUXl+Jt32TN/pKO
+        zSjs4mPfcW0Un1mNyj4+KnvXooqo7F2D8l4zlPWsRunZVSg6bYLcDn2kHtVAUtMyJJJwbC1lXaOMqCol
+        ElREWJkCPimRR0gxbdEiWYQWySEgUxl8d4UzpMnOCrZLxFHM8tm14mlNjzPS27Wxp2050to1cOCkDokY
+        Ir/LCIXdxnQ1RM4pPWSc0KFSa1BplyLhCA9xoiXYeVgFUZRxRDkJl8ojtFhOLBpUKIPAAhlsz5cipBF8
+        UAkWngoPSHMhwZZB3JVz3OOW4zAFsLtFjVCHkK6MlFZ1pNDvlGba+1TipKal4mzjaY1jSFhQrUKlpjKL
+        syVREmaiQWJRaQQclMK2XEn45RDZEgjKU8Bad/mfSXMxwbbnaAW2RqshscyMnPKQ0KCKBGokJpTQQFCW
+        8UdUxSWOqfkQ0STKso18mS2V+RBl+xdRKfjnSMCXRH2zJOCTuRge6RJwipMD31OB/RFYQIgrwHpg+ip7
+        WeP1fipZ9qGq3ztFqcI1fgk8hUuwLeNDKpsKQgqUEZyvhMA8JQQdVEAYW1taU3GJ82XgmyEDz3RpeHwq
+        Dfc0KbgIJeEULw3bCBlsCJaFlZ881rjK3zO0lTrEM55nQZrsuGbVf3kGTCPYHp3LM5i3wnCj1GbTzbIx
+        Fu6KIktvpR4rb8UBSy/FQYp+0MJT8dt1vkqw8lGEpbciLLwUYO4mf8fMRW5ojNXOsn0mDtINutYSSeqr
+        F3jI8Oaw006amEe8Q4y+K+xCVTm7kCX0/eUpyMrCTiy2TVhArFvZpPkEaxz2qpUgpAjmcAz2W/JP2Dhb
+        YzbnA2IOwfwxv8w/S5gS57g/AGl5Af+OTEZOAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="bsi_Date.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="bsi_Date.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;ribbonGalleryBarItem1.Name" xml:space="preserve">
+    <value>ribbonGalleryBarItem1</value>
+  </data>
+  <data name="&gt;&gt;barUserName.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barButtonItem1.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="&gt;&gt;defaultLookAndFeel1.Type" xml:space="preserve">
+    <value>DevExpress.LookAndFeel.DefaultLookAndFeel, DevExpress.Utils.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;btnabout.Name" xml:space="preserve">
+    <value>btnabout</value>
+  </data>
+  <data name="barEditItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="ribbonPage1.Text" xml:space="preserve">
+    <value>帮助</value>
+  </data>
+  <data name="barButtonItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="repositoryItemTimeEdit1.Mask.EditMask" xml:space="preserve">
+    <value>T</value>
+  </data>
+  <data name="barStaticItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="ribbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 775</value>
+  </data>
+  <data name="&gt;&gt;ribbonStatusBar1.Name" xml:space="preserve">
+    <value>ribbonStatusBar1</value>
+  </data>
+  <data name="&gt;&gt;barStaticItem2.Name" xml:space="preserve">
+    <value>barStaticItem2</value>
+  </data>
+  <data name="barButtonItem3.Caption" xml:space="preserve">
+    <value>注销</value>
+  </data>
+  <data name="&gt;&gt;ribbonPageGroup1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="ribbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1165, 23</value>
+  </data>
+  <data name="bsi_UserName.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;bsi_UserName.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="navBarControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Left</value>
+  </data>
+  <data name="&gt;&gt;xtraTabbedMdiManager1.Type" xml:space="preserve">
+    <value>DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barEditItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>MainForm</value>
+  </data>
+  <data name="navBarControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;navBarControl1.Name" xml:space="preserve">
+    <value>navBarControl1</value>
+  </data>
+  <data name="barListItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;repositoryItemTimeEdit1.Name" xml:space="preserve">
+    <value>repositoryItemTimeEdit1</value>
+  </data>
+  <data name="barButtonItem3.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="ribbonControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1165, 149</value>
+  </data>
+  <data name="&gt;&gt;barButtonItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;barButtonItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="navBarControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 149</value>
+  </data>
+  <data name="&gt;&gt;ribbonPage1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;navBarControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="ribbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;btnabout.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="ribbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="ribbonControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="&gt;&gt;barButtonItem3.Name" xml:space="preserve">
+    <value>barButtonItem3</value>
+  </data>
+  <data name="&gt;&gt;ribbonControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;timer1.Name" xml:space="preserve">
+    <value>timer1</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>主界面</value>
+  </data>
+  <data name="&gt;&gt;repositoryItemTimeEdit1.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.Repository.RepositoryItemTimeEdit, DevExpress.XtraEditors.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barStaticItem3.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="barStaticItem3.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="&gt;&gt;timer1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;barStaticItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="barStaticItem1.Caption" xml:space="preserve">
+    <value>用戶名: 管理員</value>
+  </data>
+  <data name="bsi_Date.Caption" xml:space="preserve">
+    <value>DateTime</value>
+  </data>
+  <data name="bsi_Date.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="barButtonItem1.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="barStaticItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="ribbonGalleryBarItem1.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <data name="btnabout.ImageOptions.LargeImageIndex" type="System.Int32, mscorlib">
+    <value>-1</value>
+  </data>
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="repositoryItemTimeEdit1.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v19.2">
+    <value>Combo</value>
+  </data>
+  <data name="bsi_UserName.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="btnabout.ImageOptions.SvgImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="navBarControl1.Text" xml:space="preserve">
+    <value>navBarControl1</value>
+  </data>
+  <data name="&gt;&gt;xtraTabbedMdiManager1.Name" xml:space="preserve">
+    <value>xtraTabbedMdiManager1</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>zh-CN</value>
+  </metadata>
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>219, 17</value>
+  </metadata>
+  <metadata name="xtraTabbedMdiManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="defaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>309, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/MainForm.zh-CN.resx b/WinformGeneralDeveloperFrame/MainForm.zh-CN.resx
new file mode 100644
index 0000000..94ae15d
--- /dev/null
+++ b/WinformGeneralDeveloperFrame/MainForm.zh-CN.resx
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="bsi_UserName.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAADJ0RVh0VGl0
+        bGUAQ3VzdG9tZXI7RW1wbG95ZWU7UGVyc29uO0NvbnRhY3Q7VXNlcjtDbGllbnR+ETboAAAJ8ElEQVRY
+        R8WWd1RU1xbGr0ls0agpdnqPjIJIr4qIAwhqpAQR6VWkhSKDVEFGCBa6gPQiA1ICCEaNj6IRQQ3qA6LE
+        FhOfRo1kJZqXqF/2GYKatUjWW4s/3l7rN3fmnnv2t/c++5w7HID/K+PefJ1GH21Cl2vdbsCdCDPmOqNN
+        +WcT1+7v223Zcz7F8k5vsgXOxK95fCrSuK8tULepwWu57eGtqlOqnFS4is3K4/p8nXFvjsGs3kuLq/fU
+        XNrordXSuk33eWeMMa4UbcXd03vx6FIxnt6uw8PzqbjZGoSL2dZoDVyGCkfFh6X2CtoldnJiH+P5HmPc
+        m2Mwq3NfvrjJX2fkSslWXMo0IrEs/HKrAb/cEOGn4Qr8dLUUIwO5eNATjYc9sbhW7YiOnWoodZR7cnCD
+        pOGEA6hxWZrSnWKB6w0e6Ihagvs9qXhw/gAe9O3FD+fScP/LFPynKw63W/0IX9xs8sKpYAWU2C/CXrP3
+        uiYcQMVmlWsXsm1wIdMC1c6SaIvQxPXGbbjZHILrTYG4JvLEYLE9Bg5twhWiJ9kQx/1lUWq3CHtWzXk2
+        4QCK7RSe9aatwWdBaijatBCiQGOUOcrgRMQKdMXp4XSiEU5F66I9VAMiNwUc9ZBGi5sUiunZZONZYifj
+        +R5j3JtjMMtbL/nfE5R1hZMMsjdK47fHg2gTumGv+fvIspyLPOt5yLGahzTT97BTdxa8VabhyMeLUWgz
+        H/H6M59MOIAMiwW36jyVSWQuCW8Ffr0O/NyLO+cK0S7chJzNSthnK48ifw3UClairyYKu1fOfp5jMRfR
+        2tO/JheTxvM9xrg3x2AmNH2vodhBmjJ8FzfOlANPh4GfOoCRL4AfPwdupeLFdSFGvtyOH7v88KgvFQLt
+        6chctwDhK6Y2TjiAWP2ZbunmHyDJZBae/zwIPLkKPDoxKv6IuJGMF9fi8eCkB+610fnwRTiitN9Gosls
+        BKq95TPhAIwlJk9J5S98nuMghWePz1MAFMTDtlEeNAFfx+PZvwW42+yAOw22uN3shRi92QjTnP5CZ/4b
+        MyccANmb9cErB9tijfDkDmX8ywAJHwV+aAa+LwOGovBrbyBui6xxo9oGgxWOSOPLYhdfjq3/ZOKfA/gf
+        7I0CV22XGn/e73fPZlIDXqYAjgH364HhPcCVcGoHF3xTaorhciucTrdAnN7s30KMJL1orjgAsZe/s/ii
+        lWJSKvhcQYvrX/jT3iBm5DvLZ12p9qfSn6Ls24Fv9gOXgoH+YHwnssJQrh6ullmgMVQLgUun7aM57xJv
+        EZN2ZBtykURElgEXnqHPfXKAoUdDZGMB7K/d9HcBsAymCcwXWjRHGlDZq6jz84GLAcQ2/NrtjuECQwzm
+        6GGoyIy6fxFsZCavpTls/VnwXFimARdGgqH79biQfXpccLouF/SpLht6FUBOo9M/BcBK+X7m+oVf3e1M
+        Ar4rw4v+T/BbtwvuivgYytHGUKEpulMMINCYdoGeXURMJcQBvBLV4ban6XABqdrcNqE2G3oVQG7TFu7W
+        yGExt0eqicOjD4wG8Cbxjq/WbHvRdl38fqMITy8l4V6dFW5VmNH6r8VA4Spkb1iMddKTP6Zn3yfE5Se4
+        0tN2XMlpW66oeyNX1LWB89utyfkka7Kh1yrQ5MTdfFw1ykglXStGH3gVwNs7AlYFp9jyUOWjhastsXh4
+        bg9uN7nh7D4zFDjIIsRwPjasFjffLOJlAxZ3f0TiG7hDneu5wk5rzitRg/NM0GBDHBd3yISLK1zJHaiz
+        5755VMZdZ/xYyobY5DHxqfGJlublyVued1RFIHOLOpJNPsAu3ZnEDOwynAOhpQSy3HkQ2Ko8s7OTX0Nz
+        ZhAsCDZ/UmGnDVfQsY7LJ9xi1TnXnWp0mywm34Qw5oQV67jhh4fYLSbK1o6VcEpkOl9rd8nGytx61+cD
+        ZzJxn/4FXRBFoSp0NQ56aCHPVR1FnstxJEQPbTv0kU9vxZA0/d9dBGrlli6KWuSDNSPrB+aP+Z3kLFjG
+        bYlaSl/JBHlGnCDXiH19XXhqeLq56a4im6NZ9VvQflGAwft5qDsZgGE6C+715WCwUYAz2S7oSrfFv/ZY
+        44tEc3oZGcAvSh2VXzohpcYMfkItOIbzWvku8pbkczYx/U//kz4O49GFjO1Pspeljty31jah0PpcDgkf
+        749G/9009N6JReeN7ThxzRt5LZvQUOuLnsYIXG2MxIVCdzQKrSCM0YdXvAZyj1ti7zEdpDRrYG+7ERKq
+        jOCTrAH7YNVe860KzqTBAplCiHcIF0YHA9mb0spzZgSl6dfmNDjj5OWdOP/tbnTfDMexr13QMmCP5gFb
+        ujrg2JALyjvskFrDR1iGAQL26CAi2xDJlabIP8VH2lEtJDbyEFu3BNEiFcSIVJHcqInYch14Jqljnbdy
+        DemxQ4oFwRIXf0zxjNUIFlZbovWKHz4f9EfTZQcc6V+POjE2hDVqv7KC6KIV6i99hKZLDvjsshMa+h1R
+        0m2JjOPGSP5sGRLqeYip/RCCw8rYUamEyApFhJcrIKJCGTureXBN4GGlvUwAabLeYFUXl+Jt32TN/pKO
+        zSjs4mPfcW0Un1mNyj4+KnvXooqo7F2D8l4zlPWsRunZVSg6bYLcDn2kHtVAUtMyJJJwbC1lXaOMqCol
+        ElREWJkCPimRR0gxbdEiWYQWySEgUxl8d4UzpMnOCrZLxFHM8tm14mlNjzPS27Wxp2050to1cOCkDokY
+        Ir/LCIXdxnQ1RM4pPWSc0KFSa1BplyLhCA9xoiXYeVgFUZRxRDkJl8ojtFhOLBpUKIPAAhlsz5cipBF8
+        UAkWngoPSHMhwZZB3JVz3OOW4zAFsLtFjVCHkK6MlFZ1pNDvlGba+1TipKal4mzjaY1jSFhQrUKlpjKL
+        syVREmaiQWJRaQQclMK2XEn45RDZEgjKU8Bad/mfSXMxwbbnaAW2RqshscyMnPKQ0KCKBGokJpTQQFCW
+        8UdUxSWOqfkQ0STKso18mS2V+RBl+xdRKfjnSMCXRH2zJOCTuRge6RJwipMD31OB/RFYQIgrwHpg+ip7
+        WeP1fipZ9qGq3ztFqcI1fgk8hUuwLeNDKpsKQgqUEZyvhMA8JQQdVEAYW1taU3GJ82XgmyEDz3RpeHwq
+        Dfc0KbgIJeEULw3bCBlsCJaFlZ881rjK3zO0lTrEM55nQZrsuGbVf3kGTCPYHp3LM5i3wnCj1GbTzbIx
+        Fu6KIktvpR4rb8UBSy/FQYp+0MJT8dt1vkqw8lGEpbciLLwUYO4mf8fMRW5ojNXOsn0mDtINutYSSeqr
+        F3jI8Oaw006amEe8Q4y+K+xCVTm7kCX0/eUpyMrCTiy2TVhArFvZpPkEaxz2qpUgpAjmcAz2W/JP2Dhb
+        YzbnA2IOwfwxv8w/S5gS57g/AGl5Af+OTEZOAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="barStaticItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAADJ0RVh0VGl0
+        bGUAQ3VzdG9tZXI7RW1wbG95ZWU7UGVyc29uO0NvbnRhY3Q7VXNlcjtDbGllbnR+ETboAAAJ8ElEQVRY
+        R8WWd1RU1xbGr0ls0agpdnqPjIJIr4qIAwhqpAQR6VWkhSKDVEFGCBa6gPQiA1ICCEaNj6IRQQ3qA6LE
+        FhOfRo1kJZqXqF/2GYKatUjWW4s/3l7rN3fmnnv2t/c++5w7HID/K+PefJ1GH21Cl2vdbsCdCDPmOqNN
+        +WcT1+7v223Zcz7F8k5vsgXOxK95fCrSuK8tULepwWu57eGtqlOqnFS4is3K4/p8nXFvjsGs3kuLq/fU
+        XNrordXSuk33eWeMMa4UbcXd03vx6FIxnt6uw8PzqbjZGoSL2dZoDVyGCkfFh6X2CtoldnJiH+P5HmPc
+        m2Mwq3NfvrjJX2fkSslWXMo0IrEs/HKrAb/cEOGn4Qr8dLUUIwO5eNATjYc9sbhW7YiOnWoodZR7cnCD
+        pOGEA6hxWZrSnWKB6w0e6Ihagvs9qXhw/gAe9O3FD+fScP/LFPynKw63W/0IX9xs8sKpYAWU2C/CXrP3
+        uiYcQMVmlWsXsm1wIdMC1c6SaIvQxPXGbbjZHILrTYG4JvLEYLE9Bg5twhWiJ9kQx/1lUWq3CHtWzXk2
+        4QCK7RSe9aatwWdBaijatBCiQGOUOcrgRMQKdMXp4XSiEU5F66I9VAMiNwUc9ZBGi5sUiunZZONZYifj
+        +R5j3JtjMMtbL/nfE5R1hZMMsjdK47fHg2gTumGv+fvIspyLPOt5yLGahzTT97BTdxa8VabhyMeLUWgz
+        H/H6M59MOIAMiwW36jyVSWQuCW8Ffr0O/NyLO+cK0S7chJzNSthnK48ifw3UClairyYKu1fOfp5jMRfR
+        2tO/JheTxvM9xrg3x2AmNH2vodhBmjJ8FzfOlANPh4GfOoCRL4AfPwdupeLFdSFGvtyOH7v88KgvFQLt
+        6chctwDhK6Y2TjiAWP2ZbunmHyDJZBae/zwIPLkKPDoxKv6IuJGMF9fi8eCkB+610fnwRTiitN9Gosls
+        BKq95TPhAIwlJk9J5S98nuMghWePz1MAFMTDtlEeNAFfx+PZvwW42+yAOw22uN3shRi92QjTnP5CZ/4b
+        MyccANmb9cErB9tijfDkDmX8ywAJHwV+aAa+LwOGovBrbyBui6xxo9oGgxWOSOPLYhdfjq3/ZOKfA/gf
+        7I0CV22XGn/e73fPZlIDXqYAjgH364HhPcCVcGoHF3xTaorhciucTrdAnN7s30KMJL1orjgAsZe/s/ii
+        lWJSKvhcQYvrX/jT3iBm5DvLZ12p9qfSn6Ls24Fv9gOXgoH+YHwnssJQrh6ullmgMVQLgUun7aM57xJv
+        EZN2ZBtykURElgEXnqHPfXKAoUdDZGMB7K/d9HcBsAymCcwXWjRHGlDZq6jz84GLAcQ2/NrtjuECQwzm
+        6GGoyIy6fxFsZCavpTls/VnwXFimARdGgqH79biQfXpccLouF/SpLht6FUBOo9M/BcBK+X7m+oVf3e1M
+        Ar4rw4v+T/BbtwvuivgYytHGUKEpulMMINCYdoGeXURMJcQBvBLV4ban6XABqdrcNqE2G3oVQG7TFu7W
+        yGExt0eqicOjD4wG8Cbxjq/WbHvRdl38fqMITy8l4V6dFW5VmNH6r8VA4Spkb1iMddKTP6Zn3yfE5Se4
+        0tN2XMlpW66oeyNX1LWB89utyfkka7Kh1yrQ5MTdfFw1ykglXStGH3gVwNs7AlYFp9jyUOWjhastsXh4
+        bg9uN7nh7D4zFDjIIsRwPjasFjffLOJlAxZ3f0TiG7hDneu5wk5rzitRg/NM0GBDHBd3yISLK1zJHaiz
+        5755VMZdZ/xYyobY5DHxqfGJlublyVued1RFIHOLOpJNPsAu3ZnEDOwynAOhpQSy3HkQ2Ko8s7OTX0Nz
+        ZhAsCDZ/UmGnDVfQsY7LJ9xi1TnXnWp0mywm34Qw5oQV67jhh4fYLSbK1o6VcEpkOl9rd8nGytx61+cD
+        ZzJxn/4FXRBFoSp0NQ56aCHPVR1FnstxJEQPbTv0kU9vxZA0/d9dBGrlli6KWuSDNSPrB+aP+Z3kLFjG
+        bYlaSl/JBHlGnCDXiH19XXhqeLq56a4im6NZ9VvQflGAwft5qDsZgGE6C+715WCwUYAz2S7oSrfFv/ZY
+        44tEc3oZGcAvSh2VXzohpcYMfkItOIbzWvku8pbkczYx/U//kz4O49GFjO1Pspeljty31jah0PpcDgkf
+        749G/9009N6JReeN7ThxzRt5LZvQUOuLnsYIXG2MxIVCdzQKrSCM0YdXvAZyj1ti7zEdpDRrYG+7ERKq
+        jOCTrAH7YNVe860KzqTBAplCiHcIF0YHA9mb0spzZgSl6dfmNDjj5OWdOP/tbnTfDMexr13QMmCP5gFb
+        ujrg2JALyjvskFrDR1iGAQL26CAi2xDJlabIP8VH2lEtJDbyEFu3BNEiFcSIVJHcqInYch14Jqljnbdy
+        DemxQ4oFwRIXf0zxjNUIFlZbovWKHz4f9EfTZQcc6V+POjE2hDVqv7KC6KIV6i99hKZLDvjsshMa+h1R
+        0m2JjOPGSP5sGRLqeYip/RCCw8rYUamEyApFhJcrIKJCGTureXBN4GGlvUwAabLeYFUXl+Jt32TN/pKO
+        zSjs4mPfcW0Un1mNyj4+KnvXooqo7F2D8l4zlPWsRunZVSg6bYLcDn2kHtVAUtMyJJJwbC1lXaOMqCol
+        ElREWJkCPimRR0gxbdEiWYQWySEgUxl8d4UzpMnOCrZLxFHM8tm14mlNjzPS27Wxp2050to1cOCkDokY
+        Ir/LCIXdxnQ1RM4pPWSc0KFSa1BplyLhCA9xoiXYeVgFUZRxRDkJl8ojtFhOLBpUKIPAAhlsz5cipBF8
+        UAkWngoPSHMhwZZB3JVz3OOW4zAFsLtFjVCHkK6MlFZ1pNDvlGba+1TipKal4mzjaY1jSFhQrUKlpjKL
+        syVREmaiQWJRaQQclMK2XEn45RDZEgjKU8Bad/mfSXMxwbbnaAW2RqshscyMnPKQ0KCKBGokJpTQQFCW
+        8UdUxSWOqfkQ0STKso18mS2V+RBl+xdRKfjnSMCXRH2zJOCTuRge6RJwipMD31OB/RFYQIgrwHpg+ip7
+        WeP1fipZ9qGq3ztFqcI1fgk8hUuwLeNDKpsKQgqUEZyvhMA8JQQdVEAYW1taU3GJ82XgmyEDz3RpeHwq
+        Dfc0KbgIJeEULw3bCBlsCJaFlZ881rjK3zO0lTrEM55nQZrsuGbVf3kGTCPYHp3LM5i3wnCj1GbTzbIx
+        Fu6KIktvpR4rb8UBSy/FQYp+0MJT8dt1vkqw8lGEpbciLLwUYO4mf8fMRW5ojNXOsn0mDtINutYSSeqr
+        F3jI8Oaw006amEe8Q4y+K+xCVTm7kCX0/eUpyMrCTiy2TVhArFvZpPkEaxz2qpUgpAjmcAz2W/JP2Dhb
+        YzbnA2IOwfwxv8w/S5gS57g/AGl5Af+OTEZOAAAAAElFTkSuQmCC
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj
index b0a2ab7..7e6f5e4 100644
--- a/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj
+++ b/WinformGeneralDeveloperFrame/WinformGeneralDeveloperFrame.csproj
@@ -149,6 +149,9 @@
     <Compile Include="Entity\productBOMdetailInfo.cs" />
     <Compile Include="Entity\productBOMInfo.cs" />
     <Compile Include="Entity\productInfo.cs" />
+    <Compile Include="Entity\productionBOMInfo.cs" />
+    <Compile Include="Entity\productionRequisitionDetailInfo.cs" />
+    <Compile Include="Entity\productionRequisitionInfo.cs" />
     <Compile Include="Entity\quotationdetailInfo.cs" />
     <Compile Include="Entity\quotationInfo.cs" />
     <Compile Include="Entity\requisitiondetailInfo.cs" />
@@ -223,6 +226,18 @@
     <Compile Include="Form\FrmproductBOM.designer.cs">
       <DependentUpon>FrmproductBOM.cs</DependentUpon>
     </Compile>
+    <Compile Include="Form\FrmproductionBOM.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form\FrmproductionBOM.designer.cs">
+      <DependentUpon>FrmproductionBOM.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Form\FrmproductionRequisition.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form\FrmproductionRequisition.designer.cs">
+      <DependentUpon>FrmproductionRequisition.cs</DependentUpon>
+    </Compile>
     <Compile Include="Form\Frmquotation.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -448,6 +463,12 @@
     <EmbeddedResource Include="Form\FrmproductBOM.resx">
       <DependentUpon>FrmproductBOM.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form\FrmproductionBOM.resx">
+      <DependentUpon>FrmproductionBOM.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Form\FrmproductionRequisition.resx">
+      <DependentUpon>FrmproductionRequisition.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Form\Frmquotation.resx">
       <DependentUpon>Frmquotation.cs</DependentUpon>
     </EmbeddedResource>
@@ -532,6 +553,9 @@
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="MainForm.zh-CN.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>