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

jhz

2022-10-09 76a6a6c378c6511f988e0b71dbec5e9e05782dac

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

 DAL/DAL.csproj

@@ -86,6 +86,7 @@
    <Compile Include="基础资料\InterFace基础资料\ClsIF_ORGANIZATIONS_View.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_FactoryDayOff_Ctl.cs" />
    <Compile Include="基础资料\公用基础资料\ClsGy_FactoryDayOff_View.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_MateMould_Ctl.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_QCCheckProject_View.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_StdWorkTimes_Ctl.cs" />
    <Compile Include="源单\ERP源单\Cls_S_Sc_ABJJD.cs" />

 DAL/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_MateMould_Ctl.cs

New file
@@ -0,0 +1,197 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;

namespace DAL
{
    public class ClsGy_MateMould_Ctl : DBUtility.ClsGy_Base_Ctl
    {
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public string HOldNumber;
        public List<Model.ClsGy_MateMould_Model> DetailColl = new List<Model.ClsGy_MateMould_Model>();

        //反审核
        public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                oCn.RunProc(" Update Gy_MateMouldInfo set HChecker='',HCheckDate=null Where HItemID=" + lngBillKey.ToString());
                sReturn = "";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                return false;
            }
        }

        //审核
        public bool CheckBill(Int64 lngBillKey, ref string sReturn)
        {

            try
            {
                oCn.RunProc(" Update Gy_MateMouldInfo set HUsed=0,HChecker='" + DBUtility.ClsPub.CurUserName + "',HCheckDate='" + DBUtility.ClsPub.GetServerDate(-1) + "' Where HItemID=" + lngBillKey.ToString());
                //将其他 å·¥ä»·è®¾ç½®ä¸º åœç”¨
                oCn.RunProc(" exec h_p_Gy_MateMouldStopflag   " + lngBillKey.ToString());
                //
                sReturn = "";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                return false;
            }
        }


        //新增
        public override bool AddNew()
        {

            try
            {
                oCn.BeginTran();
                //插入子表
                foreach (Model.ClsGy_MateMould_Model oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Gy_MateMouldInfo " +
                        " (HMaterID,HRelationID,HUnitID" +
                        ",HBeginDate,HEndDate" +
                        ",HUsed,HRemark,HMaker,HMakeDate)" +
                        " values(" + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() + "," + oSub.HUnitID.ToString() +
                        ",'" + oSub.HBeginDate.ToShortDateString() + "','" + oSub.HEndDate.ToShortDateString() + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
                }
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }

        //修改
        public override bool ModifyByID(Int64 sItemID)
        {
            try
            {
                oCn.BeginTran();
                DeleteByID(sItemID);        //删除记录
                //插入表
                foreach (Model.ClsGy_MateMould_Model oSub in DetailColl)
                {
                    oCn.RunProc("Insert into Gy_MateMouldInfo " +
                        " (HMaterID,HRelationID,HUnitID" +
                        ",HBeginDate,HEndDate" +
                        ",HUsed,HRemark,HMaker,HMakeDate)" +
                        " values(" + oSub.HMaterID.ToString() + "," + oSub.HRelationID.ToString() + "," + oSub.HUnitID.ToString() +
                        ",'" + oSub.HBeginDate.ToShortDateString() + "','" + oSub.HEndDate.ToShortDateString() + "'," + Convert.ToString(oSub.HUsed ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HMaker + "','" + oSub.HMakeDate + "') ");
                }
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                throw (e);
            }
        }

        //显示单据
        public bool ShowBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //查询主表
                DataSet DsSub = new DataSet();
                DsSub = oCn.RunProcReturn("Select * from Gy_MateMouldInfo Where HitemID=" + lngBillKey.ToString(), "Gy_MateMouldInfo");
                DetailColl.Clear();//清空
                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
                {
                    Model.ClsGy_MateMould_Model oSub = new Model.ClsGy_MateMould_Model();
                    oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
                    oSub.HRelationID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HRelationID"]);
                    oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
                    oSub.HBeginDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HBeginDate"]);
                    oSub.HEndDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEndDate"]);
                    oSub.HRemark = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRemark"]);
                    oSub.HMaker = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMaker"]);
                    oSub.HMakeDate = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMakeDate"]);
                    oSub.HChecker = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HChecker"]);
                    oSub.HCheckDate = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCheckDate"]);

                    DetailColl.Add(oSub);
                }
                sReturn = "显示单据成功！";
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                return false;
            }
        }

        //批改单据
        //public bool BatchModifyBill(Int64 lngBillKey, double sPrice, ref string sReturn)
        //{
        //    try
        //    {
        //        oCn.BeginTran();
        //        oCn.RunProc(" Update Gy_MateMouldInfo set HPrice=" + sPrice.ToString() + "  Where HItemID=" + lngBillKey.ToString());
        //        sReturn = "修改单据成功！";
        //        oCn.Commit();
        //        return true;
        //    }
        //    catch (Exception e)
        //    {
        //        sReturn = e.Message;
        //        oCn.RollBack();
        //        return false;
        //    }
        //}

        //根据物料和工序返回工价   //b å•ä»·ä¸ºture，定额为false
        //public double LoadProcPrice(Int64 sMaterID, Int64 sProcID, Int64 sSourceID, bool b)
        //{
        //    double sPrice = 0;
        //    try
        //    {
        //        //查询主表
        //        DataSet DsSub = new DataSet();
        //        DsSub = oCn.RunProcReturn("Select top 1 * from Gy_ProcPrice Where HStopflag=0 and HEndDate>=convert(varchar(10),Getdate(),120)  and HChecker<>''  and HMaterID=" + sMaterID.ToString() + " and HProcID=" + sProcID.ToString() + " and HSourceID=" + sSourceID.ToString(), "Gy_ProcPrice");
        //        if (DsSub == null)
        //        {
        //            return 0;
        //        }
        //        if (b)
        //        {
        //            sPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HPrice"]);
        //        }
        //        else
        //        {
        //            sPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[0]["HFixPrice"]);
        //        }
        //        return sPrice;
        //    }
        //    catch (Exception e)
        //    {
        //        return 0;
        //    }
        //}

        //构造函数
        public ClsGy_MateMould_Ctl()
        {
            MvarItemKey = "Gy_MateMouldInfo";
            MvarReportTitle = "模具对应产品资料";
        }
    }
}

 Model/Model.csproj

