Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2022-06-20 da9eb5796450ac85f1338295504a1365a6c37515

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 WebAPI/Config/kdapi.config

New file
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
    <appSettings>
        <add key="DbId" value="5f9258a311401c"></add>
        <add key="UserName" value="Administrator"></add>
        <add key="PassWord" value="qaz!@#123"></add>
        <add key="KDApiUrl" value="http://localhost/K3Cloud/"></add>
    </appSettings>
</configuration>

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -1149,5 +1149,7 @@
        }
        #endregion


        
    }
}

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -97,6 +98,199 @@
            return objJsonResult;
        }

        #region å·¥åºæ±‡æŠ¥å…¥åº“
        /// <summary>
        /// èŽ·å–工序汇报入库单列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        [Route("Sc_ProcessMangement/Get_ProcessReportOverList")]
        [HttpGet]
        public object Get_ProcessReportOverList(string sWhere, string user)
        {
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc  order by hmainid desc", "h_v_MES_StationOutBillList_LastProc");
                }
                else
                {
                    string sql1 = "select * from h_v_MES_StationOutBillList_LastProc where 1 = 1 ";
                    string sql = sql1 + sWhere + "  order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList_LastProc");
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
               
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// å…¥åº“——生产汇报单
        /// </summary>
        /// <param name="InterID">工序汇报单主ID</param>
        /// <returns></returns>
        [Route("Sc_ProcessMangement/SaveICMOReportBill")]
        [HttpGet]
        public object SaveICMOReportBill(string InterID, string user, string BillNo, string OrganizationID)
        {
            try
            {
                //获取生产汇报单最大InterID和单据号
                Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
                string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
                //获取组织代码
                string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
                //根据工序汇报单主ID获取工序汇报入库单的数据
                DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
                DataRow dr = ds.Tables[0].Rows[0];
                //保存
                oCN.BeginTran();
                //生产汇报单主表
                oCN.RunProc("Insert Into Sc_ICMOReportBillMain   " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
                ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
                ",HGroupID,HDeptID,HDeptNumber" +
                ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
                ") " +
                " values('3711','3711'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
                ",DATENAME(YEAR,GETDATE()),0,'','" + dr["HEmpID"].ToString() + "','" + dr["操作员代码"].ToString() +
                "','" + dr["HGroupID"].ToString() + "',0,''" +
                ",'" + BillNo.ToString() + "'," + InterID.ToString() + ", 0,'3791'" +
                ") ");
                //生产汇报单子表
                oCN.RunProc("Insert into Sc_ICMOReportBillSub " +
                      " (HInterID,HEntryID,HMaterID,HMaterNumber" +
                      ",HQty,HUnitID,HUnitNumber,HTimes,HSourceID" +
                      ",HQtyMust,HWorkerID,HWorkerNumber,HBadCount,HWasterQty," +
                      "HCloseMan,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
                      ",HICMOInterID,HICMOBillNo,HBarCode" +
                      ") values("
                      + HInterID.ToString() + ",1," + dr["HMaterID"].ToString() + ",'" + dr["产品代码"].ToString() + "'" +
                      "," + dr["合格数量"].ToString() + ",0,'',0,0" +
                      "," + dr["接收数量"].ToString() + "," + dr["HEmpID"].ToString() + ",'" + dr["操作员代码"].ToString() + "'," + dr["不良数量"].ToString() + "," + dr["报废数量"].ToString() +
                      ",'',0,''" +
                      "," + InterID.ToString() + ",0,'" + BillNo.ToString() + "','3791',0,0" +
                      ",0,0,''" +
                      "," + dr["HICMOInterID"].ToString() + ",'" + dr["任务单"].ToString() + "',''" +
                      ") ");
                //同步金蝶
                //访问金蝶
                var loginRet = InvokeHelper.Login();
                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                if (isSuccess == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "操作失败,金蝶账号登录异常。" + loginRet;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //根据任务单查找到金蝶的生产订单
                DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERP_StationOutBillList_LastProc where HICMOInterID=" + dr["HICMOInterID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
                DataRow dr1 = ds1.Tables[0].Rows[0];

                JObject model = new JObject();
                model.Add("FBillType", "50fa7c2eda7947b89fab5431bf25d48e"); //单据类型1
                model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //生产组织1
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期1
                JArray Fentity = new JArray();
                foreach (DataRow item in ds.Tables[0].Rows)
                {
                    JObject FentityModel = new JObject();
                    FentityModel.Add("FReportType", "BD_OwnerOrg");//生产汇报类型
                    FentityModel.Add("FTimeUnitId", "1");//时间单位
                    FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); //  ç”Ÿäº§è½¦é—´
                    FentityModel.Add("FStandHourUnitId", "3600"); // å•ä½æ ‡å‡†å·¥æ—¶å•ä½ 
                    FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = dr1["FMaterialNUM"].ToString() }); // ç‰©æ–™ç¼–码 
                    FentityModel.Add("FMoEntrySeq", dr1["HICMOEntryID"].ToString());//生产订单行号
                    FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//生产订单内码
                    FentityModel.Add("FFinishQty", item["接收数量"].ToString());//完成数量1
                    FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1
                    FentityModel.Add("FStockInOrgId ", OrganizationNUM);// å…¥åº“组织 
                    FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // ä»“库 
                    FentityModel.Add("FSrcBillType", "PRD_MO");//  æºå•ç±»åž‹ 
                    FentityModel.Add("FSrcBillNo", item["任务单"].ToString());//  æºå•ç¼–号 
                    FentityModel.Add("FSrcInterId", dr1["HICMOInterID"].ToString());//  æºå•å†…码 
                    FentityModel.Add("FSrcEntryId", dr1["HICMOEntryID"].ToString());//  æºå•åˆ†å½•å†…码

                    //JArray Fentity2 = new JArray();
                    //JObject FentityModel2 = new JObject();
                    //FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill");
                    //FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry");
                    //FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString());
                    //FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString());
                    //Fentity2.Add(FentityModel2);
                    //FentityModel.Add("FDetailEntity_Link", Fentity2);
                    //Fentity.Add(FentityModel);
                }
                model.Add("FDetailEntity", Fentity); //明细信息                       
                JObject jsonRoot = new JObject()
                {
                    ["Creator"] = "",
                    ["NeedUpDateFields"] = new JArray(),
                    ["NeedReturnFields"] = new JArray(),
                    ["IsDeleteEntry"] = "false",
                    ["SubSystemId"] = "",
                    ["IsVerifyBaseDataField"] = "false",
                    //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
                    ["Model"] = model
                };
                string result = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));
                //判断审核是否成功
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"工序汇报入库单同步金蝶云失败！单号:{dr["单据号"].ToString()}" + result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.Commit();
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        /// <summary>
        /// è¿”回生产汇报单列表
        ///参数：string sql。

 WebAPI/Controllers/²©ÈÕ×Ô¶¯É¨ÂëÏß/ScanlineAPIController.cs

