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

ch

2022-09-07 99660c0a8a0532cbec865dbd86aff2d15ca80fdb

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

 .gitignore

@@ -139,3 +139,4 @@
/PayM/obj/Release
/PayM/obj/Debug
/NETERPNoWin/obj
/WebAPI/Sc_MouldProdOutBill/Log

 DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs

@@ -368,7 +368,7 @@

                oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetRemark " + omodel.HInterID.ToString()); //设置 å¤‡æ³¨ ä¸º å·¥è‰ºæµ
                sErr = sErr + "4;";
                oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + omodel.HInterID.ToString()); //设置 æœ«é“ é¦–道 è½¬ ç­‰ä¿¡æ¯
                oCn.RunProc("exec h_p_Sc_ProcessExchangeBill_SetUpdate " + omodel.HInterID.ToString()); //设置 æœ«é“ é¦–道 è½¬ ç­‰ä¿¡æ¯   å™¨å…·æ¸…单  å·¥è‰ºå‚数清单；
                sErr = sErr + "5;";
                DataSet ds = new DataSet();
                //设置条码号  å›žå¡« é¢†æ–™æ‰¹æ¬¡

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_Source_Model.cs

@@ -23,5 +23,6 @@
        public double HMinAdd;//        money        //最小进阶             --addnew
        public Int64 HClassCount;//    int        //每日班次                  --addnew
        public int HUSEORGID;
        public string HMacAddr; //mac地址
    }
}

 PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache

Binary files differ

 WebAPI/Controllers/BaseSet/Gy_SourceController.cs