@@ -290,6 +290,7 @@
    <Compile Include="基础资料\其他基础资料\ClsGy_CostCenterDeptRelation_Model.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_CostItemAccount_Model.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_MateMouldInfo_Model.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_MateMould_Model.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_MatePriceProperty_Model.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_QCCheckProjectMain.cs" />
    <Compile Include="基础资料\其他基础资料\ClsGy_QCCheckProjectSub.cs" />

 Model/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_MateMould_Model.cs

New file
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace Model
{
    public class ClsGy_MateMould_Model :  DBUtility.ClsGy_Base_Model
    {
        public long HItemID;
        public long HMaterID;
        public long HRelationID;
        public long HUnitID;
        public bool HUsed;         //当前正在启用
        public DateTime HBeginDate;
        public DateTime HEndDate;
        public string HRemark;
        public string HMaker;
        public string HMakeDate;
        public string HChecker;
        public string HCheckDate;
        public string HType;
        public long HMouldQty;
    }
}

 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs

@@ -823,7 +823,7 @@
                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                                                                                                                    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                        LSHlen = 5;
                        LSHlen = 4;
                        if (sTMNumber.Length != 16)
                        {
                            MessageBox.Show("条码长度不够16位，是否数据不全！制造本部1位:[0] + æœºåž‹ä»£ç 5位:[" + HModelName + "] + å¹´æœˆæ—¥5位:["+ HBarCodeDate + "] + æ‰¹æ¬¡å·2位:[" + HBarCodeBatchNo  + "]+ åŽ‹ç¼©æœº1位:["+ HYasuoji + "]+00 ; ");
@@ -838,7 +838,7 @@
                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                                                                                                                    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                        LSHlen = 5;
                        LSHlen = 4;
                        if (sTMNumber.Length != 18)
                        {
                            MessageBox.Show("条码长度不够18位，是否数据不全！物料代码11位:["+ HMaterNumber.Replace(".", "") + "]+年月日5位:["+ HBarCodeDate + "]+批次号2位:[" + HBarCodeBatchNo  + "];");
@@ -868,6 +868,7 @@
                    HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
                    HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
                    n = 0;
                    int nn = 0;
                    for (int i = k; i < HBQty; i++)
                    {
                        if (HSumQty - HMinQty > 0)
@@ -984,8 +985,11 @@
                        grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
                        k = k + 1;
                        n = n + 1;
                        oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                        //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
                        nn = nn + 1;
                    }
                    //后台批量执行语句
                    oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
                }
            }
            string HWei = "";      //尾数

 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -770,5 +770,87 @@
            }
        }
        #endregion

        #region  æ ¹æ®ç”¨æˆ·ç¼–码查找已分配职员列表
        [Route("Xt_User/UserEmployeelistPlaylist")]
        [HttpGet]
        public object UserEmployeelistPlaylist(string HUserID)
        {
            try
            {

                ds = oCN.RunProcReturn("select HEmployeeID HItemID,职员代码 HNumber,职员名称 HName from h_v_Gy_UserEmployeeRelationList where HUserID='" + HUserID + "' ", "h_v_Gy_UserEmployeeRelationList");
                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)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ç”¨æˆ·å…³è”职员保存
        [Route("Xt_User/SaveUserEmployee")]
        [HttpPost]
        public object SaveUserEmployee([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();

            ListModels oListModels = new ListModels();
            try
            {
                List<Models.Employee> lsmain = new List<Models.Employee>();
                msg2 = msg2.Substring(1, msg2.Length - 2);
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Employee(msg2);
                oCN.BeginTran();
                //删除已经关联的数据
                oCN.RunProc("Delete From Gy_UserEmployeeRelation  where HUserID='" + msg3.ToString() + "'");
                foreach (Models.Employee oItem in lsmain)
                {
                    //重新写入关联数据
                    oCN.RunProc("insert into Gy_UserEmployeeRelation (HEmployeeID,HUserID) values ('" + oItem.HItemID + "','" + msg3.ToString() + "')");
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs

@@ -29,6 +29,7 @@
            public int HOrgID;//组织
            public string HPZStatus;//品质确认
            public string HCKStatus;//仓库接收
            public string Arbitrarily;//任意参数
        }

        [Route("Cj_CallGoodsBillBack/CallGoodsBillBackMainList")]
@@ -57,8 +58,25 @@
                }

                CallGoodsBill ca = JsonConvert.DeserializeObject<CallGoodsBill>(sWhere);
                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +
                    $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'", "h_p_JIT_BackGoodsBillList_Query");
                oCN.RunProc($"exec h_p_JIT_BackGoodsBillList_Query '{ca.HBillNo}','{ca.MaterialNumber}','{ca.MaterialName}','{ca.MaterialModel}'," +
                    $"'{ca.ProcMul}','{ca.HDeptName}',{ca.HOrgID},'{ca.Hmaker}','{ca.HPZStatus}','{ca.HCKStatus}','{ca.HBeginDate}','{ca.HEndDate.AddDays(1).AddSeconds(-1)}'");

                if (ca.HPZStatus == "全部" && ca.HCKStatus == "全部")
                {
                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query1 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query1");
                }
                else if (ca.HPZStatus != "全部" && ca.HCKStatus == "全部")
                {
                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query2 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query2");
                }
                else if (ca.HPZStatus == "全部" && ca.HCKStatus != "全部")
                {
                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query3 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query3");
                }
                else if (ca.HPZStatus != "全部" && ca.HCKStatus != "全部")
                {
                    ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsBillList_Query4 where 1=1 " + ca.Arbitrarily + "", "##h_p_JIT_BackGoodsBillList_Query4");
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/Controllers/CJGL/Cj_SendGoodsBillController.cs

@@ -29,6 +29,7 @@
            public string MaterialCode { get; set; }
            public string MaterialName { get; set; }
            public string MaterialModel { get; set; }
            public string Arbitrarily { get; set; }
            public int? HOrgID;
        }

@@ -60,8 +61,10 @@
                //反序列化传递的值
                JIT_SendGoodsBill com = JsonConvert.DeserializeObject<JIT_SendGoodsBill>(sWhere.ToString());

                ds = oCN.RunProcReturn($"exec h_p_JIT_DeptCheckGoodsBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.HDeptName}'," +
                   $"'{com.MaterialCode}','{com.MaterialName}','{com.MaterialModel}','{com.HOrgID}'", "h_p_JIT_DeptCheckGoodsBillList_Query");
               oCN.RunProc($"exec h_p_JIT_DeptCheckGoodsBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.HDeptName}'," +
                   $"'{com.MaterialCode}','{com.MaterialName}','{com.MaterialModel}','{com.HOrgID}'");

                ds = oCN.RunProcReturn("select * from ##h_p_JIT_DeptCheckGoodsBillList_Query where 1=1 " + com.Arbitrarily + "", "##h_p_JIT_DeptCheckGoodsBillList_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs

@@ -415,7 +415,44 @@
        #endregion


       

        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•æ ¹æ®ç‰©æ–™ä»£ç æ¨¡ç³Šå›žè½¦æŸ¥è¯¢
        [Route("Cj_StationInBill/GetMessageByMaterNumber")]
        [HttpGet]
        public object GetMessageByMaterNumber(string HMaterNumber)
        {
            try
            {
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from gy_material  where hnumber like '%" + HMaterNumber + "%'", "gy_material");
                //写入信息
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到物料信息！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                objJsonResult.code = "0";
                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




        #region è¿”回工序进站接收单列表
        [Route("Cj_StationInBill/get_Display")]

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -489,7 +489,7 @@
                    oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID;
                    oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo;
                    oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType;
                    oBill.omodel.HLastSubProc = list[i].HLastSubProc;
                    oBill.omodel.HLastSubProc = true;
                    oBill.omodel.HEmpID2 = list[i].HEmpID2;
                    oBill.omodel.HEmpID3 = list[i].HEmpID3;
                    oBill.omodel.HEmpID4 = list[i].HEmpID4;
@@ -499,6 +499,7 @@
                    oBill.omodel.HPriceRate = list[i].HPriceRate;
                    oBill.omodel.HWorkTimes = list[i].HWorkTimes;
                    oBill.omodel.HQCCheckID = list[i].HQCCheckID;
                    oBill.omodel.HMaker = msg4;

                    //string HBillSubType = "3791";
                    //long HInterID = list[0].HInterID;//递入type得到的单据ID

 WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs

New file
@@ -0,0 +1,170 @@
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 Mes_OrderProcFlowAllReportController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

        #region è½¦é—´å·¥åºå…¨ç¨‹è·Ÿè¸ªæŠ¥è¡¨ æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList")]
        [HttpGet]
        public object OrderProcFlowAllReportList(string sWhere)
        {
            try
            {
                //反序列化传递的值

                ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport " +sWhere+"", "h_p_Mes_OrderProcFlowAllReport");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥åºåœ¨åˆ¶å“æŠ¥è¡¨(纵向) æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/WIPProcReportList")]
        [HttpGet]
        public object WIPProcReportList(string sWhere)
        {
            try
            {
                //反序列化传递的值

                ds = oCN.RunProcReturn($"exec h_p_MES_WIPProcReport_New " + sWhere + "", "h_p_MES_WIPProcReport_New");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä¸è‰¯æ˜Žç»†è‰¯çŽ‡æŠ¥è¡¨ æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/DefectiveDetailedYieldReportList")]
        [HttpGet]
        public object DefectiveDetailedYieldReportList(string sWhere)
        {
            try
            {
                //反序列化传递的值

                ds = oCN.RunProcReturn("select * from h_v_DefectiveDetailedYieldReport where 1=1 "+sWhere+" order by HProcID", "h_v_DefectiveDetailedYieldReport");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä¸è‰¯æ˜Žç»†è‰¯çŽ‡æŠ¥è¡¨ æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/StationOutSumReportList")]
        [HttpGet]
        public object StationOutSumReportList(string sWhere)
        {
            try
            {
                //反序列化传递的值

                ds = oCN.RunProcReturn("exec h_p_Sc_StationOutSumReport_New " + sWhere + "", "h_p_Sc_StationOutSumReport_New");

                List<object> listCol = new List<object>();
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    listCol.Add(JsonConvert.DeserializeObject(str));
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = listCol;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/Gy_MateMouldController.cs

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

namespace WebAPI.Controllers
{
    public class Gy_MateMouldController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;

        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;

        /// <summary>
        /// è¿”回产品与器具清单列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_MateMould/list")]
        [HttpGet]
        public object list(string sWhere, string user, string Organization)
        {
            try
            {
                //编辑权限
                //if (!DBUtility.ClsPub.Security_Log_second("Gy_MateMould", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                string sql1 = string.Format(@"select * from h_v_Gy_MateMouldInfoList where 1 =1 ");//where ç»„织名称='" + Organization + "'
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID ", "h_v_Gy_MateMouldInfoList");
                }
                else
                {
                    string sql = sql1 + sWhere + " order by HItemID";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_MateMouldInfoList");
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_MateMould/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {

                ds = oCN.RunProcReturn("select * from h_v_Gy_MateMouldInfoList where HitemID=" + HInterID, "h_v_Gy_MateMouldInfoList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    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)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #region äº§å“ä¸Žå™¨å…·æ¸…单保存
        [Route("Gy_MateMould/set_SaveBill")]
        [HttpPost]
        public object set_SaveBill([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            //保存单据
            return objJsonResult = AddBillMain(msg1);
        }

        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string OperationType = sArray[2].ToString().Trim();
            string msg4 = sArray[3].ToString();
            bool bResult;
            try
            {
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                msg2 = "[" + msg2.ToString() + "]";
                List<ClsGy_MateMould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MateMould>>(msg2);
                List<ClsGy_MateMould> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MateMould>>(msg3);
                DAL.ClsGy_MateMould_Ctl BillNew = new DAL.ClsGy_MateMould_Ctl();
                BillNew.DetailColl = new List<Model.ClsGy_MateMould_Model>();
                Model.ClsGy_MateMould_Model BillOld = new Model.ClsGy_MateMould_Model();
                for (int i = 0; i < subList.ToArray().Length; i++)
                {
                    if (i >= 0)//HQty
                    {
                        Model.ClsGy_MateMould_Model oSub = new Model.ClsGy_MateMould_Model();
                        oSub.HMaterID = DBUtility.ClsPub.isLong(subList[i].HMaterIDCol);
                        oSub.HRelationID = DBUtility.ClsPub.isLong(subList[i].HRelationIDCol);
                        oSub.HUnitID = DBUtility.ClsPub.isLong(subList[i].HUnitIDCol);
                        oSub.HBeginDate = DBUtility.ClsPub.isDate(subList[i].HBeginDateCol);
                        oSub.HEndDate = DBUtility.ClsPub.isDate(subList[i].HEndDateCol);
                        oSub.HUsed = false;
                        oSub.HMaker = DBUtility.ClsPub.isStrNull(mainList[0].HMaker);
                        oSub.HMakeDate = DateTime.Today.ToString();
                        oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemarkCol);
                        BillNew.DetailColl.Add(oSub);
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "无明细行信息!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                //保存完毕后处理
                if (OperationType.Equals("1.1") || OperationType.Equals("1.2") || OperationType.Equals("2"))
                {
                    bResult = BillNew.AddNew();
                }
                else
                {
                    bResult = BillNew.ModifyByID(DBUtility.ClsPub.isLong(mainList[0].HItemID));
                }
                //提示
                if (bResult == true)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    //objJsonResult.Message = "保存失败!原因:" + ClsPub.sExeReturnInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ç¼–辑时返回产品与器具清单信息
        [Route("Gy_MateMould/GetMateMouldValue")]
        [HttpGet]
        public object GetMateMouldValue(int HItemID)
        {
            try
            {
                ds = oCN.RunProcReturn("select " +
                    "a.HItemID,ltrim(a.HMaterID)+'-'+ltrim(a.HRelationID) æ¨¡å…·äº§å“å¯¹åº”表代码,a.HUnitID,b.HName HRelationNameCol" +
                    ",b.HNumber HRelationNumberCol,a.HMaterID HMaterIDCol,c.HNumber HMaterNumberCol,c.HName HMaterNameCol,c.HModel HMaterModelCol" +
                    ",a.HRelationID HRelationIDCol,d.HNumber HUnitNumberCol,d.HName HUnitNameCol" +
                    ",a.HUnitID HUnitIDCol" +
                    ",a.HBeginDate HBeginDateCol,a.HEndDate HEndDateCol" +
                    ",a.HRemark HRemarkCol " +
                    " from Gy_MateMouldInfo a " +
                    " left join h_v_Gy_Mould b on a.HRelationID = b.HItemID " +
                    " left join Gy_Material c on a.HMaterID = c.HItemID " +
                    " left join Gy_Unit d on a.HUnitID = d.HItemID where a.HItemID = " + HItemID, "Gy_MateMouldInfo");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    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)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/LMESController.cs

@@ -174,13 +174,13 @@
        /// <returns></returns>
        [Route("LEMS/MES_Sc_ProcessExchangeIssue")]
        [HttpGet]
        public object MES_Sc_ProcessExchangeIssue(string HGroupID, string HSourceID, string HEntryId)
        public object MES_Sc_ProcessExchangeIssue(string HGroupID, string HSourceID, string HSourceSub1ID, string HSourceSub2ID, string HSourceSub3ID, string HEntryId)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn($"exec REALESE_Sc_ProcessExchangeIssue '{HGroupID}','{HSourceID}','{HEntryId}' ", "REALESE_Sc_ProcessExchangeIssue");
                ds = oCN.RunProcReturn($"exec REALESE_Sc_ProcessExchangeIssue '{HGroupID}','{HSourceID}','{HSourceSub1ID}','{HSourceSub2ID}','{HSourceSub3ID}','{HEntryId}' ", "REALESE_Sc_ProcessExchangeIssue");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
@@ -196,7 +196,42 @@
                return objJsonResult;
            }
        }

        /// <summary>
        /// å·¥åºæµè½¬å¡æŒ‡æ´¾æ—¥æœŸ
        /// </summary>
        /// <returns></returns>
        [Route("LEMS/MES_Sc_ProcessExchangePlanDate")]
        [HttpGet]
        public object MES_Sc_ProcessExchangePlanDate(string HPlanBeginDate, string HPlanEndDate, string HEntryId)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"
update Sc_ProcessExchangeBillSub set 
HPlanBeginDate = '{0}', 
HPlanEndDate = '{1}' 
where cast(HInterID as varchar(20))  +'-'+  cast(HEntryID as varchar(20)) in 
(
 select * from fn_Split('{2}',',')
)", HPlanBeginDate, HPlanEndDate, HEntryId);
                oCN.RunProc(sql);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// å·¥åºæµè½¬å¡åä¸‹è¾¾
        /// </summary>

 WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs

@@ -30,6 +30,7 @@
            public DateTime HEndDate { get; set; }//结束时间
            public string ProcMul { get; set; }//工段
            public string Hmaker { get; set; }//当前登录人
            public string Arbitrarily { get; set; }//任意参数
        }

        [Route("Sc_CallGoodsBackRequestBill/JIT_CallGoodsBackRequestBillList")]
@@ -58,8 +59,10 @@
                //反序列化传递的值
                CallGoodsBackRequest com = JsonConvert.DeserializeObject<CallGoodsBackRequest>(sWhere.ToString());

                ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +
                    $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'", "h_p_JIT_BackGoodsRequestBillList_Query");
                oCN.RunProc($"exec h_p_JIT_BackGoodsRequestBillList_Query '{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}','{com.HBillNo}','{com.MaterialNumber}'," +
                        $"'{com.MaterialName}','{com.MaterialModel}','{com.HDeptName}','{com.ProcMul}','{com.Hmaker}','{com.HOrgID}'");

                ds = oCN.RunProcReturn("select * from ##h_p_JIT_BackGoodsRequestBillList_Query where 1=1 " + com.Arbitrarily + "", "##h_p_JIT_BackGoodsRequestBillList_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -236,7 +239,7 @@
                for (int i = 0; i < listCa.Count; i++)
                {
                    ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_WHReceive {listCa[i].hmainid},{listCa[i].Hsubid}," +
                 $"{listCa[i].HSPID},{user}", "h_p_JIT_BackGoods_WHReceive");
                 $"{listCa[i].HSPID},'{user}'", "h_p_JIT_BackGoods_WHReceive");

                    if (ds.Tables[0].Rows[0][0].ToString() == "1")
                    {

 WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs

@@ -40,6 +40,7 @@
            public DateTime HEndDate { get; set; }//结束时间
            public int ps { get; set; }//仅显示未完全配送
            public string user { get; set; }//当前登录人
            public string Arbitrarily { get; set; }//任意参数
        }

        [Route("Sc_ComplementGoodBill/ComplementGoodBillList")]
@@ -68,11 +69,13 @@
                //反序列化传递的值
                ComplementGoodBill com = JsonConvert.DeserializeObject<ComplementGoodBill>(sWhere.ToString());

                    ds = oCN.RunProcReturn($"exec h_p_JIT_CallGoodsPlatForm_Query '{com.HSeOrderBillNo}','{com.DepartmentName}','{com.MaterialNumber}','{com.MaterialName}'," +
                    $"'{com.MaterialModel}','{com.HICMOBillNo}','{com.CPNumber}','{com.CPName}','{com.CPModel}','{com.HBeginDate}','{com.HEndDate.AddDays(1).AddSeconds(-1)}'," +
                    $"{com.ps},{com.Organization},'{com.user}' ", "h_p_JIT_CallGoodsPlatForm_Query");
                   oCN.RunProc($"exec h_p_JIT_CallGoodsPlatForm_Query '{com.HSeOrderBillNo}','{com.DepartmentName}','{com.MaterialNumber}','{com.MaterialName}'," +
                    $"'{com.MaterialModel}','{com.HICMOBillNo}','{com.CPNumber}','{com.CPName}','{com.CPModel}'," +
                    $"{com.ps},{com.Organization},'{com.user}' ");

                objJsonResult.code = "1";
                ds = oCN.RunProcReturn("select * from ##h_p_JIT_CallGoodsPlatForm_Query where 1=1 " + com.Arbitrarily + "", "##h_p_JIT_CallGoodsPlatForm_Query");

               objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
@@ -415,7 +418,7 @@
                {
                    if (listCa[i].退料数量 > 0)
                    {
                        if (listCa[i].退料数量 > listCa[i].已配送数量)
                        if (listCa[i].退料数量 > listCa[i].已配送数量&& listCa[i].已配送数量>0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -424,7 +427,7 @@
                            return objJsonResult;
                        }

                        ds = oCN.RunProcReturn("select sum(d.HQty) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " +
                        ds = oCN.RunProcReturn("select isnull(sum(d.HQty),0) HQty from JIT_CallGoodsBackRequestBillSub c inner join JIT_CallGoodsBackBillSub d on c.HInterID = d.HSourceInterID and c.HEntryID = d.HSourceEntryID and c.HMaterID = d.HMaterID " +
                   $"where c.HSourceInterID={listCa[i].HSouceInterID} and c.HSourceEntryID ={listCa[i].HSourceEntryID} and c.HSourceBillNo = '{listCa[i].HSourceBillNo}' and c.HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");

                        if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()==""?"0": ds.Tables[0].Rows[0][0].ToString()) +listCa[i].退料数量) > listCa[i].已叫料数量)
@@ -570,7 +573,7 @@
                {
                    if (listCa[i].退料数量 > 0)
                    {
                        if (listCa[i].退料数量 > listCa[i].已配送数量)
                        if (listCa[i].退料数量 > listCa[i].已配送数量 && listCa[i].已配送数量 > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
@@ -667,7 +670,7 @@
                {
                    if (listCa[i].退料数量 > 0)
                    {
                        if (listCa[i].退料数量 > listCa[i].已配送数量)
                        if (listCa[i].退料数量 > listCa[i].已配送数量 && listCa[i].已配送数量 > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;

 WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs

@@ -32,6 +32,7 @@
            public string HDeptName { get; set; }//部门
            public string HJLStatus { get; set; }//拣料状态
            public string user { get; set; }//制单人
            public string Arbitrarily { get; set; }//任意参数
        }

        [Route("Sc_ComplementGoods/ComplementGoodsList")]
@@ -60,9 +61,21 @@
                //反序列化传递的值
                ComplementGoods com = JsonConvert.DeserializeObject<ComplementGoods>(sWhere.ToString());

                oCN.RunProc($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
                       $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'");

                ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoodsBillList_Query '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
                    $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query");
                if (com.HJLStatus == "未拣料")
                {
                    ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query1 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query1");
                }
                else if (com.HJLStatus == "已拣料")
                {
                    ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query2 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query2");
                }
                else
                {
                    ds = oCN.RunProcReturn("select * from ##ComplementGoodsBillList_Query3 where 1=1 " + com.Arbitrarily + "", "##ComplementGoodsBillList_Query3");
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -41,7 +41,7 @@
                omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);

                ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
                    $",'{omdelMian.HPlanEndDate.AddDays(1).AddSeconds(-1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
                    $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -187,6 +187,7 @@
                        var HOrderLev = list[i]["订单等级"].ToString();
                        var HMainSourceInterID = list[i]["源单主内码"].ToString();
                        var HMainSourceEntryID = list[i]["源单子内码"].ToString();
                        var HPlanQty = list[i]["计划数量"].ToString();

                        if (HSourceID == "")
                        {
@@ -219,14 +220,14 @@
                            " HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
                            " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
                            "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
                            "HMainSourceInterID,HMainSourceEntryID)values" +
                            "HMainSourceInterID,HMainSourceEntryID,HICMOInterID_Sec,HICMOEntryID_Sec,HPlanQty)values" +
                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
                            $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
                            $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
                            $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
                            $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
                            $"{HMainSourceInterID},{HMainSourceEntryID})");
                            $"{HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HPlanQty})");
                    }

                    oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["日计划数量总量"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["单据号"].ToString(): HBillNo)}'");
@@ -738,7 +739,7 @@
 from 
(
select sum(HSourceStockInQty)FCXStockInQty,HICMOEntryID_Sec FPRDMOENTYID from SC_WORKBILLSORTBILLMAIN a
--where a.HInterID IN ({0})
where a.HInterID IN ({0})
group by HICMOEntryID_Sec 
) a
join  AIS20210811135644..T_PRD_PPBOM T1  on a.FPRDMOENTYID = t1.FMOENTRYID
@@ -1159,10 +1160,23 @@
        {
            try
            {

                DataSet dt = new DataSet();
                oCN.RunProc("exec h_p_ICMOBillList_PrimarySubTable");
                ds = oCN.RunProcReturn($"select * from  ##ICMOBillList where æºå•ä¸»å†…码 in({hmainid}) and  æºå•å­å†…码 in({HEntryID})", "##ICMOBillList");

                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                {
                    dt = oCN.RunProcReturn($"select * from  h_v_JIT_Sc_WorkBillSortBillList where æºå•ä¸»å†…码 in({ds.Tables[0].Rows[i]["源单主内码"].ToString()}) and  æºå•å­å†…码 in({ds.Tables[0].Rows[i]["源单子内码"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList");
                    if (dt.Tables[0].Rows.Count > 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "生产明细行重复,重复的生产订单号:"+ ds.Tables[0].Rows[i]["生产订单号"].ToString()+",明细行号:"+ ds.Tables[0].Rows[i]["生产订单明细行号"].ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
              
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormImportController.cs

@@ -257,6 +257,7 @@
                        HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
                        var HICMOBillNo = list[i]["生产订单号*"].ToString();
                        var HICMOEntrySEQ = list[i]["生产订单明细行号*"].ToString();
                        var HProdORGID = list[i]["组织编码*"].ToString();
                        var HWorkShopID = list[i]["HWorkShopID"].ToString();
                        var HSourceID = list[i]["HSourceID"].ToString();
                        var HYX = list[i]["优先级"].ToString();
@@ -291,13 +292,13 @@
                            "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
                            " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
                            " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
                            "HMainSourceInterID,HMainSourceEntryID)values" +
                            "HMainSourceInterID,HMainSourceEntryID,HProdORGID,HICMOInterID_Sec,HICMOEntryID_Sec)values" +
                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
                            $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
                            $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
                            $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
                            $" {HMainSourceInterID},{HMainSourceEntryID})");
                            $" {HMainSourceInterID},{HMainSourceEntryID},{HProdORGID}, {HMainSourceInterID},{HMainSourceEntryID})");
                    }

                    int SumDay = 31; //动态两月之差 DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;

 WebAPI/Controllers/WebAPIController.cs

@@ -1380,6 +1380,104 @@
        }

        /// <summary>
        /// èŽ·å–物料列表
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Web/GetMaterList_Json")]
        [HttpGet]
        public object GetMaterList_Json(string sWhere)
        {
            DataSet ds;
            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (sWhere != "")
            {
                sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("Select HItemID,HNumber ç‰©æ–™ä»£ç ,HName ç‰©æ–™,HModel è§„格型号 from Gy_Material where HStopflag=0 " + sWhere + " Order by HItemID ", "Gy_Material");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception e)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// èŽ·å–模具列表
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Web/GetRelationList_Json")]
        [HttpGet]
        public object GetRelationList_Json(string sWhere)
        {
            DataSet ds;
            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (sWhere != "")
            {
                sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("Select HItemID,HNumber æ¨¡å…·ä»£ç ,HName æ¨¡å…·,HModel è§„格型号 from h_v_Gy_Mould where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_Gy_Mould");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败";
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception e)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        /// <summary>
        /// èŽ·å–当前数据库名
        /// </summary>
        /// <returns></returns>

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_PurchaseWallclothBillController.cs

@@ -225,14 +225,6 @@
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Pay_PurchaseWallclothBill_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.BeginTran();
                oCN.RunProc("Delete From Pay_PurchaseWallclothBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From Pay_PurchaseWallclothBillSub where HInterID = " + HInterID);

 WebAPI/ListModels.cs

@@ -1842,6 +1842,18 @@
        }

        /// <summary>
        /// ç”¨æˆ·èŒå‘˜å…³ç³»ä¿¡æ¯è¡¨çš„json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.Employee> getObjectByJson_Employee(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.Employee> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Employee>>(jsonString);
            return list;
        }

        /// <summary>
        /// å…¬å‘Šåˆ—表主表的json
        /// </summary>
        /// <param name="jsonString"></param>

 WebAPI/Models/ClsGy_MateMould.cs

New file
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class ClsGy_MateMould
    {
        public long HMaterIDCol { get; set; }
        public long HRelationIDCol { get; set; }
        public long HUnitIDCol { get; set; }

        public DateTime HBeginDateCol { get; set; }

        public DateTime HEndDateCol { get; set; }

        public string HMaker { get; set; }

        public string HRemarkCol { get; set; }
        public long HItemID { get; set; }
    }
}

 WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs

@@ -64,7 +64,7 @@
     

        public Int64 HMaterID;  //物料内码（gy_material）

        public int HOrgID; //组织ID

    }
}

 WebAPI/Models/Employee.cs

New file
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace WebAPI.Models
{
    public class Employee
    {
        public long HItemID { get; set; }
        public string HNumber { get; set; }
        public string HName { get; set; }
        public string HShortNumber { get; set; }
        public string HRemark { get; set; }
        public string HUseFlag { get; set; }
        public long HParentID { get; set; }
        public string HBarCode { get; set; }
        public long HSecManagerID { get; set; }
        public long HCreateOrgID { get; set; }
        public long HUseOrgID { get; set; }
        public string HHelpCode { get; set; }
        public string HCreator { get; set; }
        public bool HStopflag { get; set; }
        public Int64 HDeptID { get; set; }
        public string HDeptName { get; set; }
        public string HUpDater { get; set; }
        public string HChecker { get; set; }
        public string HDeleteMan { get; set; }
    }
}

 WebAPI/WebAPI.csproj

@@ -321,6 +321,9 @@
    <Compile Include="App_Start\WebApiConfig.cs" />
    <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_TechnologyController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_TechnologyParUnitController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_TechParamByProcController.cs" />
    <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -373,12 +376,14 @@
    <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\Mes_OrderProcFlowAllReportController.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" />
    <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
    <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
    <Compile Include="Controllers\Gy_MateMouldController.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\DataHelper.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\JIT_Cg_PODemandPlanBillController.cs" />
    <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -550,8 +555,10 @@
    <Compile Include="HttpClient.cs" />
    <Compile Include="InvokeHelper.cs" />
    <Compile Include="Log.cs" />
    <Compile Include="Models\ClsGy_MateMould.cs" />
    <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
    <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
    <Compile Include="Models\Employee.cs" />
    <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
    <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
    <Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
@@ -581,6 +588,9 @@
    <Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
    <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
    <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
    <Compile Include="Models\TechnologyParameter.cs" />
    <Compile Include="Models\TechnologyParameterUnit.cs" />
    <Compile Include="Models\TechParamByProc.cs" />
    <Compile Include="Models\其它\ReciveBill_FastModel.cs" />
    <Compile Include="Models\动态列\OptionListModel.cs" />
    <Compile Include="Models\基础资料\Gy_ClassTimePrj.cs" />
@@ -839,6 +849,7 @@
    <Folder Include="Views\Cj_SendGoodsBill\" />
    <Folder Include="Views\Gy_EquipType\" />
    <Folder Include="Views\Gy_ICBomBill\" />
    <Folder Include="Views\Gy_MateMould\" />
    <Folder Include="Views\Gy_RoutingGroup\" />
    <Folder Include="Views\Gy_WorkStation\" />
    <Folder Include="Views\JIT_DayPlanPlatFormBill\" />
@@ -851,6 +862,7 @@
    <Folder Include="Views\KF_PonderationBill\" />
    <Folder Include="Views\kf_StepFoldinBill\" />
    <Folder Include="Views\Kf_StepFoldOutBill\" />
    <Folder Include="Views\Mes_OrderProcFlowAllReport\" />
    <Folder Include="Views\MoveStockBill\" />
    <Folder Include="Views\ProductionPlanReport\" />
    <Folder Include="Views\ProductionReturnBill\" />

 WebAPI/WebAPI.csproj.user

@@ -9,7 +9,7 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>false</UseIISExpress>
    <Use64BitIISExpress />

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

@@ -62,7 +62,6 @@
            this.cmdCancel = new System.Windows.Forms.Button();
            this.lblCaption = new System.Windows.Forms.Label();
            this.gbUp = new System.Windows.Forms.GroupBox();
            this.grdSub = new System.Windows.Forms.DataGridView();
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.txtHGroupName = new System.Windows.Forms.TextBox();
@@ -100,13 +99,14 @@
            this.label23 = new System.Windows.Forms.Label();
            this.label22 = new System.Windows.Forms.Label();
            this.label21 = new System.Windows.Forms.Label();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.grdCardList = new System.Windows.Forms.DataGridView();
            this.panel2 = new System.Windows.Forms.Panel();
            this.txtHBarCode_Mater = new System.Windows.Forms.TextBox();
            this.label25 = new System.Windows.Forms.Label();
            this.txtHBarCode = new System.Windows.Forms.TextBox();
            this.label19 = new System.Windows.Forms.Label();
            this.grdSub = new System.Windows.Forms.DataGridView();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.grdCardList = new System.Windows.Forms.DataGridView();
            this.timer1 = new System.Windows.Forms.Timer(this.components);
            this.panel1 = new System.Windows.Forms.Panel();
            this.cmdHmrlk = new System.Windows.Forms.Button();
@@ -119,13 +119,13 @@
            this.cmdXG = new System.Windows.Forms.Button();
            this.cmdAddNew = new System.Windows.Forms.Button();
            this.gbUp.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
            this.tabControl1.SuspendLayout();
            this.tabPage1.SuspendLayout();
            this.tabPage2.SuspendLayout();
            this.panel2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
            this.groupBox1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).BeginInit();
            this.panel2.SuspendLayout();
            this.panel1.SuspendLayout();
            this.SuspendLayout();
            // 
@@ -134,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, 4, 4, 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;
@@ -149,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, 4, 4, 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);
@@ -165,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 = "产品代码：";
            // 
@@ -178,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, 272);
            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 = "进站时间：";
            // 
@@ -190,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 = "ä»» åŠ¡ å•ï¼š";
            // 
@@ -202,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, 268);
            this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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
@@ -215,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, 4, 4, 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);
@@ -231,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 = "流转卡：";
            // 
@@ -244,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, 4, 4, 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";
            // 
@@ -259,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 = "规格型号：";
            // 
@@ -270,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, 4, 4, 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);
@@ -283,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, 4, 4, 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);
@@ -298,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, 188);
            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 = "接 æ”¶ äººï¼š";
            // 
@@ -309,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, 4, 4, 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);
@@ -322,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, 4, 4, 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);
@@ -336,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 = "生产资源：";
            // 
@@ -348,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, 4, 4, 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";
            // 
@@ -363,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, 58);
            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 = "流转卡数量：";
            // 
@@ -375,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, 4, 4, 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";
            // 
@@ -390,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, 142);
            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 = "接收数量：";
            // 
@@ -401,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, 4, 4, 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);
@@ -414,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, 4, 4, 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);
@@ -428,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, 318);
            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 = "生产班组：";
            // 
@@ -440,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, 4, 4, 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);
@@ -454,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, 4, 4, 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);
@@ -471,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 = "当前工序：";
            // 
@@ -484,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, 4, 4, 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";
            // 
@@ -499,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, 4, 4, 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;
@@ -519,10 +490,9 @@
            // 
            // cmdCancel
            // 
            this.cmdCancel.Location = new System.Drawing.Point(511, 12);
            this.cmdCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
@@ -534,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,35 +517,20 @@
            this.gbUp.Controls.Add(this.panel2);
            this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gbUp.Location = new System.Drawing.Point(0, 0);
            this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Name = "gbUp";
            this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.gbUp.Size = new System.Drawing.Size(1081, 517);
            this.gbUp.Size = new System.Drawing.Size(811, 413);
            this.gbUp.TabIndex = 114;
            this.gbUp.TabStop = false;
            // 
            // grdSub
            // 
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.grdSub.Location = new System.Drawing.Point(0, 517);
            this.grdSub.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.grdSub.Name = "grdSub";
            this.grdSub.ReadOnly = true;
            this.grdSub.RowHeadersWidth = 51;
            this.grdSub.RowTemplate.Height = 27;
            this.grdSub.Size = new System.Drawing.Size(1081, 220);
            this.grdSub.TabIndex = 149;
            // 
            // tabControl1
            // 
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Location = new System.Drawing.Point(4, 81);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabControl1.Location = new System.Drawing.Point(3, 65);
            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(1003, 432);
            this.tabControl1.Size = new System.Drawing.Size(752, 346);
            this.tabControl1.TabIndex = 150;
            // 
            // tabPage1
@@ -625,11 +579,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(995, 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 +593,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, 4, 4, 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 +605,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, 4, 4, 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 +618,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, 4, 4, 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 +631,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, 222);
            this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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 +645,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 +657,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 +668,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, 4, 4, 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 +681,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 +692,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, 4, 4, 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 +706,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, 4, 4, 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 +719,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, 12);
            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 +731,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 +743,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, 4, 4, 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 +756,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, 4, 4, 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 +770,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, 4, 4, 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 +800,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(995, 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 +814,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, 4, 4, 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 +826,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, 4, 4, 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 +836,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, 4, 4, 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 +849,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, 4, 4, 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 +861,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, 4, 4, 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 +871,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, 4, 4, 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 +884,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, 4, 4, 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 +896,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, 4, 4, 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 +906,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, 4, 4, 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 +919,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, 4, 4, 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 +931,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, 4, 4, 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 +941,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, 4, 4, 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 +954,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, 4, 4, 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 +968,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 +980,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 +992,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 +1003,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 +1014,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,39 +1025,11 @@
            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：";
            // 
            // groupBox1
            // 
            this.groupBox1.Controls.Add(this.grdCardList);
            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(1081, 0);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.groupBox1.Size = new System.Drawing.Size(300, 737);
            this.groupBox1.TabIndex = 152;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "本站工单";
            // 
            // grdCardList
            // 
            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.Name = "grdCardList";
            this.grdCardList.RowHeadersWidth = 51;
            this.grdCardList.RowTemplate.Height = 27;
            this.grdCardList.Size = new System.Drawing.Size(294, 710);
            this.grdCardList.TabIndex = 150;
            // 
            // panel2
            // 
@@ -1146,10 +1039,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(1073, 55);
            this.panel2.Size = new System.Drawing.Size(805, 44);
            this.panel2.TabIndex = 151;
            // 
            // txtHBarCode_Mater
@@ -1157,11 +1050,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, 8);
            this.txtHBarCode_Mater.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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 +1064,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 +1075,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, 4, 4, 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,12 +1089,51 @@
            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 = "流转卡：";
            // 
            // grdSub
            // 
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.grdSub.Location = new System.Drawing.Point(0, 413);
            this.grdSub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdSub.Name = "grdSub";
            this.grdSub.ReadOnly = true;
            this.grdSub.RowHeadersWidth = 51;
            this.grdSub.RowTemplate.Height = 27;
            this.grdSub.Size = new System.Drawing.Size(811, 176);
            this.grdSub.TabIndex = 149;
            // 
            // groupBox1
            // 
            this.groupBox1.Controls.Add(this.grdCardList);
            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(811, 0);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Size = new System.Drawing.Size(225, 589);
            this.groupBox1.TabIndex = 152;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "本站工单";
            // 
            // grdCardList
            // 
            this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
            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(221, 566);
            this.grdCardList.TabIndex = 150;
            // 
            // timer1
            // 