@@ -108,9 +108,9 @@
                bool IsBarCodePack = oBill.IsBarCodePack(list.packagebarcode);
                if (IsBarCodePack == false)
                {
                    LogService.Write("箱码已存在,不能重复绑定！");
                    LogService.Write($"箱码:{list.packagebarcode}已存在,不能重复绑定！");
                    objJsonResult.status = -1;
                    objJsonResult.msg = "箱码已存在,不能重复绑定！";
                    objJsonResult.msg = $"箱码:{list.packagebarcode}已存在,不能重复绑定！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -159,12 +159,13 @@
                for (int i = 0; i < list.barcodes.Count; i++)
                {
                    //判断条码是否存在
                    bool IsBarCode = oBill.IsBarCodePack(list.barcodes[i].barcode);
                    bool IsBarCode = oBill.IsBarCode(list.barcodes[i].barcode);
                    if (IsBarCodePack == false)
                    {
                        LogService.Write("条码已存在,不能重复绑定！");
                        DataTable dt = oCN.RunProcReturn("Select HBarCode_Pack from Sc_PackUnionBillSub Where  HBarCode='" + list.barcodes[i].barcode + "'", "Sc_PackUnionBillSub").Tables[0];
                       LogService.Write($"条码：{list.barcodes[i].barcode}，已存在箱码：{dt.Rows[0]["HBarCode_Pack"]}中，本次绑定箱码为：{list.packagebarcode},绑定失败,不能重复绑定！");
                        objJsonResult.status = -1;
                        objJsonResult.msg = "条码已存在,不能重复绑定！";
                        objJsonResult.msg = $"条码：{list.barcodes[i].barcode}，已存在箱码：{dt.Rows[0]["HBarCode_Pack"]}中，本次绑定箱码为：{list.packagebarcode},绑定失败,不能重复绑定！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

 WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESBeginStepWorkBillController.cs

@@ -1626,8 +1626,8 @@
                    string result1 = string.Empty;
                    string result2 = string.Empty;

                    //判断当前用生产料清单单状态——已创建则先提交再审核、以提交则只审核
                    if (Ds.Tables[0].Rows[0][2].ToString() == "A")
                    //判断当前用生产料清单单状态——已创建则先提交再审核、以提交则只审核--A:创建，B:提交,C:审核,D:重新审核
                    if (Ds.Tables[0].Rows[0][2].ToString() == "A"|| Ds.Tables[0].Rows[0][2].ToString() == "D")
                    {
                        result1 = InvokeHelper.Submit("PRD_PPBOM", JsonConvert.SerializeObject(json));
                        result2 = InvokeHelper.Audit("PRD_PPBOM", JsonConvert.SerializeObject(json));
@@ -1636,6 +1636,7 @@
                    {
                        result2 = InvokeHelper.Audit("PRD_PPBOM", JsonConvert.SerializeObject(json));
                    }
                    LogService.Write("result2=" + result2);
                    //判断审核是否成功
                    if (JObject.Parse(result2)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    {

 WebAPI/InvokeHelper.cs

@@ -4,29 +4,28 @@
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json;
using WebAPI.Utility;

namespace WebAPI
{
    public static class InvokeHelper
    {
        //private static string CloudUrl = "http://localhost/k3cloud/";//K/3 Cloud ä¸šåŠ¡ç«™ç‚¹åœ°å€
        //private static string CloudUrl = "http://60.190.4.42:9002/k3cloud/";//K/3 Cloud ä¸šåŠ¡ç«™ç‚¹åœ°å€
        private static string CloudUrl = "http://47.96.97.237/k3cloud/";//K/3 Cloud ä¸šåŠ¡ç«™ç‚¹åœ°å€
        //private static string CloudUrl = "http://60.190.4.42:9002/K3CLOUD/";//夏宝
        //private static string CloudUrl = "http://124.70.129.242/k3cloud/";//雅琪诺

        private static string CloudUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "KDApiUrl");//K/3 Cloud ä¸šåŠ¡ç«™ç‚¹åœ°å€
        /// <summary>
        /// ç™»é™†
        /// </summary>
        public static string Login()
        {
            var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
            var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
            var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
            HttpClient httpClient = new HttpClient();
            httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");

            List<object> Parameters = new List<object>();
            Parameters.Add("6204a70eba35fc");//账套标示
            Parameters.Add("Administrator");//用户名
            Parameters.Add("qaz!@#123");//密码
            Parameters.Add(dbId);//账套标示
            Parameters.Add(useName);//用户名
            Parameters.Add(pwd);//密码
            Parameters.Add(2052);//2052代表中文
            httpClient.Content = JsonConvert.SerializeObject(Parameters);


 WebAPI/Utility/Util.cs

New file
@@ -0,0 +1,124 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.Serialization;

namespace WebAPI.Utility
{
    public class Util
    {
        public static string GetObjectType(object obj)
        {
            var isType = false;
            isType = obj.GetType() == typeof(string);
            if (isType)
            {
                return "string";
            }

            isType = obj.GetType() == typeof(double);
            if (isType)
            {
                return "double";
            }

            isType = obj.GetType() == typeof(long);
            if (isType)
            {
                return "long";
            }

            isType = obj.GetType() == typeof(DateTime);
            if (isType)
            {
                return "date";
            }

            isType = obj.GetType() == typeof(int);
            if (isType)
            {
                return "int";
            }

            isType = obj.GetType() == typeof(decimal);
            if (isType)
            {
                return "decimal";
            }

            return "string";
        }

        public static JObject JsonVerify(string json)
        {
            if (string.IsNullOrEmpty(json))
            {
                throw new Exception("参数不能为空");
            }
            try
            {
                return JObject.Parse(json.ToString().Replace("\r", "").Replace("\n", "").Replace("\t", ""));
            }
            catch (Exception)
            {
                throw;
            }
        }

        //public static T DeepCopy<T>(T obj)
        //{
        //    object retval;
        //    using (MemoryStream ms = new MemoryStream())
        //    {
        //        XmlSerializer xml = new XmlSerializer(typeof(T));
        //        xml.Serialize(ms, obj);
        //        ms.Seek(0, SeekOrigin.Begin);
        //        retval = xml.Deserialize(ms);
        //        ms.Close();
        //    }
        //    return (T)retval;
        //}

        public static String GetConfigKey(String configPath, String key)
        {
            Configuration ConfigurationInstance = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap()
            {
                ExeConfigFilename = configPath
            }, ConfigurationUserLevel.None);


            if (ConfigurationInstance.AppSettings.Settings[key] != null)
                return ConfigurationInstance.AppSettings.Settings[key].Value;
            else

                return string.Empty;
        }

        public static bool SetConfigKey(String configPath, String key, String vls)
        {
            try
            {
                Configuration ConfigurationInstance = ConfigurationManager.OpenMappedExeConfiguration(new ExeConfigurationFileMap()
                {
                    ExeConfigFilename = configPath
                }, ConfigurationUserLevel.None);

                if (ConfigurationInstance.AppSettings.Settings[key] != null)
                    ConfigurationInstance.AppSettings.Settings[key].Value = vls;
                else
                    ConfigurationInstance.AppSettings.Settings.Add(key, vls);
                ConfigurationInstance.Save(ConfigurationSaveMode.Modified);
                ConfigurationManager.RefreshSection("appSettings");
                return true;
            }
            catch
            {
                return false;
            }
        }
    }
}

 WebAPI/WebAPI.csproj

@@ -233,6 +233,7 @@
    <Content Include="Index.html" />
    <Content Include="Views\Scripts\bootstrap.js" />
    <Content Include="Views\Scripts\bootstrap.min.js" />
    <Content Include="Config\kdapi.config" />
    <None Include="Properties\Settings.settings">
      <Generator>SettingsSingleFileGenerator</Generator>
      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -752,6 +753,7 @@
    <Compile Include="Service\ProcessDal.cs" />
    <Compile Include="Service\YqnDal.cs" />
    <Compile Include="Service\YqnQbService.cs" />
    <Compile Include="Utility\Util.cs" />
    <Compile Include="Web References\WebS\Reference.cs">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationInBill.cs

@@ -138,6 +138,7 @@
        //取消按钮
        private void cmdCancel_Click(object sender, EventArgs e)
        {
            ClsPub.SaveGridView(grdSub, Name+"grdSub", ClsPub.AppPath);//设置列宽
            this.Close();
        }
        //控件位置
@@ -414,7 +415,8 @@
            txtHProcNo.Enabled = false;

            //加载 é…ä»¶ç»‘定清单

            HInterID = BillOld.omodel.HInterID;
            DisplaySub();



@@ -1510,9 +1512,13 @@
                DataSet Dsplay;
                Dsplay = oCn.RunProcReturn("exec h_p_MES_StationInBillSub_BindDisplay   " + HInterID.ToString() + "  ", "h_p_MES_StationInBillSub_BindDisplay");
                //写入信息
                if (Dsplay == null || Dsplay.Tables[0].Rows.Count == 0)
                if (Dsplay == null )
                {
                    MessageBox.Show("刷新失败！");
                    return;
                }
                else if(Dsplay.Tables[0].Rows.Count == 0)
                {
                    return;
                }
                else
@@ -1536,5 +1542,25 @@
                MessageBox.Show(e.Message + "DisplaySub");
            }
        }

        private void cmdDelLine_Click(object sender, EventArgs e)
        {
            try
            {
                //根据选择的条形码 æ¥åˆ é™¤
                if (grdSub.CurrentRow == null)
                    return;
                string sBarCode = DBUtility.ClsPub.isStrNull(grdSub.Rows[grdSub.CurrentRow.Index].Cells[Fun_GetCol("条形码")].Value);
                SQLHelper.ClsCN oCn = new ClsCN();
                oCn.RunProc(" delete from Sc_StationInBillSub_BindBarCodeTemp " + 
                    "Where  HInterID = "+ HInterID.ToString() +" and HBarCode = '"+ sBarCode + "'");
                DisplaySub();
            }
            catch (Exception e1)
            {
                MessageBox.Show("删除行失败！"+e1.Message);
            }

        }
    }
}

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationInBill.designer.cs

@@ -103,6 +103,8 @@
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.grdCardList = new System.Windows.Forms.DataGridView();
            this.panel2 = new System.Windows.Forms.Panel();
            this.txtHBarCode_Mater = new System.Windows.Forms.TextBox();
            this.label25 = new System.Windows.Forms.Label();
            this.txtHBarCode = new System.Windows.Forms.TextBox();
            this.label19 = new System.Windows.Forms.Label();
            this.timer1 = new System.Windows.Forms.Timer(this.components);
@@ -113,8 +115,7 @@
            this.cmdHDelBill = new System.Windows.Forms.Button();
            this.cmdXG = new System.Windows.Forms.Button();
            this.cmdAddNew = new System.Windows.Forms.Button();
            this.txtHBarCode_Mater = new System.Windows.Forms.TextBox();
            this.label25 = new System.Windows.Forms.Label();
            this.cmdDelLine = new System.Windows.Forms.Button();
            this.gbUp.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
            this.tabControl1.SuspendLayout();
@@ -132,7 +133,7 @@
            this.cmdHMaterID.Enabled = false;
            this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
            this.cmdHMaterID.Location = new System.Drawing.Point(949, 311);
            this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHMaterID.Name = "cmdHMaterID";
            this.cmdHMaterID.Size = new System.Drawing.Size(40, 40);
            this.cmdHMaterID.TabIndex = 86;
@@ -147,7 +148,7 @@
            this.txtHMaterID.ForeColor = System.Drawing.Color.Green;
            this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterID.Location = new System.Drawing.Point(133, 179);
            this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHMaterID.Multiline = true;
            this.txtHMaterID.Name = "txtHMaterID";
            this.txtHMaterID.ReadOnly = true;
@@ -200,7 +201,7 @@
            this.txtHICMOBillNo.ForeColor = System.Drawing.Color.Green;
            this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHICMOBillNo.Location = new System.Drawing.Point(653, 267);
            this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHICMOBillNo.Multiline = true;
            this.txtHICMOBillNo.Name = "txtHICMOBillNo";
            this.txtHICMOBillNo.ReadOnly = true;
@@ -213,7 +214,7 @@
            this.txtHProcExchBillNo.ForeColor = System.Drawing.Color.Green;
            this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcExchBillNo.Location = new System.Drawing.Point(133, 5);
            this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHProcExchBillNo.Multiline = true;
            this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
            this.txtHProcExchBillNo.ReadOnly = true;
@@ -242,7 +243,7 @@
            this.txtHMaterModel.ForeColor = System.Drawing.Color.Green;
            this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterModel.Location = new System.Drawing.Point(653, 92);
            this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4);
            this.txtHMaterModel.Multiline = true;
            this.txtHMaterModel.Name = "txtHMaterModel";
            this.txtHMaterModel.ReadOnly = true;
@@ -268,7 +269,7 @@
            this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
            this.cmdHEmpID.Location = new System.Drawing.Point(949, 180);
            this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHEmpID.Name = "cmdHEmpID";
            this.cmdHEmpID.Size = new System.Drawing.Size(40, 40);
            this.cmdHEmpID.TabIndex = 93;
@@ -281,7 +282,7 @@
            this.txtHEmpID.ForeColor = System.Drawing.Color.Green;
            this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHEmpID.Location = new System.Drawing.Point(795, 180);
            this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHEmpID.Name = "txtHEmpID";
            this.txtHEmpID.ReadOnly = true;
            this.txtHEmpID.Size = new System.Drawing.Size(151, 38);
@@ -307,7 +308,7 @@
            this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
            this.cmdHSourceID.Location = new System.Drawing.Point(423, 352);
            this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID.Name = "cmdHSourceID";
            this.cmdHSourceID.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID.TabIndex = 96;
@@ -320,7 +321,7 @@
            this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID.Location = new System.Drawing.Point(133, 352);
            this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID.Name = "txtHSourceID";
            this.txtHSourceID.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID.TabIndex = 95;
@@ -346,7 +347,7 @@
            this.txtHICMOQty.ForeColor = System.Drawing.Color.Green;
            this.txtHICMOQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHICMOQty.Location = new System.Drawing.Point(653, 311);
            this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHICMOQty.Multiline = true;
            this.txtHICMOQty.Name = "txtHICMOQty";
            this.txtHICMOQty.ReadOnly = true;
@@ -373,7 +374,7 @@
            this.txtHPlanQty.ForeColor = System.Drawing.Color.Green;
            this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHPlanQty.Location = new System.Drawing.Point(653, 50);
            this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHPlanQty.Multiline = true;
            this.txtHPlanQty.Name = "txtHPlanQty";
            this.txtHPlanQty.ReadOnly = true;
@@ -399,7 +400,7 @@
            this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
            this.cmdHGroupID.Location = new System.Drawing.Point(423, 310);
            this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHGroupID.Name = "cmdHGroupID";
            this.cmdHGroupID.Size = new System.Drawing.Size(40, 40);
            this.cmdHGroupID.TabIndex = 103;
@@ -412,7 +413,7 @@
            this.txtHGroupID.ForeColor = System.Drawing.Color.Green;
            this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHGroupID.Location = new System.Drawing.Point(133, 310);
            this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHGroupID.Name = "txtHGroupID";
            this.txtHGroupID.Size = new System.Drawing.Size(133, 38);
            this.txtHGroupID.TabIndex = 102;
@@ -438,7 +439,7 @@
            this.cmdHProcID.Enabled = false;
            this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
            this.cmdHProcID.Location = new System.Drawing.Point(423, 91);
            this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHProcID.Name = "cmdHProcID";
            this.cmdHProcID.Size = new System.Drawing.Size(40, 40);
            this.cmdHProcID.TabIndex = 106;
@@ -452,7 +453,7 @@
            this.txtHProcID.ForeColor = System.Drawing.Color.Green;
            this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcID.Location = new System.Drawing.Point(133, 91);
            this.txtHProcID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHProcID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHProcID.Multiline = true;
            this.txtHProcID.Name = "txtHProcID";
            this.txtHProcID.ReadOnly = true;
@@ -482,7 +483,7 @@
            this.txtHMaterName.ForeColor = System.Drawing.Color.Green;
            this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterName.Location = new System.Drawing.Point(133, 222);
            this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHMaterName.Multiline = true;
            this.txtHMaterName.Name = "txtHMaterName";
            this.txtHMaterName.ReadOnly = true;
@@ -506,7 +507,7 @@
            // cmdOK
            // 
            this.cmdOK.Location = new System.Drawing.Point(388, 12);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(4);
            this.cmdOK.Name = "cmdOK";
            this.cmdOK.Size = new System.Drawing.Size(113, 52);
            this.cmdOK.TabIndex = 109;
@@ -517,7 +518,7 @@
            // cmdCancel
            // 
            this.cmdCancel.Location = new System.Drawing.Point(511, 12);
            this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdCancel.Margin = new System.Windows.Forms.Padding(4);
            this.cmdCancel.Name = "cmdCancel";
            this.cmdCancel.Size = new System.Drawing.Size(113, 52);
            this.cmdCancel.TabIndex = 110;
@@ -547,9 +548,9 @@
            this.gbUp.Controls.Add(this.panel2);
            this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gbUp.Location = new System.Drawing.Point(0, 0);
            this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Margin = new System.Windows.Forms.Padding(4);
            this.gbUp.Name = "gbUp";
            this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Padding = new System.Windows.Forms.Padding(4);
            this.gbUp.Size = new System.Drawing.Size(1381, 736);
            this.gbUp.TabIndex = 114;
            this.gbUp.TabStop = false;
@@ -639,7 +640,7 @@
            this.txtHGroupName.ForeColor = System.Drawing.Color.Green;
            this.txtHGroupName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHGroupName.Location = new System.Drawing.Point(269, 310);
            this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHGroupName.Name = "txtHGroupName";
            this.txtHGroupName.ReadOnly = true;
            this.txtHGroupName.Size = new System.Drawing.Size(151, 38);
@@ -652,7 +653,7 @@
            this.txtHEmpNumber.ForeColor = System.Drawing.Color.Green;
            this.txtHEmpNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHEmpNumber.Location = new System.Drawing.Point(653, 180);
            this.txtHEmpNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHEmpNumber.Margin = new System.Windows.Forms.Padding(4);
            this.txtHEmpNumber.Name = "txtHEmpNumber";
            this.txtHEmpNumber.Size = new System.Drawing.Size(139, 38);
            this.txtHEmpNumber.TabIndex = 149;
@@ -666,7 +667,7 @@
            this.txtHSourceName.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName.Location = new System.Drawing.Point(269, 352);
            this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName.Name = "txtHSourceName";
            this.txtHSourceName.ReadOnly = true;
            this.txtHSourceName.Size = new System.Drawing.Size(151, 38);
@@ -680,7 +681,7 @@
            this.txtHOrderProcNO.ForeColor = System.Drawing.Color.Green;
            this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHOrderProcNO.Location = new System.Drawing.Point(653, 223);
            this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
            this.txtHOrderProcNO.Multiline = true;
            this.txtHOrderProcNO.Name = "txtHOrderProcNO";
            this.txtHOrderProcNO.ReadOnly = true;
@@ -720,7 +721,7 @@
            this.txtHProcNo.ForeColor = System.Drawing.Color.Green;
            this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcNo.Location = new System.Drawing.Point(133, 49);
            this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHProcNo.Name = "txtHProcNo";
            this.txtHProcNo.Size = new System.Drawing.Size(328, 38);
            this.txtHProcNo.TabIndex = 146;
@@ -746,7 +747,7 @@
            this.txtHQty.ForeColor = System.Drawing.Color.Green;
            this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHQty.Location = new System.Drawing.Point(653, 136);
            this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHQty.Name = "txtHQty";
            this.txtHQty.Size = new System.Drawing.Size(292, 38);
            this.txtHQty.TabIndex = 117;
@@ -761,7 +762,7 @@
            this.cmdHCenterID.Enabled = false;
            this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
            this.cmdHCenterID.Location = new System.Drawing.Point(423, 135);
            this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHCenterID.Name = "cmdHCenterID";
            this.cmdHCenterID.Size = new System.Drawing.Size(40, 40);
            this.cmdHCenterID.TabIndex = 144;
@@ -801,7 +802,7 @@
            this.txtHBillNo.ForeColor = System.Drawing.Color.Green;
            this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBillNo.Location = new System.Drawing.Point(653, 6);
            this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBillNo.Multiline = true;
            this.txtHBillNo.Name = "txtHBillNo";
            this.txtHBillNo.ReadOnly = true;
@@ -815,7 +816,7 @@
            this.txtHCenterID.ForeColor = System.Drawing.Color.Green;
            this.txtHCenterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHCenterID.Location = new System.Drawing.Point(133, 135);
            this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHCenterID.Multiline = true;
            this.txtHCenterID.Name = "txtHCenterID";
            this.txtHCenterID.ReadOnly = true;
@@ -830,7 +831,7 @@
            this.txtHStationInTime.ForeColor = System.Drawing.Color.Green;
            this.txtHStationInTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHStationInTime.Location = new System.Drawing.Point(133, 266);
            this.txtHStationInTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHStationInTime.Margin = new System.Windows.Forms.Padding(4);
            this.txtHStationInTime.Multiline = true;
            this.txtHStationInTime.Name = "txtHStationInTime";
            this.txtHStationInTime.ReadOnly = true;
@@ -864,7 +865,7 @@
            this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage2.Size = new System.Drawing.Size(994, 446);
            this.tabPage2.Size = new System.Drawing.Size(994, 403);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "其他信息";
            // 
@@ -875,7 +876,7 @@
            this.txtHSourceName5.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName5.Location = new System.Drawing.Point(287, 186);
            this.txtHSourceName5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceName5.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName5.Name = "txtHSourceName5";
            this.txtHSourceName5.ReadOnly = true;
            this.txtHSourceName5.Size = new System.Drawing.Size(151, 38);
@@ -888,7 +889,7 @@
            this.txtHSourceID5.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID5.Location = new System.Drawing.Point(151, 186);
            this.txtHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceID5.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID5.Name = "txtHSourceID5";
            this.txtHSourceID5.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID5.TabIndex = 135;
@@ -899,7 +900,7 @@
            this.cmdHSourceID5.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID5.Image")));
            this.cmdHSourceID5.Location = new System.Drawing.Point(439, 186);
            this.cmdHSourceID5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHSourceID5.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID5.Name = "cmdHSourceID5";
            this.cmdHSourceID5.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID5.TabIndex = 136;
@@ -913,7 +914,7 @@
            this.txtHSourceName4.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName4.Location = new System.Drawing.Point(287, 138);
            this.txtHSourceName4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceName4.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName4.Name = "txtHSourceName4";
            this.txtHSourceName4.ReadOnly = true;
            this.txtHSourceName4.Size = new System.Drawing.Size(151, 38);
@@ -926,7 +927,7 @@
            this.txtHSourceID4.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID4.Location = new System.Drawing.Point(151, 138);
            this.txtHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceID4.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID4.Name = "txtHSourceID4";
            this.txtHSourceID4.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID4.TabIndex = 131;
@@ -937,7 +938,7 @@
            this.cmdHSourceID4.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID4.Image")));
            this.cmdHSourceID4.Location = new System.Drawing.Point(439, 138);
            this.cmdHSourceID4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHSourceID4.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID4.Name = "cmdHSourceID4";
            this.cmdHSourceID4.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID4.TabIndex = 132;
@@ -951,7 +952,7 @@
            this.txtHSourceName3.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName3.Location = new System.Drawing.Point(287, 88);
            this.txtHSourceName3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceName3.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName3.Name = "txtHSourceName3";
            this.txtHSourceName3.ReadOnly = true;
            this.txtHSourceName3.Size = new System.Drawing.Size(151, 38);
@@ -964,7 +965,7 @@
            this.txtHSourceID3.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID3.Location = new System.Drawing.Point(151, 88);
            this.txtHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceID3.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID3.Name = "txtHSourceID3";
            this.txtHSourceID3.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID3.TabIndex = 127;
@@ -975,7 +976,7 @@
            this.cmdHSourceID3.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID3.Image")));
            this.cmdHSourceID3.Location = new System.Drawing.Point(439, 88);
            this.cmdHSourceID3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHSourceID3.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID3.Name = "cmdHSourceID3";
            this.cmdHSourceID3.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID3.TabIndex = 128;
@@ -989,7 +990,7 @@
            this.txtHSourceName2.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName2.Location = new System.Drawing.Point(287, 40);
            this.txtHSourceName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceName2.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName2.Name = "txtHSourceName2";
            this.txtHSourceName2.ReadOnly = true;
            this.txtHSourceName2.Size = new System.Drawing.Size(151, 38);
@@ -1002,7 +1003,7 @@
            this.txtHSourceID2.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID2.Location = new System.Drawing.Point(151, 40);
            this.txtHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHSourceID2.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID2.Name = "txtHSourceID2";
            this.txtHSourceID2.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID2.TabIndex = 123;
@@ -1013,7 +1014,7 @@
            this.cmdHSourceID2.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID2.Image")));
            this.cmdHSourceID2.Location = new System.Drawing.Point(439, 40);
            this.cmdHSourceID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHSourceID2.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID2.Name = "cmdHSourceID2";
            this.cmdHSourceID2.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID2.TabIndex = 124;
@@ -1027,7 +1028,7 @@
            this.txtHPieceQty.ForeColor = System.Drawing.Color.Green;
            this.txtHPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHPieceQty.Location = new System.Drawing.Point(719, 38);
            this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHPieceQty.Multiline = true;
            this.txtHPieceQty.Name = "txtHPieceQty";
            this.txtHPieceQty.Size = new System.Drawing.Size(249, 40);
@@ -1151,125 +1152,6 @@
            this.panel2.Size = new System.Drawing.Size(1373, 55);
            this.panel2.TabIndex = 151;
            // 
            // txtHBarCode
            // 
            this.txtHBarCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
            this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode.Location = new System.Drawing.Point(248, 8);
            this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.txtHBarCode.Multiline = true;
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(279, 40);
            this.txtHBarCode.TabIndex = 113;
            this.txtHBarCode.Tag = "0";
            this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
            // 
            // label19
            // 
            this.label19.AutoSize = true;
            this.label19.BackColor = System.Drawing.Color.Gray;
            this.label19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label19.ForeColor = System.Drawing.Color.Yellow;
            this.label19.Location = new System.Drawing.Point(160, 12);
            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(92, 27);
            this.label19.TabIndex = 112;
            this.label19.Text = "流转卡：";
            // 
            // timer1
            // 
            this.timer1.Enabled = true;
            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
            // 
            // panel1
            // 
            this.panel1.Controls.Add(this.cmdXZ);
            this.panel1.Controls.Add(this.button2);
            this.panel1.Controls.Add(this.button1);
            this.panel1.Controls.Add(this.cmdHDelBill);
            this.panel1.Controls.Add(this.cmdXG);
            this.panel1.Controls.Add(this.cmdAddNew);
            this.panel1.Controls.Add(this.cmdCancel);
            this.panel1.Controls.Add(this.cmdOK);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel1.Location = new System.Drawing.Point(0, 736);
            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1381, 81);
            this.panel1.TabIndex = 115;
            // 
            // cmdXZ
            // 
            this.cmdXZ.Location = new System.Drawing.Point(20, 12);
            this.cmdXZ.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdXZ.Name = "cmdXZ";
            this.cmdXZ.Size = new System.Drawing.Size(113, 52);
            this.cmdXZ.TabIndex = 124;
            this.cmdXZ.Text = "新    å¢ž";
            this.cmdXZ.UseVisualStyleBackColor = true;
            this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
            // 
            // button2
            // 
            this.button2.Enabled = false;
            this.button2.Location = new System.Drawing.Point(756, 12);
            this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.button2.Name = "button2";
            this.button2.Size = new System.Drawing.Size(113, 52);
            this.button2.TabIndex = 123;
            this.button2.Text = "反审核";
            this.button2.UseVisualStyleBackColor = true;
            this.button2.Click += new System.EventHandler(this.button2_Click);
            // 
            // button1
            // 
            this.button1.Enabled = false;
            this.button1.Location = new System.Drawing.Point(633, 12);
            this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(113, 52);
            this.button1.TabIndex = 122;
            this.button1.Text = "审  æ ¸";
            this.button1.UseVisualStyleBackColor = true;
            this.button1.Click += new System.EventHandler(this.button1_Click);
            // 
            // cmdHDelBill
            // 
            this.cmdHDelBill.Location = new System.Drawing.Point(265, 12);
            this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHDelBill.Name = "cmdHDelBill";
            this.cmdHDelBill.Size = new System.Drawing.Size(113, 52);
            this.cmdHDelBill.TabIndex = 121;
            this.cmdHDelBill.Text = "删除领料单";
            this.cmdHDelBill.UseVisualStyleBackColor = true;
            this.cmdHDelBill.Visible = false;
            this.cmdHDelBill.Click += new System.EventHandler(this.cmdHDelBill_Click);
            // 
            // cmdXG
            // 
            this.cmdXG.Location = new System.Drawing.Point(143, 12);
            this.cmdXG.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdXG.Name = "cmdXG";
            this.cmdXG.Size = new System.Drawing.Size(113, 52);
            this.cmdXG.TabIndex = 120;
            this.cmdXG.Text = "ä¿®    æ”¹";
            this.cmdXG.UseVisualStyleBackColor = true;
            this.cmdXG.Click += new System.EventHandler(this.cmdXG_Click);
            // 
            // cmdAddNew
            // 
            this.cmdAddNew.Location = new System.Drawing.Point(879, 12);
            this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdAddNew.Name = "cmdAddNew";
            this.cmdAddNew.Size = new System.Drawing.Size(113, 52);
            this.cmdAddNew.TabIndex = 114;
            this.cmdAddNew.Text = "清    ç©º";
            this.cmdAddNew.UseVisualStyleBackColor = true;
            this.cmdAddNew.Visible = false;
            this.cmdAddNew.Click += new System.EventHandler(this.cmdAddNew_Click);
            // 
            // txtHBarCode_Mater
            // 
            this.txtHBarCode_Mater.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -1297,6 +1179,137 @@
            this.label25.TabIndex = 114;
            this.label25.Text = "配件条形码：";
            // 
            // txtHBarCode
            // 
            this.txtHBarCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
            this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode.Location = new System.Drawing.Point(248, 8);
            this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBarCode.Multiline = true;
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(279, 40);
            this.txtHBarCode.TabIndex = 113;
            this.txtHBarCode.Tag = "0";
            this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
            // 
            // label19
            // 
            this.label19.AutoSize = true;
            this.label19.BackColor = System.Drawing.Color.Gray;
            this.label19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label19.ForeColor = System.Drawing.Color.Yellow;
            this.label19.Location = new System.Drawing.Point(160, 12);
            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(92, 27);
            this.label19.TabIndex = 112;
            this.label19.Text = "流转卡：";
            // 
            // timer1
            // 
            this.timer1.Enabled = true;
            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
            // 
            // panel1
            // 
            this.panel1.Controls.Add(this.cmdDelLine);
            this.panel1.Controls.Add(this.cmdXZ);
            this.panel1.Controls.Add(this.button2);
            this.panel1.Controls.Add(this.button1);
            this.panel1.Controls.Add(this.cmdHDelBill);
            this.panel1.Controls.Add(this.cmdXG);
            this.panel1.Controls.Add(this.cmdAddNew);
            this.panel1.Controls.Add(this.cmdCancel);
            this.panel1.Controls.Add(this.cmdOK);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel1.Location = new System.Drawing.Point(0, 736);
            this.panel1.Margin = new System.Windows.Forms.Padding(4);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1381, 81);
            this.panel1.TabIndex = 115;
            // 
            // cmdXZ
            // 
            this.cmdXZ.Location = new System.Drawing.Point(20, 12);
            this.cmdXZ.Margin = new System.Windows.Forms.Padding(4);
            this.cmdXZ.Name = "cmdXZ";
            this.cmdXZ.Size = new System.Drawing.Size(113, 52);
            this.cmdXZ.TabIndex = 124;
            this.cmdXZ.Text = "新    å¢ž";
            this.cmdXZ.UseVisualStyleBackColor = true;
            this.cmdXZ.Click += new System.EventHandler(this.cmdXZ_Click);
            // 
            // button2
            // 
            this.button2.Enabled = false;
            this.button2.Location = new System.Drawing.Point(756, 12);
            this.button2.Margin = new System.Windows.Forms.Padding(4);
            this.button2.Name = "button2";
            this.button2.Size = new System.Drawing.Size(113, 52);
            this.button2.TabIndex = 123;
            this.button2.Text = "反审核";
            this.button2.UseVisualStyleBackColor = true;
            this.button2.Click += new System.EventHandler(this.button2_Click);
            // 
            // button1
            // 
            this.button1.Enabled = false;
            this.button1.Location = new System.Drawing.Point(633, 12);
            this.button1.Margin = new System.Windows.Forms.Padding(4);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(113, 52);
            this.button1.TabIndex = 122;
            this.button1.Text = "审  æ ¸";
            this.button1.UseVisualStyleBackColor = true;
            this.button1.Click += new System.EventHandler(this.button1_Click);
            // 
            // cmdHDelBill
            // 
            this.cmdHDelBill.Location = new System.Drawing.Point(1009, 12);
            this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHDelBill.Name = "cmdHDelBill";
            this.cmdHDelBill.Size = new System.Drawing.Size(113, 52);
            this.cmdHDelBill.TabIndex = 121;
            this.cmdHDelBill.Text = "删除领料单";
            this.cmdHDelBill.UseVisualStyleBackColor = true;
            this.cmdHDelBill.Visible = false;
            this.cmdHDelBill.Click += new System.EventHandler(this.cmdHDelBill_Click);
            // 
            // cmdXG
            // 
            this.cmdXG.Location = new System.Drawing.Point(143, 12);
            this.cmdXG.Margin = new System.Windows.Forms.Padding(4);
            this.cmdXG.Name = "cmdXG";
            this.cmdXG.Size = new System.Drawing.Size(113, 52);
            this.cmdXG.TabIndex = 120;
            this.cmdXG.Text = "ä¿®    æ”¹";
            this.cmdXG.UseVisualStyleBackColor = true;
            this.cmdXG.Click += new System.EventHandler(this.cmdXG_Click);
            // 
            // cmdAddNew
            // 
            this.cmdAddNew.Location = new System.Drawing.Point(879, 12);
            this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4);
            this.cmdAddNew.Name = "cmdAddNew";
            this.cmdAddNew.Size = new System.Drawing.Size(113, 52);
            this.cmdAddNew.TabIndex = 114;
            this.cmdAddNew.Text = "清    ç©º";
            this.cmdAddNew.UseVisualStyleBackColor = true;
            this.cmdAddNew.Visible = false;
            this.cmdAddNew.Click += new System.EventHandler(this.cmdAddNew_Click);
            // 
            // cmdDelLine
            // 
            this.cmdDelLine.Location = new System.Drawing.Point(264, 12);
            this.cmdDelLine.Margin = new System.Windows.Forms.Padding(4);
            this.cmdDelLine.Name = "cmdDelLine";
            this.cmdDelLine.Size = new System.Drawing.Size(113, 52);
            this.cmdDelLine.TabIndex = 125;
            this.cmdDelLine.Text = "删    è¡Œ";
            this.cmdDelLine.UseVisualStyleBackColor = true;
            this.cmdDelLine.Click += new System.EventHandler(this.cmdDelLine_Click);
            // 
            // MES_StationInBill
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -1307,7 +1320,7 @@
            this.Controls.Add(this.panel1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.KeyPreview = true;
            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "MES_StationInBill";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "进站接收单";
@@ -1418,5 +1431,6 @@
        private System.Windows.Forms.Button cmdXZ;
        private System.Windows.Forms.TextBox txtHBarCode_Mater;
        private System.Windows.Forms.Label label25;
        private System.Windows.Forms.Button cmdDelLine;
    }
}