@@ -33,14 +33,14 @@
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限查询!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无权限查询!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (sWhere == null || sWhere.Equals(""))
                {
@@ -96,15 +96,15 @@
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();

            //查看权限
            if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            ////查看权限
            //if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, msg2))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "无保存权限！";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}

            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -156,14 +156,14 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HGroupID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "生产班组没有选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (HGroupID == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "生产班组没有选择！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}

                if (HProcID == 0)
                {

 WebAPI/Controllers/CJGL/ProductionPlanReportController.cs

New file
@@ -0,0 +1,62 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;

namespace WebAPI.Controllers.CJGL
{
    public class ProductionPlanReportController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

        #region æŠ•äº§è®¡åˆ’报表 æŸ¥è¯¢
        public class ProductionPlanReport
        {
            public int HOrgID;
            public DateTime HBeginDate;
            public DateTime HEndDate;
            public string HICMOBillNo;
            public string HWorkShopID;
            public string HSeOrderBillNo;
            public string HMaterNumber;
        }
        [Route("ProductionPlanReport/ProductionPlanReportList")]
        [HttpGet]
        public object ProductionPlanReportList(string sWhere)
        {
            try
            {
                //反序列化传递的值
                ProductionPlanReport com = JsonConvert.DeserializeObject<ProductionPlanReport>(sWhere.ToString());

                ds = oCN.RunProcReturn($"exec h_p_Cj_ProductionPlanReportList {com.HOrgID},'{com.HBeginDate}','{com.HEndDate}'" +
                    $",'{com.HICMOBillNo}',{com.HWorkShopID},'{com.HSeOrderBillNo}','{com.HMaterNumber}'", "h_p_Cj_ProductionPlanReportList");

                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;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/LMESController.cs

@@ -128,6 +128,73 @@
        }

        /// <summary>
        /// è¿”回工序流转卡（下达）列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>

        [Route("LEMS/MES_Sc_ProcessExchangeIssueBillList_Json")]
        [HttpGet]
        public object MES_Sc_ProcessExchangeIssueBillList_Json(string sWhere, string user)
        {
            DataSet ds;
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeIssueBillQuery");
                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 = "异常！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// ä¸‹è¾¾
        /// </summary>
        /// <returns></returns>
        [Route("LEMS/MES_Sc_ProcessExchangeIssue")]
        [HttpGet]
        public object MES_Sc_ProcessExchangeIssue(string HGroupID, string HSourceID, string HEntryId) {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn($"exec REALESE_Sc_ProcessExchangeIssue '{HGroupID}','{HSourceID}','{HEntryId}' ", "REALESE_Sc_ProcessExchangeIssue");
                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 = "异常！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// è¿”回工序出站汇报单列表
        ///参数：string sql。
        ///返回值：object。

 WebAPI/Controllers/POStockInBillController.cs

@@ -1003,25 +1003,27 @@
        {
            try
            {
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                string sql = $"select * from H_v_SRM_POInStockBillList where å•æ®å· ='{HBillno}'";
                ds = oCn.RunProcReturn(sql, "H_v_SRM_POInStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                json result = Get_ReciveBillCheckDate(HBillno);
                return result;
                //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //string sql = $"select * from H_v_SRM_POInStockBillList where å•æ®å· ='{HBillno}'";
                //ds = oCn.RunProcReturn(sql, "H_v_SRM_POInStockBillList");
                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有返回任何记录！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                //    objJsonResult.code = "1";
                //    objJsonResult.count = 1;
                //    objJsonResult.Message = "Sucess！";
                //    objJsonResult.data = ds.Tables[0];
                //    return objJsonResult;
                //}
            }
            catch (Exception e)
            {

 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs

@@ -16,14 +16,14 @@
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();   
        public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();   
        public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain();
        public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain();

        #region è®¾å¤‡æ¡£æ¡ˆåˆ—表

        [Route("Gy_EquipFileMain/GetList")]
        [HttpGet]
        public object GetList(string sWhere,string user)
        public object GetList(string sWhere, string user)
        {
            try
            {
@@ -78,7 +78,7 @@
        #region [设备档案删除功能]
        [Route("Gy_EquipFileMain/Delete_EquipFile")]
        [HttpGet]
        public object Delete_EquipFile(string HItemID,string user)
        public object Delete_EquipFile(string HItemID, string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Delete", 1, false, user))
            {
@@ -181,11 +181,11 @@

                List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2);

                string hbillno= list[0].HBillNo;
                string hbillno = list[0].HBillNo;
                string HYear = DateTime.Now.Year.ToString();
                DateTime HDate = list[0].HDate;
                long HInterID = list[0].HInterID;
                string HEquipFileNumber = list[0].HEquipFileNumber; 
                string HEquipFileNumber = list[0].HEquipFileNumber;
                string HEquipFileNo = list[0].HEquipFileNo;         //    varchar(50)    //设备编码(唯一)
                string HName = list[0].HName;                //    âˆš    varchar(100)         //设备名称
                string HModel = list[0].HModel;               //   âˆš     varchar(100)         //设备规格
@@ -212,6 +212,7 @@
                string HMakeDate = DateTime.Now.Date.ToString();
                int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
                int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
                int HSourceID = list[0].HSourceID;

                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -227,12 +228,11 @@
                oCN.RunProc("Insert into Gy_EquipFileBillMain " +
                   " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
                   ",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID) " +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID) " +
                   " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
                   ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
                   "','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
                   "')", ref DBUtility.ClsPub.sExeReturnInfo);
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCN.Commit();
                objJsonResult.code = "1";
@@ -254,7 +254,7 @@
        #endregion

        #region è®¾å¤‡æ¡£æ¡ˆä¿®æ”¹ä¿å­˜
        

        [Route("Gy_EquipFileMain/EditBill")]
        [HttpPost]
        public object EditBill([FromBody] JObject oMain)
@@ -310,6 +310,8 @@
                string HUpDateDate = DateTime.Now.Date.ToString();
                int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
                int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
                int HSourceID = list[0].HSourceID;


                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -341,28 +343,29 @@
                    ",HName='" + HName + "'" +
                    ",HModel='" + HModel + "'" +
                    ",HModel2='" + HModel2 + "'" +
                    ",HMaterID=" + HMaterID + 
                    ",HUnitID=" + HUnitID + 
                    ",HMaterID=" + HMaterID +
                    ",HUnitID=" + HUnitID +
                    ",HOutComDate='" + HOutComDate + "'" +
                    ",HOutComNo='" + HOutComNo + "'" +
                    ",HDeptID=" + HDeptID + 
                    ",HDeptID=" + HDeptID +
                    ",HUseEmpID=" + HUseEmpID +
                    ",HRepairEmpID=" + HRepairEmpID +
                    ",HAddress='" + HAddress + "'" +
                    ",HSetupDate='" + HSetupDate + "'" +
                    ",HStartupDate='" + HStartupDate + "'" +
                    ",HStatus='" + HStatus + "'" +
                    ",HEquipFileTypeID=" + HEquipFileTypeID + 
                    ",HEquipFileTypeID=" + HEquipFileTypeID +
                    ",HProNum='" + HProNum + "'" +
                    ",HBarCode='" + HBarCode + "'" +
                    ",HWorkArea='" + HWorkArea + "'" +
                    ",HLogo='" + HLogo + "'" +
                    ",HSellSupID=" + HSellSupID + 
                    ",HSellSupID=" + HSellSupID +
                    ",HMakeSupID= " + HMakeSupID +
                    ",HUpDater= '" + HUpDater + "'" +
                    ",HUpDateDate= '" + HUpDateDate + "'" +
                    ",HEquipDotCheckRuleInterID='"+ HEquipDotCheckRuleInterID+"'"+
                    ",HEquipMaintainRuleInterID='"+ HEquipMaintainRuleInterID+"'"+
                    ",HEquipDotCheckRuleInterID='" + HEquipDotCheckRuleInterID + "'" +
                    ",HEquipMaintainRuleInterID='" + HEquipMaintainRuleInterID + "'" +
                    ",HSourceID='" + HSourceID + "'" +
                    " Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -392,13 +395,13 @@
        public object Sb_EquipFileBillResumeDate(string HInterID)
        {

            DataTable ds,ds1;
            DataTable ds, ds1;
            long HInterID1 = long.Parse(HInterID);
            List<object> list = new List<object>();
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
               //获取配件项目编辑数据
                //获取配件项目编辑数据
                string sql1 = string.Format($"exec h_p_Gy_EquipRecord {HInterID1}");
                ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[0];
                ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[1];
@@ -427,8 +430,8 @@
        public object Gy_MouldFileBillResumeDate(string HInterID)
        {

            DataTable ds,ds1,ds2,ds3;
            
            DataTable ds, ds1, ds2, ds3;

            long HInterID1 = long.Parse(HInterID);
            List<object> list = new List<object>();
            try

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -212,7 +212,7 @@
                    return objJsonResult;
                }
                //根据任务单查找到金蝶的生产订单
                DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERP_StationOutBillList_LastProc where HICMOInterID=" + dr["HICMOInterID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
                DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERP_StationOutBillList_LastProc where HICMOEntryID=" + dr["HICMOEntryID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
                DataRow dr1 = ds1.Tables[0].Rows[0];

                JObject model = new JObject();
@@ -220,6 +220,8 @@
                model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //生产组织1
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期1
                model.Add("FHZYMESFLAG", "是");//  æ˜¯å¦ä¸ºMES同步
                model.Add("FBillNo", HBillNo);
                
                JArray Fentity = new JArray();

                foreach (DataRow item in ds.Tables[0].Rows)
@@ -238,7 +240,7 @@
                    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("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//生产订单行号
                    FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//生产订单内码
                    FentityModel.Add("FFinishQty", item["接收数量"].ToString());//完成数量1
                    FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1FFailQty
@@ -297,12 +299,12 @@
                    //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
                    ["Model"] = model
                };
                LogService.Write("jsonRoot:" + jsonRoot);
                
                string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//保存
                //判断保存是否成功
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    
                    LogService.Write("工序汇报单入库错误jsonRoot:" + jsonRoot);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/DLL/ClsGy_Source_Ctl.cs

@@ -22,12 +22,12 @@
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HType,HRelationID,HCenterID,HEquipFileID_K3,HDeptID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HProcID,HOverTimes " +
                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID)" +
                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID,HMacAddr)" +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ",'" + oModel.HType + "'," + oModel.HRelationID.ToString() + "," + oModel.HCenterID.ToString() + "," + oModel.HEquipFileID_K3.ToString() + "," + oModel.HDeptID.ToString() +
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",'" + oModel.HRemark + "'," + oModel.HProcID + "," + oModel.HOverTimes + "," + oModel.HWorkTimes + "," + oModel.HMaxWorkTimes +
                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + ","+ oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + "," + oModel.HUSEORGID + ",'" + oModel.HMacAddr + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -68,6 +68,7 @@
                    ",HDeptID=" + oModel.HDeptID.ToString() +
                    ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",HMacAddr='" + oModel.HMacAddr.ToString() + "'" +
                    ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Models/ClsGy_EquipFileMain.cs

@@ -32,6 +32,7 @@
        public int HMakeSupID;              // int        //制造商 (Gy_Supplier) 
        public int HEquipDotCheckRuleInterID=0;
        public int HEquipMaintainRuleInterID=0;
        public int HSourceID = 0;

    }
}

 WebAPI/WebAPI.csproj

@@ -373,6 +373,7 @@
    <Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
    <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
    <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
    <Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
    <Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
    <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
    <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
@@ -580,6 +581,7 @@
    <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
    <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
    <Compile Include="Models\动态列\OptionListModel.cs" />
    <Compile Include="Models\基础资料\Gy_ClassTimePrj.cs" />
    <Compile Include="Models\工资管理\ClsGy_ClassTimePrj_Model.cs" />
    <Compile Include="Models\工资管理\ClsPay_GroupBalBillEmp.cs" />
    <Compile Include="Models\工资管理\ClsPay_GroupBalBillMain.cs" />
@@ -742,10 +744,8 @@
    <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
    <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
    <Compile Include="Models\基础资料\Gy_ClassTimePrjSub.cs" />
    <Compile Include="Models\基础资料\Gy_ClassTimePrj.cs" />
    <Compile Include="Models\基础资料\Gy_Employee.cs" />
    <Compile Include="Models\基础资料\Gy_Process.cs" />
    <Compile Include="Models\基础资料\Gy_ClassTimePrj.cs" />
    <Compile Include="Models\基础资料\Warehouse.cs" />
    <Compile Include="Models\工资管理\ClsPay_WorkTimesBillMain.cs" />
    <Compile Include="Models\工资管理\ClsPay_WorkTimesBillSub.cs" />
@@ -848,6 +848,7 @@
    <Folder Include="Views\kf_StepFoldinBill\" />
    <Folder Include="Views\Kf_StepFoldOutBill\" />
    <Folder Include="Views\MoveStockBill\" />
    <Folder Include="Views\ProductionPlanReport\" />
    <Folder Include="Views\ProductionReturnBill\" />
    <Folder Include="Views\QC_Management\" />
    <Folder Include="Views\Sb_EquipRepairSendWorkBill\" />

 WebAPI/WebAPI.csproj.user

@@ -18,7 +18,7 @@
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>

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

@@ -17,6 +17,7 @@
        {
            InitializeComponent();
        }
        public DBUtility.frmBillQueryCondition_New frmCondition;
        public string ModName = "3790";
        public string ModCaption = "进站接收单";
        public const string ModRightName = "MES_StationInBill";
@@ -152,6 +153,7 @@
        //窗体加载
        private void Sc_StationInBill_Load(object sender, EventArgs e)
        {
            frmCondition = new DBUtility.frmBillQueryCondition_New();
            //打印初始化       
            this.Text = ModCaption;
            this.lblCaption.Text = ModCaption;
@@ -179,7 +181,7 @@
        private void Sc_StationInBill_FormClosing(object sender, FormClosingEventArgs e)
        {
            BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
            //DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
            //DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name);
            DBUtility.Xt_BaseBillFun.SaveGrid(grdCardList, this.Name + "grdCardList");
        }
        //新增单据
@@ -1523,6 +1525,9 @@
                }
                else
                {
                    //释放冻结
                    DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdSub);
                    //
                    grdSub.DataSource = Dsplay.Tables[0].DefaultView;
                    //设置合计列
                    //string sTotalCol = "";
@@ -1532,15 +1537,29 @@
                    //oSumGrid.BuildTotalCols(sT);
                    //  
                    //冻结
                    int FrCol = 0;
                    string s = "是";
                    DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
                    int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
                    string s = frmCondition.cmbHComplete.Text;
                    DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name, s, FrCol);
                    //画线
                    GraphLine();
                    //冻结
                    //int FrCol = 0;
                    //string s = "是";
                    //DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
                }
            }
            catch (Exception e)
            {
                MessageBox.Show(e.Message + "DisplaySub");
            }
        }
        private void GraphLine()
        {
            int MainIDCol = 0;
            int SubIDCol = 0;
            string s = frmCondition.cmbHComplete.Text;
            long n = 0;
            DBUtility.Xt_BaseBillFun.GraphLine(grdSub, MainIDCol, SubIDCol, s, ref n);
        }

        private void cmdDelLine_Click(object sender, EventArgs e)
@@ -1562,5 +1581,16 @@
            }

        }

        private void cmdHbclk_Click(object sender, EventArgs e)
        {
            //保存列宽
            DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name);
        }

        private void cmdHmrlk_Click(object sender, EventArgs e)
        {
            DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name);
        }
    }
}

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