@@ -1225,40 +1154,38 @@
            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, 737);
            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
            // 
            // cmdHmrlk
            // 
            this.cmdHmrlk.Location = new System.Drawing.Point(879, 41);
            this.cmdHmrlk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHmrlk.Location = new System.Drawing.Point(659, 33);
            this.cmdHmrlk.Name = "cmdHmrlk";
            this.cmdHmrlk.Size = new System.Drawing.Size(113, 35);
            this.cmdHmrlk.Size = new System.Drawing.Size(85, 28);
            this.cmdHmrlk.TabIndex = 127;
            this.cmdHmrlk.Text = "默认列宽";
            this.cmdHmrlk.UseVisualStyleBackColor = true;
            this.cmdHmrlk.Visible = false;
            this.cmdHmrlk.Click += new System.EventHandler(this.cmdHmrlk_Click);
            // 
            // cmdHbclk
            // 
            this.cmdHbclk.Location = new System.Drawing.Point(879, 6);
            this.cmdHbclk.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdHbclk.Location = new System.Drawing.Point(659, 5);
            this.cmdHbclk.Name = "cmdHbclk";
            this.cmdHbclk.Size = new System.Drawing.Size(113, 35);
            this.cmdHbclk.Size = new System.Drawing.Size(85, 28);
            this.cmdHbclk.TabIndex = 126;
            this.cmdHbclk.Text = "保存列宽";
            this.cmdHbclk.UseVisualStyleBackColor = true;
            this.cmdHbclk.Visible = false;
            this.cmdHbclk.Click += new System.EventHandler(this.cmdHbclk_Click);
            // 
            // cmdDelLine
            // 
            this.cmdDelLine.Location = new System.Drawing.Point(264, 12);
            this.cmdDelLine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.cmdDelLine.Location = new System.Drawing.Point(198, 10);
            this.cmdDelLine.Name = "cmdDelLine";
            this.cmdDelLine.Size = new System.Drawing.Size(113, 52);
            this.cmdDelLine.Size = new System.Drawing.Size(85, 42);
            this.cmdDelLine.TabIndex = 125;
            this.cmdDelLine.Text = "删    è¡Œ";
            this.cmdDelLine.UseVisualStyleBackColor = true;
@@ -1266,10 +1193,9 @@
            // 
            // cmdXZ
            // 
            this.cmdXZ.Location = new System.Drawing.Point(20, 12);
            this.cmdXZ.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
@@ -1278,10 +1204,9 @@
            // button2
            // 
            this.button2.Enabled = false;
            this.button2.Location = new System.Drawing.Point(756, 12);
            this.button2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.button2.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;
@@ -1290,10 +1215,9 @@
            // button1
            // 
            this.button1.Enabled = false;
            this.button1.Location = new System.Drawing.Point(633, 12);
            this.button1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.button1.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;
@@ -1301,10 +1225,9 @@
            // 
            // cmdHDelBill
            // 
            this.cmdHDelBill.Location = new System.Drawing.Point(1009, 12);
            this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
@@ -1313,10 +1236,9 @@
            // 
            // cmdXG
            // 
            this.cmdXG.Location = new System.Drawing.Point(143, 12);
            this.cmdXG.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
@@ -1324,10 +1246,9 @@
            // 
            // cmdAddNew
            // 
            this.cmdAddNew.Location = new System.Drawing.Point(1129, 14);
            this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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;
@@ -1336,17 +1257,16 @@
            // 
            // 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, 818);
            this.ClientSize = new System.Drawing.Size(1036, 654);
            this.Controls.Add(this.gbUp);
            this.Controls.Add(this.grdSub);
            this.Controls.Add(this.groupBox1);
            this.Controls.Add(this.panel1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.KeyPreview = true;
            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
            this.Name = "MES_StationInBill";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "进站接收单";
@@ -1355,16 +1275,16 @@
            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MES_StationInBill_KeyDown);
            this.Resize += new System.EventHandler(this.Sc_StationInBill_Resize);
            this.gbUp.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
            this.tabControl1.ResumeLayout(false);
            this.tabPage1.ResumeLayout(false);
            this.tabPage1.PerformLayout();
            this.tabPage2.ResumeLayout(false);
            this.tabPage2.PerformLayout();
            this.groupBox1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).EndInit();
            this.panel2.ResumeLayout(false);
            this.panel2.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
            this.groupBox1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).EndInit();
            this.panel1.ResumeLayout(false);
            this.ResumeLayout(false);