@@ -109,13 +109,15 @@
            this.label19 = new System.Windows.Forms.Label();
            this.timer1 = new System.Windows.Forms.Timer(this.components);
            this.panel1 = new System.Windows.Forms.Panel();
            this.cmdDelLine = new System.Windows.Forms.Button();
            this.cmdXZ = new System.Windows.Forms.Button();
            this.button2 = new System.Windows.Forms.Button();
            this.button1 = new System.Windows.Forms.Button();
            this.cmdHDelBill = new System.Windows.Forms.Button();
            this.cmdXG = new System.Windows.Forms.Button();
            this.cmdAddNew = new System.Windows.Forms.Button();
            this.cmdDelLine = new System.Windows.Forms.Button();
            this.cmdHbclk = new System.Windows.Forms.Button();
            this.cmdHmrlk = new System.Windows.Forms.Button();
            this.gbUp.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
            this.tabControl1.SuspendLayout();
@@ -132,10 +134,9 @@
            this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
            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);
            this.cmdHMaterID.Location = new System.Drawing.Point(712, 249);
            this.cmdHMaterID.Name = "cmdHMaterID";
            this.cmdHMaterID.Size = new System.Drawing.Size(40, 40);
            this.cmdHMaterID.Size = new System.Drawing.Size(30, 32);
            this.cmdHMaterID.TabIndex = 86;
            this.cmdHMaterID.UseVisualStyleBackColor = false;
            this.cmdHMaterID.Visible = false;
@@ -147,12 +148,11 @@
            this.txtHMaterID.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHMaterID.Location = new System.Drawing.Point(100, 143);
            this.txtHMaterID.Multiline = true;
            this.txtHMaterID.Name = "txtHMaterID";
            this.txtHMaterID.ReadOnly = true;
            this.txtHMaterID.Size = new System.Drawing.Size(328, 40);
            this.txtHMaterID.Size = new System.Drawing.Size(247, 33);
            this.txtHMaterID.TabIndex = 85;
            this.txtHMaterID.Tag = "0";
            this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -163,10 +163,9 @@
            this.label16.BackColor = System.Drawing.Color.Gray;
            this.label16.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label16.ForeColor = System.Drawing.Color.Yellow;
            this.label16.Location = new System.Drawing.Point(11, 186);
            this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label16.Location = new System.Drawing.Point(8, 149);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(112, 27);
            this.label16.Size = new System.Drawing.Size(90, 21);
            this.label16.TabIndex = 84;
            this.label16.Text = "产品代码：";
            // 
@@ -176,10 +175,9 @@
            this.label9.BackColor = System.Drawing.Color.Gray;
            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label9.ForeColor = System.Drawing.Color.Yellow;
            this.label9.Location = new System.Drawing.Point(11, 273);
            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label9.Location = new System.Drawing.Point(8, 218);
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(112, 27);
            this.label9.Size = new System.Drawing.Size(90, 21);
            this.label9.TabIndex = 82;
            this.label9.Text = "进站时间：";
            // 
@@ -188,10 +186,9 @@
            this.label2.AutoSize = true;
            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label2.ForeColor = System.Drawing.Color.Yellow;
            this.label2.Location = new System.Drawing.Point(504, 274);
            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label2.Location = new System.Drawing.Point(378, 219);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(104, 27);
            this.label2.Size = new System.Drawing.Size(84, 21);
            this.label2.TabIndex = 80;
            this.label2.Text = "ä»» åŠ¡ å•ï¼š";
            // 
@@ -200,12 +197,11 @@
            this.txtHICMOBillNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHICMOBillNo.Location = new System.Drawing.Point(490, 214);
            this.txtHICMOBillNo.Multiline = true;
            this.txtHICMOBillNo.Name = "txtHICMOBillNo";
            this.txtHICMOBillNo.ReadOnly = true;
            this.txtHICMOBillNo.Size = new System.Drawing.Size(292, 40);
            this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 33);
            this.txtHICMOBillNo.TabIndex = 81;
            // 
            // txtHProcExchBillNo
@@ -213,12 +209,11 @@
            this.txtHProcExchBillNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHProcExchBillNo.Location = new System.Drawing.Point(100, 4);
            this.txtHProcExchBillNo.Multiline = true;
            this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
            this.txtHProcExchBillNo.ReadOnly = true;
            this.txtHProcExchBillNo.Size = new System.Drawing.Size(328, 40);
            this.txtHProcExchBillNo.Size = new System.Drawing.Size(247, 33);
            this.txtHProcExchBillNo.TabIndex = 88;
            this.txtHProcExchBillNo.Tag = "0";
            this.txtHProcExchBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcExchBillNo_KeyDown);
@@ -229,10 +224,9 @@
            this.label1.BackColor = System.Drawing.Color.Gray;
            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label1.ForeColor = System.Drawing.Color.Yellow;
            this.label1.Location = new System.Drawing.Point(11, 12);
            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Location = new System.Drawing.Point(8, 10);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(92, 27);
            this.label1.Size = new System.Drawing.Size(74, 21);
            this.label1.TabIndex = 87;
            this.label1.Text = "流转卡：";
            // 
@@ -242,12 +236,11 @@
            this.txtHMaterModel.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHMaterModel.Location = new System.Drawing.Point(490, 74);
            this.txtHMaterModel.Multiline = true;
            this.txtHMaterModel.Name = "txtHMaterModel";
            this.txtHMaterModel.ReadOnly = true;
            this.txtHMaterModel.Size = new System.Drawing.Size(292, 40);
            this.txtHMaterModel.Size = new System.Drawing.Size(220, 33);
            this.txtHMaterModel.TabIndex = 90;
            this.txtHMaterModel.Tag = "0";
            // 
@@ -257,10 +250,9 @@
            this.label3.BackColor = System.Drawing.Color.Gray;
            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label3.ForeColor = System.Drawing.Color.Yellow;
            this.label3.Location = new System.Drawing.Point(503, 100);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Location = new System.Drawing.Point(377, 80);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(112, 27);
            this.label3.Size = new System.Drawing.Size(90, 21);
            this.label3.TabIndex = 89;
            this.label3.Text = "规格型号：";
            // 
@@ -268,10 +260,9 @@
            // 
            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);
            this.cmdHEmpID.Location = new System.Drawing.Point(712, 144);
            this.cmdHEmpID.Name = "cmdHEmpID";
            this.cmdHEmpID.Size = new System.Drawing.Size(40, 40);
            this.cmdHEmpID.Size = new System.Drawing.Size(30, 32);
            this.cmdHEmpID.TabIndex = 93;
            this.cmdHEmpID.UseVisualStyleBackColor = false;
            this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -281,11 +272,10 @@
            this.txtHEmpID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHEmpID.Location = new System.Drawing.Point(596, 144);
            this.txtHEmpID.Name = "txtHEmpID";
            this.txtHEmpID.ReadOnly = true;
            this.txtHEmpID.Size = new System.Drawing.Size(151, 38);
            this.txtHEmpID.Size = new System.Drawing.Size(114, 32);
            this.txtHEmpID.TabIndex = 92;
            this.txtHEmpID.Tag = "0";
            this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
@@ -296,10 +286,9 @@
            this.label4.AutoSize = true;
            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label4.ForeColor = System.Drawing.Color.Yellow;
            this.label4.Location = new System.Drawing.Point(503, 187);
            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label4.Location = new System.Drawing.Point(377, 150);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(104, 27);
            this.label4.Size = new System.Drawing.Size(84, 21);
            this.label4.TabIndex = 91;
            this.label4.Text = "接 æ”¶ äººï¼š";
            // 
@@ -307,10 +296,9 @@
            // 
            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);
            this.cmdHSourceID.Location = new System.Drawing.Point(317, 282);
            this.cmdHSourceID.Name = "cmdHSourceID";
            this.cmdHSourceID.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID.TabIndex = 96;
            this.cmdHSourceID.UseVisualStyleBackColor = false;
            this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -320,10 +308,9 @@
            this.txtHSourceID.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceID.Location = new System.Drawing.Point(100, 282);
            this.txtHSourceID.Name = "txtHSourceID";
            this.txtHSourceID.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID.TabIndex = 95;
            this.txtHSourceID.Tag = "0";
            this.txtHSourceID.TextChanged += new System.EventHandler(this.txtHSourceID_TextChanged);
@@ -334,10 +321,9 @@
            this.label5.AutoSize = true;
            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label5.ForeColor = System.Drawing.Color.Yellow;
            this.label5.Location = new System.Drawing.Point(11, 360);
            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label5.Location = new System.Drawing.Point(8, 288);
            this.label5.Name = "label5";
            this.label5.Size = new System.Drawing.Size(112, 27);
            this.label5.Size = new System.Drawing.Size(90, 21);
            this.label5.TabIndex = 94;
            this.label5.Text = "生产资源：";
            // 
@@ -346,12 +332,11 @@
            this.txtHICMOQty.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHICMOQty.Location = new System.Drawing.Point(490, 249);
            this.txtHICMOQty.Multiline = true;
            this.txtHICMOQty.Name = "txtHICMOQty";
            this.txtHICMOQty.ReadOnly = true;
            this.txtHICMOQty.Size = new System.Drawing.Size(292, 40);
            this.txtHICMOQty.Size = new System.Drawing.Size(220, 33);
            this.txtHICMOQty.TabIndex = 98;
            this.txtHICMOQty.Tag = "0";
            // 
@@ -361,10 +346,9 @@
            this.label6.BackColor = System.Drawing.Color.Gray;
            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label6.ForeColor = System.Drawing.Color.Yellow;
            this.label6.Location = new System.Drawing.Point(503, 57);
            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label6.Location = new System.Drawing.Point(377, 46);
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(132, 27);
            this.label6.Size = new System.Drawing.Size(106, 21);
            this.label6.TabIndex = 97;
            this.label6.Text = "流转卡数量：";
            // 
@@ -373,12 +357,11 @@
            this.txtHPlanQty.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHPlanQty.Location = new System.Drawing.Point(490, 40);
            this.txtHPlanQty.Multiline = true;
            this.txtHPlanQty.Name = "txtHPlanQty";
            this.txtHPlanQty.ReadOnly = true;
            this.txtHPlanQty.Size = new System.Drawing.Size(292, 40);
            this.txtHPlanQty.Size = new System.Drawing.Size(220, 33);
            this.txtHPlanQty.TabIndex = 100;
            this.txtHPlanQty.Tag = "0";
            // 
@@ -388,10 +371,9 @@
            this.label7.BackColor = System.Drawing.Color.Gray;
            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label7.ForeColor = System.Drawing.Color.Yellow;
            this.label7.Location = new System.Drawing.Point(503, 143);
            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label7.Location = new System.Drawing.Point(377, 114);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(112, 27);
            this.label7.Size = new System.Drawing.Size(90, 21);
            this.label7.TabIndex = 99;
            this.label7.Text = "接收数量：";
            // 
@@ -399,10 +381,9 @@
            // 
            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);
            this.cmdHGroupID.Location = new System.Drawing.Point(317, 248);
            this.cmdHGroupID.Name = "cmdHGroupID";
            this.cmdHGroupID.Size = new System.Drawing.Size(40, 40);
            this.cmdHGroupID.Size = new System.Drawing.Size(30, 32);
            this.cmdHGroupID.TabIndex = 103;
            this.cmdHGroupID.UseVisualStyleBackColor = false;
            this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
@@ -412,10 +393,9 @@
            this.txtHGroupID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHGroupID.Location = new System.Drawing.Point(100, 248);
            this.txtHGroupID.Name = "txtHGroupID";
            this.txtHGroupID.Size = new System.Drawing.Size(133, 38);
            this.txtHGroupID.Size = new System.Drawing.Size(101, 32);
            this.txtHGroupID.TabIndex = 102;
            this.txtHGroupID.Tag = "0";
            this.txtHGroupID.TextChanged += new System.EventHandler(this.txtHGroupID_TextChanged);
@@ -426,10 +406,9 @@
            this.label8.AutoSize = true;
            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label8.ForeColor = System.Drawing.Color.Yellow;
            this.label8.Location = new System.Drawing.Point(11, 317);
            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label8.Location = new System.Drawing.Point(8, 254);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(112, 27);
            this.label8.Size = new System.Drawing.Size(90, 21);
            this.label8.TabIndex = 101;
            this.label8.Text = "生产班组：";
            // 
@@ -438,10 +417,9 @@
            this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
            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);
            this.cmdHProcID.Location = new System.Drawing.Point(317, 73);
            this.cmdHProcID.Name = "cmdHProcID";
            this.cmdHProcID.Size = new System.Drawing.Size(40, 40);
            this.cmdHProcID.Size = new System.Drawing.Size(30, 32);
            this.cmdHProcID.TabIndex = 106;
            this.cmdHProcID.UseVisualStyleBackColor = false;
            this.cmdHProcID.Click += new System.EventHandler(this.cmdHProcID_Click);
@@ -452,12 +430,11 @@
            this.txtHProcID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHProcID.Location = new System.Drawing.Point(100, 73);
            this.txtHProcID.Multiline = true;
            this.txtHProcID.Name = "txtHProcID";
            this.txtHProcID.ReadOnly = true;
            this.txtHProcID.Size = new System.Drawing.Size(287, 40);
            this.txtHProcID.Size = new System.Drawing.Size(216, 33);
            this.txtHProcID.TabIndex = 105;
            this.txtHProcID.Tag = "0";
            this.txtHProcID.TextChanged += new System.EventHandler(this.txtHProcID_TextChanged);
@@ -469,10 +446,9 @@
            this.label10.BackColor = System.Drawing.Color.Gray;
            this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label10.ForeColor = System.Drawing.Color.Yellow;
            this.label10.Location = new System.Drawing.Point(11, 99);
            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label10.Location = new System.Drawing.Point(8, 79);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(112, 27);
            this.label10.Size = new System.Drawing.Size(90, 21);
            this.label10.TabIndex = 104;
            this.label10.Text = "当前工序：";
            // 
@@ -482,12 +458,11 @@
            this.txtHMaterName.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHMaterName.Location = new System.Drawing.Point(100, 178);
            this.txtHMaterName.Multiline = true;
            this.txtHMaterName.Name = "txtHMaterName";
            this.txtHMaterName.ReadOnly = true;
            this.txtHMaterName.Size = new System.Drawing.Size(328, 40);
            this.txtHMaterName.Size = new System.Drawing.Size(247, 33);
            this.txtHMaterName.TabIndex = 108;
            this.txtHMaterName.Tag = "0";
            // 
@@ -497,19 +472,17 @@
            this.label11.BackColor = System.Drawing.Color.Gray;
            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label11.ForeColor = System.Drawing.Color.Yellow;
            this.label11.Location = new System.Drawing.Point(11, 230);
            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label11.Location = new System.Drawing.Point(8, 184);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(112, 27);
            this.label11.Size = new System.Drawing.Size(90, 21);
            this.label11.TabIndex = 107;
            this.label11.Text = "产品名称：";
            // 
            // cmdOK
            // 
            this.cmdOK.Location = new System.Drawing.Point(388, 12);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(4);
            this.cmdOK.Location = new System.Drawing.Point(291, 10);
            this.cmdOK.Name = "cmdOK";
            this.cmdOK.Size = new System.Drawing.Size(113, 52);
            this.cmdOK.Size = new System.Drawing.Size(85, 42);
            this.cmdOK.TabIndex = 109;
            this.cmdOK.Text = "进  ç«™";
            this.cmdOK.UseVisualStyleBackColor = true;
@@ -517,10 +490,9 @@
            // 
            // cmdCancel
            // 
            this.cmdCancel.Location = new System.Drawing.Point(511, 12);
            this.cmdCancel.Margin = new System.Windows.Forms.Padding(4);
            this.cmdCancel.Location = new System.Drawing.Point(383, 10);
            this.cmdCancel.Name = "cmdCancel";
            this.cmdCancel.Size = new System.Drawing.Size(113, 52);
            this.cmdCancel.Size = new System.Drawing.Size(85, 42);
            this.cmdCancel.TabIndex = 110;
            this.cmdCancel.Text = "取  æ¶ˆ";
            this.cmdCancel.UseVisualStyleBackColor = true;
@@ -532,10 +504,9 @@
            this.lblCaption.BackColor = System.Drawing.Color.Gray;
            this.lblCaption.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblCaption.ForeColor = System.Drawing.Color.LimeGreen;
            this.lblCaption.Location = new System.Drawing.Point(9, 9);
            this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.lblCaption.Location = new System.Drawing.Point(7, 7);
            this.lblCaption.Name = "lblCaption";
            this.lblCaption.Size = new System.Drawing.Size(134, 31);
            this.lblCaption.Size = new System.Drawing.Size(107, 26);
            this.lblCaption.TabIndex = 111;
            this.lblCaption.Text = "进站接收单";
            // 
@@ -548,10 +519,8 @@
            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);
            this.gbUp.Name = "gbUp";
            this.gbUp.Padding = new System.Windows.Forms.Padding(4);
            this.gbUp.Size = new System.Drawing.Size(1381, 736);
            this.gbUp.Size = new System.Drawing.Size(1036, 589);
            this.gbUp.TabIndex = 114;
            this.gbUp.TabStop = false;
            // 
@@ -559,12 +528,12 @@
            // 
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdSub.Location = new System.Drawing.Point(4, 509);
            this.grdSub.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.grdSub.Location = new System.Drawing.Point(3, 407);
            this.grdSub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdSub.Name = "grdSub";
            this.grdSub.RowHeadersWidth = 51;
            this.grdSub.RowTemplate.Height = 27;
            this.grdSub.Size = new System.Drawing.Size(1002, 223);
            this.grdSub.Size = new System.Drawing.Size(752, 179);
            this.grdSub.TabIndex = 149;
            // 
            // tabControl1
@@ -572,11 +541,11 @@
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;
            this.tabControl1.Location = new System.Drawing.Point(4, 77);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabControl1.Location = new System.Drawing.Point(3, 61);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(1002, 432);
            this.tabControl1.Size = new System.Drawing.Size(752, 346);
            this.tabControl1.TabIndex = 150;
            // 
            // tabPage1
@@ -625,11 +594,11 @@
            this.tabPage1.Controls.Add(this.txtHEmpID);
            this.tabPage1.Controls.Add(this.label7);
            this.tabPage1.Controls.Add(this.label6);
            this.tabPage1.Location = new System.Drawing.Point(4, 25);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage1.Size = new System.Drawing.Size(994, 403);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabPage1.Size = new System.Drawing.Size(744, 320);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "进站信息";
            // 
@@ -639,11 +608,10 @@
            this.txtHGroupName.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHGroupName.Location = new System.Drawing.Point(202, 248);
            this.txtHGroupName.Name = "txtHGroupName";
            this.txtHGroupName.ReadOnly = true;
            this.txtHGroupName.Size = new System.Drawing.Size(151, 38);
            this.txtHGroupName.Size = new System.Drawing.Size(114, 32);
            this.txtHGroupName.TabIndex = 150;
            this.txtHGroupName.Tag = "0";
            // 
@@ -652,10 +620,9 @@
            this.txtHEmpNumber.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHEmpNumber.Location = new System.Drawing.Point(490, 144);
            this.txtHEmpNumber.Name = "txtHEmpNumber";
            this.txtHEmpNumber.Size = new System.Drawing.Size(139, 38);
            this.txtHEmpNumber.Size = new System.Drawing.Size(105, 32);
            this.txtHEmpNumber.TabIndex = 149;
            this.txtHEmpNumber.Tag = "0";
            this.txtHEmpNumber.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHEmpNumber_KeyDown);
@@ -666,11 +633,10 @@
            this.txtHSourceName.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceName.Location = new System.Drawing.Point(202, 282);
            this.txtHSourceName.Name = "txtHSourceName";
            this.txtHSourceName.ReadOnly = true;
            this.txtHSourceName.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName.TabIndex = 119;
            this.txtHSourceName.Tag = "0";
            // 
@@ -680,12 +646,11 @@
            this.txtHOrderProcNO.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHOrderProcNO.Location = new System.Drawing.Point(490, 178);
            this.txtHOrderProcNO.Multiline = true;
            this.txtHOrderProcNO.Name = "txtHOrderProcNO";
            this.txtHOrderProcNO.ReadOnly = true;
            this.txtHOrderProcNO.Size = new System.Drawing.Size(292, 40);
            this.txtHOrderProcNO.Size = new System.Drawing.Size(220, 33);
            this.txtHOrderProcNO.TabIndex = 148;
            this.txtHOrderProcNO.Tag = "0";
            // 
@@ -695,10 +660,9 @@
            this.label18.BackColor = System.Drawing.Color.Gray;
            this.label18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label18.ForeColor = System.Drawing.Color.Yellow;
            this.label18.Location = new System.Drawing.Point(504, 231);
            this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label18.Location = new System.Drawing.Point(378, 185);
            this.label18.Name = "label18";
            this.label18.Size = new System.Drawing.Size(132, 27);
            this.label18.Size = new System.Drawing.Size(106, 21);
            this.label18.TabIndex = 147;
            this.label18.Text = "订单跟踪号：";
            // 
@@ -708,10 +672,9 @@
            this.label17.BackColor = System.Drawing.Color.Gray;
            this.label17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label17.ForeColor = System.Drawing.Color.Yellow;
            this.label17.Location = new System.Drawing.Point(11, 56);
            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label17.Location = new System.Drawing.Point(8, 45);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(92, 27);
            this.label17.Size = new System.Drawing.Size(74, 21);
            this.label17.TabIndex = 145;
            this.label17.Text = "流水号：";
            // 
@@ -720,10 +683,9 @@
            this.txtHProcNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHProcNo.Location = new System.Drawing.Point(100, 39);
            this.txtHProcNo.Name = "txtHProcNo";
            this.txtHProcNo.Size = new System.Drawing.Size(328, 38);
            this.txtHProcNo.Size = new System.Drawing.Size(247, 32);
            this.txtHProcNo.TabIndex = 146;
            this.txtHProcNo.TextChanged += new System.EventHandler(this.txtHProcNo_TextChanged);
            this.txtHProcNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcNo_KeyDown);
@@ -734,10 +696,9 @@
            this.label13.BackColor = System.Drawing.Color.Gray;
            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label13.ForeColor = System.Drawing.Color.Yellow;
            this.label13.Location = new System.Drawing.Point(496, 318);
            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label13.Location = new System.Drawing.Point(372, 254);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(132, 27);
            this.label13.Size = new System.Drawing.Size(106, 21);
            this.label13.TabIndex = 116;
            this.label13.Text = "任务单数量：";
            // 
@@ -746,10 +707,9 @@
            this.txtHQty.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHQty.Location = new System.Drawing.Point(490, 109);
            this.txtHQty.Name = "txtHQty";
            this.txtHQty.Size = new System.Drawing.Size(292, 38);
            this.txtHQty.Size = new System.Drawing.Size(220, 32);
            this.txtHQty.TabIndex = 117;
            this.txtHQty.Tag = "0";
            this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -761,10 +721,9 @@
            this.cmdHCenterID.BackColor = System.Drawing.Color.Transparent;
            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);
            this.cmdHCenterID.Location = new System.Drawing.Point(317, 108);
            this.cmdHCenterID.Name = "cmdHCenterID";
            this.cmdHCenterID.Size = new System.Drawing.Size(40, 40);
            this.cmdHCenterID.Size = new System.Drawing.Size(30, 32);
            this.cmdHCenterID.TabIndex = 144;
            this.cmdHCenterID.UseVisualStyleBackColor = false;
            this.cmdHCenterID.Click += new System.EventHandler(this.cmdHCenterID_Click);
@@ -775,10 +734,9 @@
            this.label12.BackColor = System.Drawing.Color.Gray;
            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label12.ForeColor = System.Drawing.Color.Yellow;
            this.label12.Location = new System.Drawing.Point(503, 13);
            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label12.Location = new System.Drawing.Point(377, 10);
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(104, 27);
            this.label12.Size = new System.Drawing.Size(84, 21);
            this.label12.TabIndex = 114;
            this.label12.Text = "单 æ® å·ï¼š";
            // 
@@ -788,10 +746,9 @@
            this.label20.BackColor = System.Drawing.Color.Gray;
            this.label20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label20.ForeColor = System.Drawing.Color.Yellow;
            this.label20.Location = new System.Drawing.Point(11, 142);
            this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label20.Location = new System.Drawing.Point(8, 114);
            this.label20.Name = "label20";
            this.label20.Size = new System.Drawing.Size(112, 27);
            this.label20.Size = new System.Drawing.Size(90, 21);
            this.label20.TabIndex = 142;
            this.label20.Text = "工作中心：";
            // 
@@ -801,12 +758,11 @@
            this.txtHBillNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHBillNo.Location = new System.Drawing.Point(490, 5);
            this.txtHBillNo.Multiline = true;
            this.txtHBillNo.Name = "txtHBillNo";
            this.txtHBillNo.ReadOnly = true;
            this.txtHBillNo.Size = new System.Drawing.Size(292, 40);
            this.txtHBillNo.Size = new System.Drawing.Size(220, 33);
            this.txtHBillNo.TabIndex = 115;
            // 
            // txtHCenterID
@@ -815,12 +771,11 @@
            this.txtHCenterID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHCenterID.Location = new System.Drawing.Point(100, 108);
            this.txtHCenterID.Multiline = true;
            this.txtHCenterID.Name = "txtHCenterID";
            this.txtHCenterID.ReadOnly = true;
            this.txtHCenterID.Size = new System.Drawing.Size(287, 40);
            this.txtHCenterID.Size = new System.Drawing.Size(216, 33);
            this.txtHCenterID.TabIndex = 143;
            this.txtHCenterID.TabStop = false;
            // 
@@ -830,12 +785,11 @@
            this.txtHStationInTime.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHStationInTime.Location = new System.Drawing.Point(100, 213);
            this.txtHStationInTime.Multiline = true;
            this.txtHStationInTime.Name = "txtHStationInTime";
            this.txtHStationInTime.ReadOnly = true;
            this.txtHStationInTime.Size = new System.Drawing.Size(328, 40);
            this.txtHStationInTime.Size = new System.Drawing.Size(247, 33);
            this.txtHStationInTime.TabIndex = 113;
            this.txtHStationInTime.Tag = "0";
            // 
@@ -861,11 +815,11 @@
            this.tabPage2.Controls.Add(this.label23);
            this.tabPage2.Controls.Add(this.label22);
            this.tabPage2.Controls.Add(this.label21);
            this.tabPage2.Location = new System.Drawing.Point(4, 25);
            this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage2.Location = new System.Drawing.Point(4, 22);
            this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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, 403);
            this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabPage2.Size = new System.Drawing.Size(744, 320);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "其他信息";
            // 
@@ -875,11 +829,10 @@
            this.txtHSourceName5.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceName5.Location = new System.Drawing.Point(215, 149);
            this.txtHSourceName5.Name = "txtHSourceName5";
            this.txtHSourceName5.ReadOnly = true;
            this.txtHSourceName5.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName5.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName5.TabIndex = 137;
            this.txtHSourceName5.Tag = "0";
            // 
@@ -888,10 +841,9 @@
            this.txtHSourceID5.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceID5.Location = new System.Drawing.Point(113, 149);
            this.txtHSourceID5.Name = "txtHSourceID5";
            this.txtHSourceID5.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID5.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID5.TabIndex = 135;
            this.txtHSourceID5.Tag = "0";
            // 
@@ -899,10 +851,9 @@
            // 
            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);
            this.cmdHSourceID5.Location = new System.Drawing.Point(329, 149);
            this.cmdHSourceID5.Name = "cmdHSourceID5";
            this.cmdHSourceID5.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID5.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID5.TabIndex = 136;
            this.cmdHSourceID5.UseVisualStyleBackColor = false;
            this.cmdHSourceID5.Click += new System.EventHandler(this.cmdHSourceID5_Click);
@@ -913,11 +864,10 @@
            this.txtHSourceName4.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceName4.Location = new System.Drawing.Point(215, 110);
            this.txtHSourceName4.Name = "txtHSourceName4";
            this.txtHSourceName4.ReadOnly = true;
            this.txtHSourceName4.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName4.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName4.TabIndex = 133;
            this.txtHSourceName4.Tag = "0";
            // 
@@ -926,10 +876,9 @@
            this.txtHSourceID4.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceID4.Location = new System.Drawing.Point(113, 110);
            this.txtHSourceID4.Name = "txtHSourceID4";
            this.txtHSourceID4.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID4.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID4.TabIndex = 131;
            this.txtHSourceID4.Tag = "0";
            // 
@@ -937,10 +886,9 @@
            // 
            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);
            this.cmdHSourceID4.Location = new System.Drawing.Point(329, 110);
            this.cmdHSourceID4.Name = "cmdHSourceID4";
            this.cmdHSourceID4.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID4.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID4.TabIndex = 132;
            this.cmdHSourceID4.UseVisualStyleBackColor = false;
            this.cmdHSourceID4.Click += new System.EventHandler(this.cmdHSourceID4_Click);
@@ -951,11 +899,10 @@
            this.txtHSourceName3.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceName3.Location = new System.Drawing.Point(215, 70);
            this.txtHSourceName3.Name = "txtHSourceName3";
            this.txtHSourceName3.ReadOnly = true;
            this.txtHSourceName3.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName3.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName3.TabIndex = 129;
            this.txtHSourceName3.Tag = "0";
            // 
@@ -964,10 +911,9 @@
            this.txtHSourceID3.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceID3.Location = new System.Drawing.Point(113, 70);
            this.txtHSourceID3.Name = "txtHSourceID3";
            this.txtHSourceID3.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID3.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID3.TabIndex = 127;
            this.txtHSourceID3.Tag = "0";
            // 
@@ -975,10 +921,9 @@
            // 
            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);
            this.cmdHSourceID3.Location = new System.Drawing.Point(329, 70);
            this.cmdHSourceID3.Name = "cmdHSourceID3";
            this.cmdHSourceID3.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID3.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID3.TabIndex = 128;
            this.cmdHSourceID3.UseVisualStyleBackColor = false;
            this.cmdHSourceID3.Click += new System.EventHandler(this.cmdHSourceID3_Click);
@@ -989,11 +934,10 @@
            this.txtHSourceName2.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceName2.Location = new System.Drawing.Point(215, 32);
            this.txtHSourceName2.Name = "txtHSourceName2";
            this.txtHSourceName2.ReadOnly = true;
            this.txtHSourceName2.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName2.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName2.TabIndex = 125;
            this.txtHSourceName2.Tag = "0";
            // 
@@ -1002,10 +946,9 @@
            this.txtHSourceID2.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            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);
            this.txtHSourceID2.Location = new System.Drawing.Point(113, 32);
            this.txtHSourceID2.Name = "txtHSourceID2";
            this.txtHSourceID2.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID2.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID2.TabIndex = 123;
            this.txtHSourceID2.Tag = "0";
            // 
@@ -1013,10 +956,9 @@
            // 
            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);
            this.cmdHSourceID2.Location = new System.Drawing.Point(329, 32);
            this.cmdHSourceID2.Name = "cmdHSourceID2";
            this.cmdHSourceID2.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID2.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID2.TabIndex = 124;
            this.cmdHSourceID2.UseVisualStyleBackColor = false;
            this.cmdHSourceID2.Click += new System.EventHandler(this.cmdHSourceID2_Click);
@@ -1027,11 +969,10 @@
            this.txtHPieceQty.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            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);
            this.txtHPieceQty.Location = new System.Drawing.Point(539, 30);
            this.txtHPieceQty.Multiline = true;
            this.txtHPieceQty.Name = "txtHPieceQty";
            this.txtHPieceQty.Size = new System.Drawing.Size(249, 40);
            this.txtHPieceQty.Size = new System.Drawing.Size(188, 33);
            this.txtHPieceQty.TabIndex = 121;
            this.txtHPieceQty.Tag = "0";
            this.txtHPieceQty.Visible = false;
@@ -1042,10 +983,9 @@
            this.label15.BackColor = System.Drawing.Color.Gray;
            this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label15.ForeColor = System.Drawing.Color.Yellow;
            this.label15.Location = new System.Drawing.Point(577, 38);
            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label15.Location = new System.Drawing.Point(433, 30);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(112, 27);
            this.label15.Size = new System.Drawing.Size(90, 21);
            this.label15.TabIndex = 120;
            this.label15.Text = "接收件数：";
            this.label15.Visible = false;
@@ -1055,10 +995,9 @@
            this.label14.AutoSize = true;
            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label14.ForeColor = System.Drawing.Color.Yellow;
            this.label14.Location = new System.Drawing.Point(577, 86);
            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label14.Location = new System.Drawing.Point(433, 69);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(108, 27);
            this.label14.Size = new System.Drawing.Size(88, 21);
            this.label14.TabIndex = 118;
            this.label14.Text = "机      å°ï¼š";
            this.label14.Visible = false;
@@ -1068,10 +1007,9 @@
            this.label24.AutoSize = true;
            this.label24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label24.ForeColor = System.Drawing.Color.Yellow;
            this.label24.Location = new System.Drawing.Point(28, 185);
            this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label24.Location = new System.Drawing.Point(21, 148);
            this.label24.Name = "label24";
            this.label24.Size = new System.Drawing.Size(124, 27);
            this.label24.Size = new System.Drawing.Size(99, 21);
            this.label24.TabIndex = 134;
            this.label24.Text = "生产资源5：";
            // 
@@ -1080,10 +1018,9 @@
            this.label23.AutoSize = true;
            this.label23.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label23.ForeColor = System.Drawing.Color.Yellow;
            this.label23.Location = new System.Drawing.Point(28, 138);
            this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label23.Location = new System.Drawing.Point(21, 110);
            this.label23.Name = "label23";
            this.label23.Size = new System.Drawing.Size(124, 27);
            this.label23.Size = new System.Drawing.Size(99, 21);
            this.label23.TabIndex = 130;
            this.label23.Text = "生产资源4：";
            // 
@@ -1092,10 +1029,9 @@
            this.label22.AutoSize = true;
            this.label22.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label22.ForeColor = System.Drawing.Color.Yellow;
            this.label22.Location = new System.Drawing.Point(28, 88);
            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label22.Location = new System.Drawing.Point(21, 70);
            this.label22.Name = "label22";
            this.label22.Size = new System.Drawing.Size(124, 27);
            this.label22.Size = new System.Drawing.Size(99, 21);
            this.label22.TabIndex = 126;
            this.label22.Text = "生产资源3：";
            // 
@@ -1104,10 +1040,9 @@
            this.label21.AutoSize = true;
            this.label21.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label21.ForeColor = System.Drawing.Color.Yellow;
            this.label21.Location = new System.Drawing.Point(28, 39);
            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label21.Location = new System.Drawing.Point(21, 31);
            this.label21.Name = "label21";
            this.label21.Size = new System.Drawing.Size(124, 27);
            this.label21.Size = new System.Drawing.Size(99, 21);
            this.label21.TabIndex = 122;
            this.label21.Text = "生产资源2：";
            // 
@@ -1117,11 +1052,11 @@
            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
            this.groupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
            this.groupBox1.Location = new System.Drawing.Point(1006, 77);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.groupBox1.Location = new System.Drawing.Point(755, 61);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.groupBox1.Size = new System.Drawing.Size(371, 655);
            this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Size = new System.Drawing.Size(278, 525);
            this.groupBox1.TabIndex = 152;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "本站工单";
@@ -1130,12 +1065,12 @@
            // 
            this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdCardList.Location = new System.Drawing.Point(3, 25);
            this.grdCardList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.grdCardList.Location = new System.Drawing.Point(2, 21);
            this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdCardList.Name = "grdCardList";
            this.grdCardList.RowHeadersWidth = 51;
            this.grdCardList.RowTemplate.Height = 27;
            this.grdCardList.Size = new System.Drawing.Size(365, 628);
            this.grdCardList.Size = new System.Drawing.Size(274, 502);
            this.grdCardList.TabIndex = 150;
            // 
            // panel2
@@ -1146,10 +1081,10 @@
            this.panel2.Controls.Add(this.label19);
            this.panel2.Controls.Add(this.lblCaption);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel2.Location = new System.Drawing.Point(4, 22);
            this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.panel2.Location = new System.Drawing.Point(3, 17);
            this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(1373, 55);
            this.panel2.Size = new System.Drawing.Size(1030, 44);
            this.panel2.TabIndex = 151;
            // 
            // txtHBarCode_Mater
@@ -1157,11 +1092,10 @@
            this.txtHBarCode_Mater.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode_Mater.ForeColor = System.Drawing.Color.Green;
            this.txtHBarCode_Mater.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode_Mater.Location = new System.Drawing.Point(767, 7);
            this.txtHBarCode_Mater.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBarCode_Mater.Location = new System.Drawing.Point(575, 6);
            this.txtHBarCode_Mater.Multiline = true;
            this.txtHBarCode_Mater.Name = "txtHBarCode_Mater";
            this.txtHBarCode_Mater.Size = new System.Drawing.Size(292, 40);
            this.txtHBarCode_Mater.Size = new System.Drawing.Size(220, 33);
            this.txtHBarCode_Mater.TabIndex = 115;
            this.txtHBarCode_Mater.Tag = "0";
            this.txtHBarCode_Mater.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_Mater_KeyDown);
@@ -1172,10 +1106,9 @@
            this.label25.BackColor = System.Drawing.Color.Gray;
            this.label25.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label25.ForeColor = System.Drawing.Color.Yellow;
            this.label25.Location = new System.Drawing.Point(627, 12);
            this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label25.Location = new System.Drawing.Point(470, 10);
            this.label25.Name = "label25";
            this.label25.Size = new System.Drawing.Size(132, 27);
            this.label25.Size = new System.Drawing.Size(106, 21);
            this.label25.TabIndex = 114;
            this.label25.Text = "配件条形码：";
            // 
@@ -1184,11 +1117,10 @@
            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.Location = new System.Drawing.Point(186, 6);
            this.txtHBarCode.Multiline = true;
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(279, 40);
            this.txtHBarCode.Size = new System.Drawing.Size(210, 33);
            this.txtHBarCode.TabIndex = 113;
            this.txtHBarCode.Tag = "0";
            this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
@@ -1199,10 +1131,9 @@
            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.Location = new System.Drawing.Point(120, 10);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(92, 27);
            this.label19.Size = new System.Drawing.Size(74, 21);
            this.label19.TabIndex = 112;
            this.label19.Text = "流转卡：";
            // 
@@ -1213,6 +1144,8 @@
            // 
            // panel1
            // 
            this.panel1.Controls.Add(this.cmdHmrlk);
            this.panel1.Controls.Add(this.cmdHbclk);
            this.panel1.Controls.Add(this.cmdDelLine);
            this.panel1.Controls.Add(this.cmdXZ);
            this.panel1.Controls.Add(this.button2);
@@ -1223,18 +1156,26 @@
            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.Location = new System.Drawing.Point(0, 589);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1381, 81);
            this.panel1.Size = new System.Drawing.Size(1036, 65);
            this.panel1.TabIndex = 115;
            // 
            // cmdDelLine
            // 
            this.cmdDelLine.Location = new System.Drawing.Point(198, 10);
            this.cmdDelLine.Name = "cmdDelLine";
            this.cmdDelLine.Size = new System.Drawing.Size(85, 42);
            this.cmdDelLine.TabIndex = 125;
            this.cmdDelLine.Text = "删    è¡Œ";
            this.cmdDelLine.UseVisualStyleBackColor = true;
            this.cmdDelLine.Click += new System.EventHandler(this.cmdDelLine_Click);
            // 
            // cmdXZ
            // 
            this.cmdXZ.Location = new System.Drawing.Point(20, 12);
            this.cmdXZ.Margin = new System.Windows.Forms.Padding(4);
            this.cmdXZ.Location = new System.Drawing.Point(15, 10);
            this.cmdXZ.Name = "cmdXZ";
            this.cmdXZ.Size = new System.Drawing.Size(113, 52);
            this.cmdXZ.Size = new System.Drawing.Size(85, 42);
            this.cmdXZ.TabIndex = 124;
            this.cmdXZ.Text = "新    å¢ž";
            this.cmdXZ.UseVisualStyleBackColor = true;
@@ -1243,10 +1184,9 @@
            // 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.Location = new System.Drawing.Point(567, 10);
            this.button2.Name = "button2";
            this.button2.Size = new System.Drawing.Size(113, 52);
            this.button2.Size = new System.Drawing.Size(85, 42);
            this.button2.TabIndex = 123;
            this.button2.Text = "反审核";
            this.button2.UseVisualStyleBackColor = true;
@@ -1255,10 +1195,9 @@
            // 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.Location = new System.Drawing.Point(475, 10);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(113, 52);
            this.button1.Size = new System.Drawing.Size(85, 42);
            this.button1.TabIndex = 122;
            this.button1.Text = "审  æ ¸";
            this.button1.UseVisualStyleBackColor = true;
@@ -1266,10 +1205,9 @@
            // 
            // cmdHDelBill
            // 
            this.cmdHDelBill.Location = new System.Drawing.Point(1009, 12);
            this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHDelBill.Location = new System.Drawing.Point(757, 10);
            this.cmdHDelBill.Name = "cmdHDelBill";
            this.cmdHDelBill.Size = new System.Drawing.Size(113, 52);
            this.cmdHDelBill.Size = new System.Drawing.Size(85, 42);
            this.cmdHDelBill.TabIndex = 121;
            this.cmdHDelBill.Text = "删除领料单";
            this.cmdHDelBill.UseVisualStyleBackColor = true;
@@ -1278,10 +1216,9 @@
            // 
            // cmdXG
            // 
            this.cmdXG.Location = new System.Drawing.Point(143, 12);
            this.cmdXG.Margin = new System.Windows.Forms.Padding(4);
            this.cmdXG.Location = new System.Drawing.Point(107, 10);
            this.cmdXG.Name = "cmdXG";
            this.cmdXG.Size = new System.Drawing.Size(113, 52);
            this.cmdXG.Size = new System.Drawing.Size(85, 42);
            this.cmdXG.TabIndex = 120;
            this.cmdXG.Text = "ä¿®    æ”¹";
            this.cmdXG.UseVisualStyleBackColor = true;
@@ -1289,38 +1226,45 @@
            // 
            // cmdAddNew
            // 
            this.cmdAddNew.Location = new System.Drawing.Point(879, 12);
            this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4);
            this.cmdAddNew.Location = new System.Drawing.Point(847, 11);
            this.cmdAddNew.Name = "cmdAddNew";
            this.cmdAddNew.Size = new System.Drawing.Size(113, 52);
            this.cmdAddNew.Size = new System.Drawing.Size(85, 42);
            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
            // cmdHbclk
            // 
            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);
            this.cmdHbclk.Location = new System.Drawing.Point(659, 5);
            this.cmdHbclk.Name = "cmdHbclk";
            this.cmdHbclk.Size = new System.Drawing.Size(85, 28);
            this.cmdHbclk.TabIndex = 126;
            this.cmdHbclk.Text = "保存列宽";
            this.cmdHbclk.UseVisualStyleBackColor = true;
            this.cmdHbclk.Click += new System.EventHandler(this.cmdHbclk_Click);
            // 
            // cmdHmrlk
            // 
            this.cmdHmrlk.Location = new System.Drawing.Point(659, 33);
            this.cmdHmrlk.Name = "cmdHmrlk";
            this.cmdHmrlk.Size = new System.Drawing.Size(85, 28);
            this.cmdHmrlk.TabIndex = 127;
            this.cmdHmrlk.Text = "默认列宽";
            this.cmdHmrlk.UseVisualStyleBackColor = true;
            this.cmdHmrlk.Click += new System.EventHandler(this.cmdHmrlk_Click);
            // 
            // MES_StationInBill
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = System.Drawing.Color.Gray;
            this.ClientSize = new System.Drawing.Size(1381, 817);
            this.ClientSize = new System.Drawing.Size(1036, 654);
            this.Controls.Add(this.gbUp);
            this.Controls.Add(this.panel1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.KeyPreview = true;
            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "MES_StationInBill";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "进站接收单";
@@ -1432,5 +1376,7 @@
        private System.Windows.Forms.TextBox txtHBarCode_Mater;
        private System.Windows.Forms.Label label25;
        private System.Windows.Forms.Button cmdDelLine;
        private System.Windows.Forms.Button cmdHmrlk;
        private System.Windows.Forms.Button cmdHbclk;
    }
}