yangle
2022-09-15 ef74ca1a145013f325af41ecde9a4de3f5b158d8
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
19个文件已修改
1个文件已添加
1232 ■■■■■ 已修改文件
DBUtility/业务单据/ClsXt_BaseBillMain.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Sc_ICMOToBarCode.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 231 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/LMESController.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POStockInBillController.cs 226 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_ProcessMangementController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/其它/ReciveBill_FastModel.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/动态列/OptionListModel.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/流转卡管理/MES_StationInBill.cs 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/流转卡管理/MES_StationInBill.designer.cs 482 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/ÒµÎñµ¥¾Ý/ClsXt_BaseBillMain.cs
@@ -45,5 +45,6 @@
        public Int64 HPRDORGID;
        //有效状态 
        public bool HUseFlag;
    }
}
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
f70cb7d7ee8d88a4770a27001295562246dc2e4a
08bc7f9ad52dac46a486d601aad75ab55bfbf42b
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -743,6 +743,10 @@
                    {
                        omodel.Kf_MoveStockStepInBill_FIFOCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_SourceBarCodeCtl")
                    {
                        omodel.Kf_MoveStockStepInBill_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //采购退料单
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -194,6 +194,7 @@
        public string Kf_MoveStockStepInBill_SourceWHSPCtl;   //是否取源单中仓库仓位('Y'为是)
        public string Kf_MoveStockStepInBill_FIFOList;        //先进先出下架清单
        public string Kf_MoveStockStepInBill_FIFOCtl;         //先进先出控制
        public string Kf_MoveStockStepInBill_SourceBarCodeCtl;   //是否进行源单对应条码核对('Y'为核对)
        //采购退料
        public string Kf_POStockInBackBill_AutoCheck;       //是否自动审核
WarM/ÌõÂë´òÓ¡/Sc_ICMOToBarCode.cs
@@ -752,7 +752,6 @@
        private void cmdHSaveBill_Click(object sender, EventArgs e)
        {
            Display();
        }
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -376,6 +376,47 @@
        }
        #endregion
        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•根据职员代码模糊回车查询
        [Route("Cj_StationInBill/GetMessageByEmpNumber")]
        [HttpGet]
        public object GetMessageByEmpNumber(string HEmpNumber)
        {
            try
            {
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from gy_employee  where hnumber like '%" + HEmpNumber + "%'", "gy_employee");
                //写入信息
                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")]
        [HttpGet]
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -428,7 +428,8 @@
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
                string msg4 = sArray[2].ToString();
                List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
                
                msg1 = msg1.Replace("\\", "");
@@ -436,102 +437,160 @@
                ListModels oListModels = new ListModels();
                list = oListModels.getObjectByJson_Sc_StationOutBillMain(msg2);
                int i = 0;
                int j = 0;
                foreach (Model.ClsSc_StationOutBillMain oItemSub in list)
                {
                    DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
                    j++;
                    oBill.omodel.HInterID = list[i].HInterID;
                    oBill.omodel.HBillNo = msg3 + "- " + j;
                    oBill.omodel.HBillStatus = 0;
                    oBill.omodel.HMouldNum = list[i].HMouldNum;
                    oBill.omodel.HYear = 2022;
                    oBill.omodel.HPeriod = 1;
                    oBill.omodel.HRemark = list[i].HRemark;
                    oBill.omodel.HSourceName = list[i].HSourceName;
                    oBill.omodel.HPieceQty = list[i].HPieceQty;
                    oBill.omodel.HWasterQty = list[i].HWasterQty;
                    oBill.omodel.HPlanPieceQty = list[i].HPlanPieceQty;
                    oBill.omodel.HBadPNL = list[i].HBadPNL;
                    oBill.omodel.HICMOInterID = list[i].HICMOInterID;
                    oBill.omodel.HICMOBillNo = list[i].HICMOBillNo;
                    oBill.omodel.HProcExchInterID = list[i].HProcExchInterID;
                    oBill.omodel.HProcExchEntryID = list[i].HProcExchEntryID;
                    oBill.omodel.HProcExchBillNo = list[i].HProcExchBillNo;
                    oBill.omodel.HMaterID = list[i].HMaterID;
                    oBill.omodel.HProcID = list[i].HProcID;
                    oBill.omodel.HICMOQty = list[i].HICMOQty;
                    oBill.omodel.HPlanQty = list[i].HPlanQty;
                    oBill.omodel.HStationOutTime = list[i].HStationOutTime;
                    oBill.omodel.HSourceID = list[i].HSourceID;
                    oBill.omodel.HPayProcID = list[i].HPayProcID;
                    oBill.omodel.HGroupID = list[i].HGroupID;
                    oBill.omodel.HDeptID = list[i].HDeptID;
                    oBill.omodel.HEmpID = list[i].HEmpID;
                    oBill.omodel.HBarCode = list[i].HBarCode;
                    oBill.omodel.HAddr = list[i].HAddr;
                    //oBill.omodel.HBarCodeMaker = list[i].HBarCodeMaker;
                    oBill.omodel.HBarCodeMaker = msg4;
                    oBill.omodel.HSourceID2 = list[i].HSourceID2;
                    oBill.omodel.HSourceID3 = list[i].HSourceID3;
                    oBill.omodel.HSourceID4 = list[i].HSourceID4;
                    oBill.omodel.HSourceID5 = list[i].HSourceID5;
                    oBill.omodel.HSupID = list[i].HSupID;
                    oBill.omodel.HQty = list[i].HQty;
                    oBill.omodel.HPrice = list[i].HPrice;
                    oBill.omodel.HMoney = list[i].HMoney;
                    oBill.omodel.HBadCount = list[i].HBadCount;
                    oBill.omodel.HCenterID = list[i].HCenterID;
                    oBill.omodel.HProcNo = list[i].HProcNo;
                    oBill.omodel.HOrderProcNO = list[i].HOrderProcNO;
                    oBill.omodel.HSourceNameList = list[i].HSourceNameList;
                    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.HEmpID2 = list[i].HEmpID2;
                    oBill.omodel.HEmpID3 = list[i].HEmpID3;
                    oBill.omodel.HEmpID4 = list[i].HEmpID4;
                    oBill.omodel.HEmpID5 = list[i].HEmpID5;
                    oBill.omodel.HDSQty = list[i].HDSQty;
                    oBill.omodel.HChongQty = list[i].HChongQty;
                    oBill.omodel.HPriceRate = list[i].HPriceRate;
                    oBill.omodel.HWorkTimes = list[i].HWorkTimes;
                    oBill.omodel.HQCCheckID = list[i].HQCCheckID;
                    i++;
                    long HMainInterID = 0;
                    HMainInterID = list[0].HInterID;
                    string eventType = "";
                    string BillType = "3791";
                    string HBillSubType = "3791";
                    long HInterID = list[0].HInterID;//递入type得到的单据ID
                    string HBillNo = msg3 + "- " + i;//递入type得到的单据号
                    int HBillStatus = 0;
                    string HMaker = list[0].HMaker;//制单人
                    string HMouldNum = list[0].HMouldNum;//模穴号
                    int HYear = 2021;
                    double HPeriod = 1;
                    string HRemark = list[0].HRemark;//备注
                    string HSourceName = list[0].HSourceName;//生产资源名称
                    double HPieceQty = list[0].HPieceQty;//进站PCS数
                    double HWasterQty = list[0].HWasterQty;//报废数量
                    double HPlanPieceQty = list[0].HPlanPieceQty;//进站PNL数
                    double HBadPNL = list[0].HBadPNL;//报废PNL数
                    long HICMOInterID = list[0].HICMOInterID;//任务单ID
                    string HICMOBillNo = list[0].HICMOBillNo;//任务单
                    int HProcPlanInterID = 0;
                    int HProcPlanEntryID = 0;
                    string HProcPlanBillNo = "";
                    long HProcExchInterID = list[0].HProcExchInterID;
                    long HProcExchEntryID = list[0].HProcExchEntryID;
                    string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
                    long HMaterID = list[0].HMaterID;//产品ID
                    long HProcID = list[0].HProcID;//当前工序ID
                    double HICMOQty = list[0].HICMOQty;//任务单数量
                    double HPlanQty = list[0].HPlanQty;//移交PNL数
                    DateTime HStationOutTime = list[0].HStationOutTime;//汇报时间
                    long HSourceID = list[0].HSourceID;//生产资源ID
                    long HPayProcID = list[0].HPayProcID;//核算工序ID
                    long HGroupID = list[0].HGroupID;//班组ID
                    long HDeptID = 0;
                    long HEmpID = list[0].HEmpID;//操作员ID
                    string HBarCode = list[0].HBarCode;//条形码
                    string HAddr = "";
                    string HBarCodeMaker = "";
                    long HSourceID2 = list[0].HSourceID2;//生产资源2ID
                    long HSourceID3 = list[0].HSourceID3;//生产资源3ID
                    long HSourceID4 = list[0].HSourceID4;//生产资源4ID
                    long HSourceID5 = list[0].HSourceID5;//生产资源5ID
                    long HSupID = 0;
                    double HQty = list[0].HQty;//合格数量
                    double HPrice = 0;
                    double HMoney = 0;
                    double HBadCount = list[0].HBadCount;//不良数量
                    long HCenterID = list[0].HCenterID;//工作中心ID
                    long HProcNo = list[0].HProcNo;//流水号
                    string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                    string HSourceNameList = list[0].HSourceNameList;//设备清单
                    long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
                    string HMainSourceBillNo = list[0].HBillNo;//递入type得到的单据号
                    string HMainSourceBillType = "3790";
                    bool HLastSubProc = list[0].HLastSubProc;//转下工序
                    long HEmpID2 = list[0].HEmpID2;//操作员2ID
                    long HEmpID3 = list[0].HEmpID3;//操作员3ID
                    long HEmpID4 = list[0].HEmpID4;//操作员4ID
                    long HEmpID5 = list[0].HEmpID5;//操作员5ID
                    double HDSQty = list[0].HDSQty;//折弯刀数
                    double HChongQty = list[0].HChongQty;//NCT冲次数
                    double HPriceRate = list[0].HPriceRate;//系数
                    double HWorkTimes = list[0].HWorkTimes;//工时
                    long HQCCheckID = list[0].HQCCheckID;//检验员ID
                    //string HBillSubType = "3791";
                    //long HInterID = list[0].HInterID;//递入type得到的单据ID
                    //string HBillNo = msg3 + "- " + i;//递入type得到的单据号
                    //int HBillStatus = 0;
                    //string HMaker = list[0].HMaker;//制单人
                    //string HMouldNum = list[0].HMouldNum;//模穴号
                    //int HYear = 2021;
                    //double HPeriod = 1;
                    //string HRemark = list[0].HRemark;//备注
                    //string HSourceName = list[0].HSourceName;//生产资源名称
                    //double HPieceQty = list[0].HPieceQty;//进站PCS数
                    //double HWasterQty = list[0].HWasterQty;//报废数量
                    //double HPlanPieceQty = list[0].HPlanPieceQty;//进站PNL数
                    //double HBadPNL = list[0].HBadPNL;//报废PNL数
                    //long HICMOInterID = list[0].HICMOInterID;//任务单ID
                    //string HICMOBillNo = list[0].HICMOBillNo;//任务单
                    //int HProcPlanInterID = 0;
                    //int HProcPlanEntryID = 0;
                    //string HProcPlanBillNo = "";
                    //long HProcExchInterID = list[0].HProcExchInterID;
                    //long HProcExchEntryID = list[0].HProcExchEntryID;
                    //string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
                    //long HMaterID = list[0].HMaterID;//产品ID
                    //long HProcID = list[0].HProcID;//当前工序ID
                    //double HICMOQty = list[0].HICMOQty;//任务单数量
                    //double HPlanQty = list[0].HPlanQty;//移交PNL数
                    //DateTime HStationOutTime = list[0].HStationOutTime;//汇报时间
                    //long HSourceID = list[0].HSourceID;//生产资源ID
                    //long HPayProcID = list[0].HPayProcID;//核算工序ID
                    //long HGroupID = list[0].HGroupID;//班组ID
                    //long HDeptID = 0;
                    //long HEmpID = list[0].HEmpID;//操作员ID
                    //string HBarCode = list[0].HBarCode;//条形码
                    //string HAddr = "";
                    //string HBarCodeMaker = "";
                    //long HSourceID2 = list[0].HSourceID2;//生产资源2ID
                    //long HSourceID3 = list[0].HSourceID3;//生产资源3ID
                    //long HSourceID4 = list[0].HSourceID4;//生产资源4ID
                    //long HSourceID5 = list[0].HSourceID5;//生产资源5ID
                    //long HSupID = 0;
                    //double HQty = list[0].HQty;//合格数量
                    //double HPrice = 0;
                    //double HMoney = 0;
                    //double HBadCount = list[0].HBadCount;//不良数量
                    //long HCenterID = list[0].HCenterID;//工作中心ID
                    //long HProcNo = list[0].HProcNo;//流水号
                    //string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
                    //string HSourceNameList = list[0].HSourceNameList;//设备清单
                    //long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
                    //string HMainSourceBillNo = list[0].HBillNo;//递入type得到的单据号
                    //string HMainSourceBillType = "3790";
                    //bool HLastSubProc = list[0].HLastSubProc;//转下工序
                    //long HEmpID2 = list[0].HEmpID2;//操作员2ID
                    //long HEmpID3 = list[0].HEmpID3;//操作员3ID
                    //long HEmpID4 = list[0].HEmpID4;//操作员4ID
                    //long HEmpID5 = list[0].HEmpID5;//操作员5ID
                    //double HDSQty = list[0].HDSQty;//折弯刀数
                    //double HChongQty = list[0].HChongQty;//NCT冲次数
                    //double HPriceRate = list[0].HPriceRate;//系数
                    //double HWorkTimes = list[0].HWorkTimes;//工时
                    //long HQCCheckID = list[0].HQCCheckID;//检验员ID
                    //保存
                    //保存完毕后处理
                    bool bResult;
                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    if (bResult)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "保存成功!";
                        //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    i++;
                    //if (bResult)
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 1;
                    //    objJsonResult.Message = "保存成功!";
                    //    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    //    objJsonResult.data = 1;
                    //    return objJsonResult;
                    //}
                    //else
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "保存失败!" + DBUtility.ClsPub.sExeReturnInfo;
                    //    objJsonResult.data = 1;
                    //    return objJsonResult;
                    //}
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功!";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -372,6 +372,43 @@
        //}
        #endregion
        #region å·¥åºæµè½¬å¡åˆ—表显示器具清单信息
        [Route("Sc_ProcessExchangeBillList/QJQD")]
        [HttpGet]
        public object QJQD(Int64 HProcExchHinteID)
        {
            try
            {
                //得到信息
                ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillQuerySub_Mould  where hmainid= " + HProcExchHinteID , "h_v_Sc_ProcessExchangeBillQuerySub_Mould");
                //写入信息
                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[返回生产任务单明细行]
        /// <summary>
        /// è¿”回生产任务单明细行
WebAPI/Controllers/LMESController.cs
@@ -60,14 +60,14 @@
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查询权限!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere+ " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");
@@ -140,15 +140,15 @@
            DataSet ds;
            try
            {
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查询权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ////判断是否有查询权限
                //if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查询权限!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeIssueBillQuery where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeIssueBillQuery");
                objJsonResult.code = "1";
WebAPI/Controllers/POStockInBillController.cs
@@ -847,8 +847,6 @@
                return objJsonResult;
            }
        }
        [Route("POStockInBill/Delete_Json")]
        [HttpGet]
        public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
@@ -985,7 +983,6 @@
            }
            catch (Exception)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败!";
@@ -1003,25 +1000,27 @@
        {
            try
            {
                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                string sql = $"select * from H_v_SRM_POInStockBillList where å•据号 ='{HBillno}'";
                ds = oCn.RunProcReturn(sql, "H_v_SRM_POInStockBillList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                json result = Get_ReciveBillCheckDate(HBillno);
                return result;
                //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //string sql = $"select * from H_v_SRM_POInStockBillList where å•据号 ='{HBillno}'";
                //ds = oCn.RunProcReturn(sql, "H_v_SRM_POInStockBillList");
                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有返回任何记录!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                //    objJsonResult.code = "1";
                //    objJsonResult.count = 1;
                //    objJsonResult.Message = "Sucess!";
                //    objJsonResult.data = ds.Tables[0];
                //    return objJsonResult;
                //}
            }
            catch (Exception e)
            {
@@ -1411,6 +1410,11 @@
            return HInterID;
        }
        /// <summary>
        /// åˆ°è´§ç¡®è®¤æ‰«æ”¶æ–™é€šçŸ¥å•号 èŽ·å–è¡¨ä½“å’Œè¡¨å¤´æ•°æ®
        /// </summary>
        /// <param name="HBarCode"></param>
        /// <returns></returns>
        public json Get_ReciveBillCheckDate(string HBarCode)
        {
            json objjson = new json();
@@ -1457,6 +1461,184 @@
            }
        }
        [Route("POStockInBillList/AuditPOInStockBillPost")]
        [HttpPost]
        public object AuditPOInStockBill([FromBody] JObject msg)
        {
            try
            {
                string _msg = msg["msg"].ToString();
                _msg = _msg.Replace("\\", "");
                _msg = _msg.Replace("\n", "");
                List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
                DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill();
                var hinterID = list[0].HInterID;
                var FID = list[0].FID;
                oCn.BeginTran();
                string sql = string.Empty;
                foreach (var item in list)
                {
                    if (item.HSQty == 0)
                        continue;
                    sql = $"update Cg_POInStockBillSub set Hqty = {item.HSQty} where HInterID ={item.HInterID} and HEntryID = {item.HEntryID}";
                    oCn.RunProc(sql);
                }
                oCn.RunProc("exec h_p_Cg_UpDatePOOrderRelation_Del " + hinterID);//删除关联关系
                JObject jsonRoot = new JObject();
                jsonRoot.Add("Creator", "");
                jsonRoot.Add("NeedUpDateFields", new JArray());
                jsonRoot.Add("NeedReturnFields", new JArray());
                jsonRoot.Add("IsDeleteEntry", "false");
                jsonRoot.Add("SubSystemId", "");
                jsonRoot.Add("IsVerifyBaseDataField", "");
                JObject jsonModel = new JObject();
                jsonModel.Add("FID", FID);
                JArray Entry = new JArray();
                foreach (var item in list)
                {
                    if (item.HSQty == 0)
                        continue;
                    JObject jsonFPOOrderEntry = new JObject();
                    jsonFPOOrderEntry.Add("FEntryID", item.FEntryID);
                    jsonFPOOrderEntry.Add("FHQty ", item.HSQty); ;
                    Entry.Add(jsonFPOOrderEntry);
                }
                jsonModel.Add("FEntity", Entry);
                jsonRoot.Add("Model", jsonModel);
                var loginRet = InvokeHelper.Login();
                var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                if (isSuccess <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = loginRet;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
                //LogService.Write(result);
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
                {
                    LogService.Write("收料通知单修改失败jsonRoot:" + jsonRoot.ToString());
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "金蝶收料通知单更新失败" + result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                var json = new
                {
                    Ids = FID,
                };
                //提交
                var _result = InvokeHelper.Submit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
                var _saveObj = JObject.Parse(_result);
                if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("收料通知单提交失败jsonRoot:" + jsonRoot.ToString());
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "金蝶收料通知单提交失败" + _result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //审核
                _result = InvokeHelper.Audit("PUR_ReceiveBill", JsonConvert.SerializeObject(json));
                _saveObj = JObject.Parse(_result);
                if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("收料通知单审核失败jsonRoot:" + jsonRoot.ToString());
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "金蝶收料通知单审核失败jsonRoot" + _result;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                sql = string.Format(@"update Cg_POInStockBillMain set
HBillStatus = 2 ,
HCheckDate   = getdate()
where HInterID in ({0})",  HInterID);
                oCn.RunProc(sql);//更新mes状态
                //更新成功后 åŒæ­¥æ›´æ–°é‡‘蝶
                oCn.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "操作成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "异常!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// åˆ°è´§ç¡®è®¤ æ‰«æ¡ç  æ ¡éªŒ
        /// </summary>
        /// <param name="HBarcode"></param>
        /// <param name="HInterID"></param>
        /// <returns></returns>
        [Route("POStockInBillList/Get_ReciveBillByBarcode")]
        [HttpGet]
        public object Get_ReciveBillByBarcode(string HBarcode, string HInterID)
        {
            try
            {
                //校验条码是否存在
                string sql = $"select* from  Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode}'";
                DataSet ds = oCn.RunProcReturn(sql, "H_v_SRM_POOrderBillList");
                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "条码不存在!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
                //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
                //string sql = $"select * from H_v_SRM_POInStockBillList where å•据号 ='{HBillno}'";
                //ds = oCn.RunProcReturn(sql, "H_v_SRM_POInStockBillList");
                //if (ds == null || ds.Tables[0].Rows.Count == 0)
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有返回任何记录!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //else
                //{
                //}
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //收料通知单审核 å®¡æ ¸æäº¤
        [Route("POStockInBillList/Exec_ReciveBillCheck")]
        [HttpGet]
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -201,7 +201,7 @@
        /// <returns></returns>
        [Route("Sc_MESBeginWorkBill/DeltetMESBeginWorkBill")]
        [HttpGet]
        public object DeltetMESBeginWorkBill(string HInterID,string UserName)
        public object DeltetMESBeginWorkBill(string HInterID, string UserName)
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //编辑权限
@@ -287,7 +287,7 @@
        [HttpGet]
        public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "MES_MESBeginWorkBill_Check";
            string ModRightNameCheck = "MES_MESBeginWorkBill_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
@@ -467,7 +467,7 @@
        [HttpPost]
        public object SaveGetMESBeginWorkFrom([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -496,7 +496,7 @@
                objJsonResult.data = null;
                return objJsonResult;
            }
            ListModels oListModels = new ListModels();
            try
            {
@@ -555,8 +555,19 @@
                            return objJsonResult;
                        }
                    }
                    DBUtility.ClsPub.CurUserName =oItem.HMaker;
                    ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
                    string sCapName = oClsXt_SystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                    if (sCapName.Contains("凯贝"))
                    {
                        DataTable dt = getInfodatanow(oItem.HSourceID.ToString());
                        if (dt.Rows.Count > 0)
                        {
                            DataRow dr = dt.Rows[0];
                            oItem.HRunStatus = dr["runStu"].ToString();
                            oItem.HSourceBeginQty = Convert.ToDecimal(dr["countAll"]);
                        }
                    }
                    DBUtility.ClsPub.CurUserName = oItem.HMaker;
                    oItem.HBillType = "3787";
                    oItem.HBillSubType = "3787";
                    oItem.HBillStatus = 1;   //单据状态(1未审,2审核通过,3关闭,4作废,5审核退回,6审核中,7已阅,8已回复,9结案,10验证,11下达,12开工,13申请审批,15申请检验,16 åˆ¤å®šåˆæ ¼ï¼Œ17判定不合格)     
@@ -579,9 +590,9 @@
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    if (bResult)
                    if (bResult)
                    {
                        objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //返回主ID
                        //系统参数  è‡ªåŠ¨å®¡æ ¸
@@ -598,7 +609,7 @@
                            }
                        }
                    }
                }
                else
                {
@@ -607,7 +618,7 @@
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
@@ -633,6 +644,14 @@
            }
        }
        #endregion
        public DataTable getInfodatanow(string hsoucreID)
        {
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            string sql = $" select HMacAddr, isnull(runStu,'')runStu, isnull(countAll,0)countAll from Gy_Source t1  left join HX_LIOTsys..Info_data_now t2 on t1.HMacAddr = t2.hid where t1.hitemid={hsoucreID}";
            DataTable dt = oCn.RunProcReturn(sql, "dt").Tables[0];
            return dt;
        }
        #region  æŠ¥å·¥å¹³å°éªŒè¯å•据状态
        [Route("Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus")]
@@ -709,7 +728,7 @@
            return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
        }
        #endregion
        #region æŠ¥å·¥å¹³å°äº§é‡æ±‡éªŒè¯æ±‡æŠ¥æ•°é‡æ˜¯å¦è¶…出计划数量辑
        /// <summary>
        /// 
@@ -849,7 +868,7 @@
                    if (bResult)
                    {
                        objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //返回主ID
                        //系统参数  è‡ªåŠ¨å®¡æ ¸
                                                                                  //系统参数  è‡ªåŠ¨å®¡æ ¸
                        string sReturn = "";
                        if (oSystemParameter.ShowBill(ref sReturn) == true)
                        {
@@ -907,7 +926,7 @@
        /// <returns></returns>
        [Route("Sc_MESBeginWorkBill/MESProductAuditProcessReportList")]
        [HttpGet]
        public object MESProductAuditProcessReportList(int HSourceID,int HSourceInterID,int HSourceEntryID,string HSourceBillNo, int HICMOInterID,int HICMOEntryID, int HInterID, int IsAudit, string CurUserName)
        public object MESProductAuditProcessReportList(int HSourceID, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, int HICMOInterID, int HICMOEntryID, int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "MES_ProcExchReport_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
@@ -915,7 +934,7 @@
            {
                string StrMessage = "";
                //审核权限
                if (!WebClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName,ref  StrMessage))
                if (!WebClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName, ref StrMessage))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -987,7 +1006,7 @@
                if (IsAudit == 0) //审核提交
                {
                    //审核提交
                    if (oBill.CheckBill(HSourceID, HSourceInterID,HSourceEntryID,HSourceBillNo,HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    if (oBill.CheckBill(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
@@ -1040,19 +1059,19 @@
        #region æŠ¥å·¥å¹³å°äº§é‡æ±‡æŠ¥åˆ é™¤
        [Route("Sc_MESBeginWorkBill/DeltetMESProductReportBill")]
        [HttpGet]
        public object DeleteGetLineBindBillList(string HInterID,string HICMOInterID,string HICMOEntryID,string UserName)
        public object DeleteGetLineBindBillList(string HInterID, string HICMOInterID, string HICMOEntryID, string UserName)
        {
            try
            {
                oCN.BeginTran();
                //查询产量汇报临时表数量
                ds = oCN.RunProcReturn("select isnull(HQty,0) HQty,isnull(HWasterQty,0) HWasterQty,isnull(HBadQty,0) HBadQty  from Sc_ICMOBillWorkQtyStatus_Tmp where HInterID='" + HInterID + "' and HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
                double HQty =double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString());
                double HQty = double.Parse(ds.Tables[0].Rows[0]["HQty"].ToString());
                double HWasterQty = double.Parse(ds.Tables[0].Rows[0]["HWasterQty"].ToString());
                double HBadQty = double.Parse(ds.Tables[0].Rows[0]["HBadQty"].ToString());
                double sumqty = HQty + HBadQty + HWasterQty;  //汇报数量+不良+报废
                //更新产量装量临时表已汇报数量
                string sql1 = string.Format(@"update Sc_ICMOBillStatus_Tmp  set  HICMOStatus='1',HFinishFlag='0', HRelationInterID=0,HSplitRelationQty=HSplitRelationQty-" + sumqty + ",HDateFinishQty=HDateFinishQty-"+ sumqty + "   where  HICMOInterID='"+ HICMOInterID + "' and HICMOEntryID='"+ HICMOEntryID + "'");
                                                              //更新产量装量临时表已汇报数量
                string sql1 = string.Format(@"update Sc_ICMOBillStatus_Tmp  set  HICMOStatus='1',HFinishFlag='0', HRelationInterID=0,HSplitRelationQty=HSplitRelationQty-" + sumqty + ",HDateFinishQty=HDateFinishQty-" + sumqty + "   where  HICMOInterID='" + HICMOInterID + "' and HICMOEntryID='" + HICMOEntryID + "'");
                oCN.RunProc(sql1);
                //更新切换状态值
                string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp  where HInterID='" + HInterID + "'");
@@ -1081,8 +1100,8 @@
        #region æŠ¥å·¥å¹³å°æŠ¥æ£€ç”³è¯·ä¿å­˜
        [Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
        [HttpGet]
        public object SaveGetMESProductReportBillList(string ScMaxWork,string HSourceBillType, string workcode,int HSourceID,int HICMOInterID,int HICMOEntryID,string HMaker,string Czybm)
        {
        public object SaveGetMESProductReportBillList(string ScMaxWork, string HSourceBillType, string workcode, int HSourceID, int HICMOInterID, int HICMOEntryID, string HMaker, string Czybm)
        {
            ListModels oListModels = new ListModels();
            try
            {
@@ -1110,9 +1129,9 @@
                //}
                string sHSourceType = HSourceBillType;
                string  BillType = "3711";  //单据类型 (生产汇报单)
                //得到mainid
                 long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                string BillType = "3711";  //单据类型 (生产汇报单)
                                           //得到mainid
                long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //oCN.BeginTran();
                //根据单号、资源ID、订单主ID、订单子ID、制单人过滤产量汇报报检申请提交数据
                //string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set 
@@ -1126,14 +1145,14 @@
                //ds = oCN.RunProcReturn("select top 1 * from  Sc_ICMOBillWorkQtyStatus_Tmp where HICMOReportInterID='" + HInterID + "' and HICMOReportBillNo='" + ScMaxWork + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
                //if (ds.Tables[0].Rows.Count <= 0)
                //{
                    //oCN.RollBack();
                //oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "当前单据无产量汇报记录!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                WebS.ClsSc_ICMOReportBillMain model = new WebS.ClsSc_ICMOReportBillMain();
                model.HInterID = HInterID;
                model.HBillNo = ScMaxWork;
@@ -1148,9 +1167,9 @@
                //model.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
                model.HMainSourceInterID = HICMOInterID;
                model.HMainSourceEntryID = HICMOEntryID;
                //oWebs.Timeout = 30000;
                bool flag=oWebs.set_SaveICMOProductReportBill_Layui(model,workcode,HSourceID, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
                bool flag = oWebs.set_SaveICMOProductReportBill_Layui(model, workcode, HSourceID, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
                if (flag)
                {
                    //oCN.Commit();
@@ -1160,12 +1179,12 @@
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                else
                {
                    //oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败!"+ flag+ ";"+ DBUtility.ClsPub.sErrInfo;
                    objJsonResult.Message = "保存失败!" + flag + ";" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -1184,6 +1203,6 @@
    }
}
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -212,7 +212,7 @@
                    return objJsonResult;
                }
                //根据任务单查找到金蝶的生产订单
                DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERP_StationOutBillList_LastProc where HICMOInterID=" + dr["HICMOInterID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
                DataSet ds1 = oCN.RunProcReturn("select * from  h_v_TOERP_StationOutBillList_LastProc where HICMOEntryID=" + dr["HICMOEntryID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
                DataRow dr1 = ds1.Tables[0].Rows[0];
                JObject model = new JObject();
@@ -220,6 +220,8 @@
                model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //生产组织1
                model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期1
                model.Add("FHZYMESFLAG", "是");//  æ˜¯å¦ä¸ºMES同步
                model.Add("FBillNo", HBillNo);
                JArray Fentity = new JArray();
                foreach (DataRow item in ds.Tables[0].Rows)
@@ -238,7 +240,7 @@
                    FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); //  ç”Ÿäº§è½¦é—´
                    FentityModel.Add("FStandHourUnitId", "3600"); // å•位标准工时单位 
                    FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = dr1["FMaterialNUM"].ToString() }); // ç‰©æ–™ç¼–码 
                    FentityModel.Add("FMoEntrySeq", dr1["HICMOEntryID"].ToString());//生产订单行号
                    FentityModel.Add("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//生产订单行号
                    FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//生产订单内码
                    FentityModel.Add("FFinishQty", item["接收数量"].ToString());//完成数量1
                    FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1FFailQty
@@ -297,12 +299,12 @@
                    //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能
                    ["Model"] = model
                };
                LogService.Write("jsonRoot:" + jsonRoot);
                string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//保存
                //判断保存是否成功
                if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                {
                    LogService.Write("工序汇报单入库错误jsonRoot:" + jsonRoot);
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -163,7 +163,7 @@
                ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HBeginWorkTime,HSourceID" +
                ",HSourceInterID_Main,HSourceEntryID_Main,HSourceBillNo_Main,HSourceBillType_Main" +
                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
                 ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
                 ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HRunStatus,HSourceBeginQty" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + omodel.HMaker+ "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
@@ -171,7 +171,7 @@
                ",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
                ",'" + omodel.HMainSourceInterID.ToString() + "'," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType.ToString() + "'" +
                ",'" + omodel.HMainSourceInterID.ToString() + "'," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType.ToString() + "'" +
                "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
                "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate(),'"+ omodel.HRunStatus + "','"+ omodel.HSourceBeginQty.ToString() + "'" +
              ") ");
                //再次验证 ä¿å­˜æ˜¯å¦ åˆç†
WebAPI/Models/ClsSc_MESBeginWorkBillMain.cs
@@ -31,7 +31,8 @@
        public String HBarCodeMaker;
        public DateTime HBarCodeMakeDate;
        new public string HMainSourceEntryID;
        public string HRunStatus;
        public decimal HSourceBeginQty;
        //public int HSourceInterID_Main;
        //public int HSourceEntryID_Main;
        //public string HSourceBillNo_Main;
WebAPI/Models/ÆäËü/ReciveBill_FastModel.cs
New file
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class OptionListModel
    {
        public string field { get; set; }
        public string title { get; set; }
        public bool sort { get; set; }
        public bool hide { get; set; }
    }
}
WebAPI/Models/¶¯Ì¬ÁÐ/OptionListModel.cs
@@ -5,12 +5,15 @@
namespace WebAPI.Models
{
    public class OptionListModel
    public class ReciveBill_FastModel
    {
        public string field { get; set; }
        public string title { get; set; }
        public bool sort { get; set; }
        public bool hide { get; set; }
        public string HInterID { get; set; }
        public string HEntryID { get; set; }
        public decimal HQty { get; set; }
        public decimal HSQty { get; set; }
        public string FID { get; set; }
        public string FEntryID { get; set; }
    }
}
WebAPI/Web.config
@@ -20,7 +20,7 @@
    <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
    <add key="FileIP" value="http://localhost:8080/" />
      <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
      <add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/>     <!--颜台式机-->
      <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>     <!--颜台式机-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
      <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
      <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -93,7 +93,7 @@
      </basicHttpBinding>
    </bindings>
    <client>
      <endpoint address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
      <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
        bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
        name="WebService1Soap" />
    </client>
@@ -101,7 +101,7 @@
  <applicationSettings>
    <WebAPI.Properties.Settings>
      <setting name="WebAPI_WebS_WebService1" serializeAs="String">
        <value>http://192.168.63.195/WEBS-WMS/WebService1.asmx</value>
        <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
      </setting>
    </WebAPI.Properties.Settings>
  </applicationSettings>
WebAPI/WebAPI.csproj
@@ -580,6 +580,7 @@
    <Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
    <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
    <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
    <Compile Include="Models\其它\ReciveBill_FastModel.cs" />
    <Compile Include="Models\动态列\OptionListModel.cs" />
    <Compile Include="Models\基础资料\Gy_ClassTimePrj.cs" />
    <Compile Include="Models\工资管理\ClsGy_ClassTimePrj_Model.cs" />
WorkM/Á÷ת¿¨¹ÜÀí/MES_StationInBill.cs
@@ -17,6 +17,7 @@
        {
            InitializeComponent();
        }
        public DBUtility.frmBillQueryCondition_New frmCondition;
        public string ModName = "3790";
        public string ModCaption = "进站接收单";
        public const string ModRightName = "MES_StationInBill";
@@ -152,6 +153,7 @@
        //窗体加载
        private void Sc_StationInBill_Load(object sender, EventArgs e)
        {
            frmCondition = new DBUtility.frmBillQueryCondition_New();
            //打印初始化       
            this.Text = ModCaption;
            this.lblCaption.Text = ModCaption;
@@ -179,7 +181,7 @@
        private void Sc_StationInBill_FormClosing(object sender, FormClosingEventArgs e)
        {
            BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
            //DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
            //DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name);
            DBUtility.Xt_BaseBillFun.SaveGrid(grdCardList, this.Name + "grdCardList");
        }
        //新增单据
@@ -1523,6 +1525,9 @@
                }
                else
                {
                    //释放冻结
                    DBUtility.Xt_BaseBillFun.CancelFrozenCol(grdSub);
                    //
                    grdSub.DataSource = Dsplay.Tables[0].DefaultView;
                    //设置合计列
                    //string sTotalCol = "";
@@ -1532,15 +1537,29 @@
                    //oSumGrid.BuildTotalCols(sT);
                    //  
                    //冻结
                    int FrCol = 0;
                    string s = "是";
                    DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
                    int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
                    string s = frmCondition.cmbHComplete.Text;
                    DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name, s, FrCol);
                    //画线
                    GraphLine();
                    //冻结
                    //int FrCol = 0;
                    //string s = "是";
                    //DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name + "grdSub", s, FrCol);
                }
            }
            catch (Exception e)
            {
                MessageBox.Show(e.Message + "DisplaySub");
            }
        }
        private void GraphLine()
        {
            int MainIDCol = 0;
            int SubIDCol = 0;
            string s = frmCondition.cmbHComplete.Text;
            long n = 0;
            DBUtility.Xt_BaseBillFun.GraphLine(grdSub, MainIDCol, SubIDCol, s, ref n);
        }
        private void cmdDelLine_Click(object sender, EventArgs e)
@@ -1562,5 +1581,16 @@
            }
        }
        private void cmdHbclk_Click(object sender, EventArgs e)
        {
            //保存列宽
            DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name);
        }
        private void cmdHmrlk_Click(object sender, EventArgs e)
        {
            DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name);
        }
    }
}
WorkM/Á÷ת¿¨¹ÜÀí/MES_StationInBill.designer.cs
@@ -109,13 +109,15 @@
            this.label19 = new System.Windows.Forms.Label();
            this.timer1 = new System.Windows.Forms.Timer(this.components);
            this.panel1 = new System.Windows.Forms.Panel();
            this.cmdDelLine = new System.Windows.Forms.Button();
            this.cmdXZ = new System.Windows.Forms.Button();
            this.button2 = new System.Windows.Forms.Button();
            this.button1 = new System.Windows.Forms.Button();
            this.cmdHDelBill = new System.Windows.Forms.Button();
            this.cmdXG = new System.Windows.Forms.Button();
            this.cmdAddNew = new System.Windows.Forms.Button();
            this.cmdDelLine = new System.Windows.Forms.Button();
            this.cmdHbclk = new System.Windows.Forms.Button();
            this.cmdHmrlk = new System.Windows.Forms.Button();
            this.gbUp.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
            this.tabControl1.SuspendLayout();
@@ -132,10 +134,9 @@
            this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHMaterID.Enabled = false;
            this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
            this.cmdHMaterID.Location = new System.Drawing.Point(949, 311);
            this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHMaterID.Location = new System.Drawing.Point(712, 249);
            this.cmdHMaterID.Name = "cmdHMaterID";
            this.cmdHMaterID.Size = new System.Drawing.Size(40, 40);
            this.cmdHMaterID.Size = new System.Drawing.Size(30, 32);
            this.cmdHMaterID.TabIndex = 86;
            this.cmdHMaterID.UseVisualStyleBackColor = false;
            this.cmdHMaterID.Visible = false;
@@ -147,12 +148,11 @@
            this.txtHMaterID.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHMaterID.ForeColor = System.Drawing.Color.Green;
            this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterID.Location = new System.Drawing.Point(133, 179);
            this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHMaterID.Location = new System.Drawing.Point(100, 143);
            this.txtHMaterID.Multiline = true;
            this.txtHMaterID.Name = "txtHMaterID";
            this.txtHMaterID.ReadOnly = true;
            this.txtHMaterID.Size = new System.Drawing.Size(328, 40);
            this.txtHMaterID.Size = new System.Drawing.Size(247, 33);
            this.txtHMaterID.TabIndex = 85;
            this.txtHMaterID.Tag = "0";
            this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -163,10 +163,9 @@
            this.label16.BackColor = System.Drawing.Color.Gray;
            this.label16.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label16.ForeColor = System.Drawing.Color.Yellow;
            this.label16.Location = new System.Drawing.Point(11, 186);
            this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label16.Location = new System.Drawing.Point(8, 149);
            this.label16.Name = "label16";
            this.label16.Size = new System.Drawing.Size(112, 27);
            this.label16.Size = new System.Drawing.Size(90, 21);
            this.label16.TabIndex = 84;
            this.label16.Text = "产品代码:";
            // 
@@ -176,10 +175,9 @@
            this.label9.BackColor = System.Drawing.Color.Gray;
            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label9.ForeColor = System.Drawing.Color.Yellow;
            this.label9.Location = new System.Drawing.Point(11, 273);
            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label9.Location = new System.Drawing.Point(8, 218);
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(112, 27);
            this.label9.Size = new System.Drawing.Size(90, 21);
            this.label9.TabIndex = 82;
            this.label9.Text = "进站时间:";
            // 
@@ -188,10 +186,9 @@
            this.label2.AutoSize = true;
            this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label2.ForeColor = System.Drawing.Color.Yellow;
            this.label2.Location = new System.Drawing.Point(504, 274);
            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label2.Location = new System.Drawing.Point(378, 219);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(104, 27);
            this.label2.Size = new System.Drawing.Size(84, 21);
            this.label2.TabIndex = 80;
            this.label2.Text = "ä»» åŠ¡ å•:";
            // 
@@ -200,12 +197,11 @@
            this.txtHICMOBillNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHICMOBillNo.ForeColor = System.Drawing.Color.Green;
            this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHICMOBillNo.Location = new System.Drawing.Point(653, 267);
            this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHICMOBillNo.Location = new System.Drawing.Point(490, 214);
            this.txtHICMOBillNo.Multiline = true;
            this.txtHICMOBillNo.Name = "txtHICMOBillNo";
            this.txtHICMOBillNo.ReadOnly = true;
            this.txtHICMOBillNo.Size = new System.Drawing.Size(292, 40);
            this.txtHICMOBillNo.Size = new System.Drawing.Size(220, 33);
            this.txtHICMOBillNo.TabIndex = 81;
            // 
            // txtHProcExchBillNo
@@ -213,12 +209,11 @@
            this.txtHProcExchBillNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHProcExchBillNo.ForeColor = System.Drawing.Color.Green;
            this.txtHProcExchBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcExchBillNo.Location = new System.Drawing.Point(133, 5);
            this.txtHProcExchBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHProcExchBillNo.Location = new System.Drawing.Point(100, 4);
            this.txtHProcExchBillNo.Multiline = true;
            this.txtHProcExchBillNo.Name = "txtHProcExchBillNo";
            this.txtHProcExchBillNo.ReadOnly = true;
            this.txtHProcExchBillNo.Size = new System.Drawing.Size(328, 40);
            this.txtHProcExchBillNo.Size = new System.Drawing.Size(247, 33);
            this.txtHProcExchBillNo.TabIndex = 88;
            this.txtHProcExchBillNo.Tag = "0";
            this.txtHProcExchBillNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcExchBillNo_KeyDown);
@@ -229,10 +224,9 @@
            this.label1.BackColor = System.Drawing.Color.Gray;
            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label1.ForeColor = System.Drawing.Color.Yellow;
            this.label1.Location = new System.Drawing.Point(11, 12);
            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Location = new System.Drawing.Point(8, 10);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(92, 27);
            this.label1.Size = new System.Drawing.Size(74, 21);
            this.label1.TabIndex = 87;
            this.label1.Text = "流转卡:";
            // 
@@ -242,12 +236,11 @@
            this.txtHMaterModel.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHMaterModel.ForeColor = System.Drawing.Color.Green;
            this.txtHMaterModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterModel.Location = new System.Drawing.Point(653, 92);
            this.txtHMaterModel.Margin = new System.Windows.Forms.Padding(4);
            this.txtHMaterModel.Location = new System.Drawing.Point(490, 74);
            this.txtHMaterModel.Multiline = true;
            this.txtHMaterModel.Name = "txtHMaterModel";
            this.txtHMaterModel.ReadOnly = true;
            this.txtHMaterModel.Size = new System.Drawing.Size(292, 40);
            this.txtHMaterModel.Size = new System.Drawing.Size(220, 33);
            this.txtHMaterModel.TabIndex = 90;
            this.txtHMaterModel.Tag = "0";
            // 
@@ -257,10 +250,9 @@
            this.label3.BackColor = System.Drawing.Color.Gray;
            this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label3.ForeColor = System.Drawing.Color.Yellow;
            this.label3.Location = new System.Drawing.Point(503, 100);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Location = new System.Drawing.Point(377, 80);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(112, 27);
            this.label3.Size = new System.Drawing.Size(90, 21);
            this.label3.TabIndex = 89;
            this.label3.Text = "规格型号:";
            // 
@@ -268,10 +260,9 @@
            // 
            this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
            this.cmdHEmpID.Location = new System.Drawing.Point(949, 180);
            this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHEmpID.Location = new System.Drawing.Point(712, 144);
            this.cmdHEmpID.Name = "cmdHEmpID";
            this.cmdHEmpID.Size = new System.Drawing.Size(40, 40);
            this.cmdHEmpID.Size = new System.Drawing.Size(30, 32);
            this.cmdHEmpID.TabIndex = 93;
            this.cmdHEmpID.UseVisualStyleBackColor = false;
            this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
@@ -281,11 +272,10 @@
            this.txtHEmpID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHEmpID.ForeColor = System.Drawing.Color.Green;
            this.txtHEmpID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHEmpID.Location = new System.Drawing.Point(795, 180);
            this.txtHEmpID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHEmpID.Location = new System.Drawing.Point(596, 144);
            this.txtHEmpID.Name = "txtHEmpID";
            this.txtHEmpID.ReadOnly = true;
            this.txtHEmpID.Size = new System.Drawing.Size(151, 38);
            this.txtHEmpID.Size = new System.Drawing.Size(114, 32);
            this.txtHEmpID.TabIndex = 92;
            this.txtHEmpID.Tag = "0";
            this.txtHEmpID.TextChanged += new System.EventHandler(this.txtHEmpID_TextChanged);
@@ -296,10 +286,9 @@
            this.label4.AutoSize = true;
            this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label4.ForeColor = System.Drawing.Color.Yellow;
            this.label4.Location = new System.Drawing.Point(503, 187);
            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label4.Location = new System.Drawing.Point(377, 150);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(104, 27);
            this.label4.Size = new System.Drawing.Size(84, 21);
            this.label4.TabIndex = 91;
            this.label4.Text = "接 æ”¶ äººï¼š";
            // 
@@ -307,10 +296,9 @@
            // 
            this.cmdHSourceID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID.Image")));
            this.cmdHSourceID.Location = new System.Drawing.Point(423, 352);
            this.cmdHSourceID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID.Location = new System.Drawing.Point(317, 282);
            this.cmdHSourceID.Name = "cmdHSourceID";
            this.cmdHSourceID.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID.TabIndex = 96;
            this.cmdHSourceID.UseVisualStyleBackColor = false;
            this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
@@ -320,10 +308,9 @@
            this.txtHSourceID.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceID.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID.Location = new System.Drawing.Point(133, 352);
            this.txtHSourceID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID.Location = new System.Drawing.Point(100, 282);
            this.txtHSourceID.Name = "txtHSourceID";
            this.txtHSourceID.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID.TabIndex = 95;
            this.txtHSourceID.Tag = "0";
            this.txtHSourceID.TextChanged += new System.EventHandler(this.txtHSourceID_TextChanged);
@@ -334,10 +321,9 @@
            this.label5.AutoSize = true;
            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label5.ForeColor = System.Drawing.Color.Yellow;
            this.label5.Location = new System.Drawing.Point(11, 360);
            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label5.Location = new System.Drawing.Point(8, 288);
            this.label5.Name = "label5";
            this.label5.Size = new System.Drawing.Size(112, 27);
            this.label5.Size = new System.Drawing.Size(90, 21);
            this.label5.TabIndex = 94;
            this.label5.Text = "生产资源:";
            // 
@@ -346,12 +332,11 @@
            this.txtHICMOQty.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHICMOQty.ForeColor = System.Drawing.Color.Green;
            this.txtHICMOQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHICMOQty.Location = new System.Drawing.Point(653, 311);
            this.txtHICMOQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHICMOQty.Location = new System.Drawing.Point(490, 249);
            this.txtHICMOQty.Multiline = true;
            this.txtHICMOQty.Name = "txtHICMOQty";
            this.txtHICMOQty.ReadOnly = true;
            this.txtHICMOQty.Size = new System.Drawing.Size(292, 40);
            this.txtHICMOQty.Size = new System.Drawing.Size(220, 33);
            this.txtHICMOQty.TabIndex = 98;
            this.txtHICMOQty.Tag = "0";
            // 
@@ -361,10 +346,9 @@
            this.label6.BackColor = System.Drawing.Color.Gray;
            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label6.ForeColor = System.Drawing.Color.Yellow;
            this.label6.Location = new System.Drawing.Point(503, 57);
            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label6.Location = new System.Drawing.Point(377, 46);
            this.label6.Name = "label6";
            this.label6.Size = new System.Drawing.Size(132, 27);
            this.label6.Size = new System.Drawing.Size(106, 21);
            this.label6.TabIndex = 97;
            this.label6.Text = "流转卡数量:";
            // 
@@ -373,12 +357,11 @@
            this.txtHPlanQty.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHPlanQty.ForeColor = System.Drawing.Color.Green;
            this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHPlanQty.Location = new System.Drawing.Point(653, 50);
            this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHPlanQty.Location = new System.Drawing.Point(490, 40);
            this.txtHPlanQty.Multiline = true;
            this.txtHPlanQty.Name = "txtHPlanQty";
            this.txtHPlanQty.ReadOnly = true;
            this.txtHPlanQty.Size = new System.Drawing.Size(292, 40);
            this.txtHPlanQty.Size = new System.Drawing.Size(220, 33);
            this.txtHPlanQty.TabIndex = 100;
            this.txtHPlanQty.Tag = "0";
            // 
@@ -388,10 +371,9 @@
            this.label7.BackColor = System.Drawing.Color.Gray;
            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label7.ForeColor = System.Drawing.Color.Yellow;
            this.label7.Location = new System.Drawing.Point(503, 143);
            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label7.Location = new System.Drawing.Point(377, 114);
            this.label7.Name = "label7";
            this.label7.Size = new System.Drawing.Size(112, 27);
            this.label7.Size = new System.Drawing.Size(90, 21);
            this.label7.TabIndex = 99;
            this.label7.Text = "接收数量:";
            // 
@@ -399,10 +381,9 @@
            // 
            this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
            this.cmdHGroupID.Location = new System.Drawing.Point(423, 310);
            this.cmdHGroupID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHGroupID.Location = new System.Drawing.Point(317, 248);
            this.cmdHGroupID.Name = "cmdHGroupID";
            this.cmdHGroupID.Size = new System.Drawing.Size(40, 40);
            this.cmdHGroupID.Size = new System.Drawing.Size(30, 32);
            this.cmdHGroupID.TabIndex = 103;
            this.cmdHGroupID.UseVisualStyleBackColor = false;
            this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
@@ -412,10 +393,9 @@
            this.txtHGroupID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHGroupID.ForeColor = System.Drawing.Color.Green;
            this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHGroupID.Location = new System.Drawing.Point(133, 310);
            this.txtHGroupID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHGroupID.Location = new System.Drawing.Point(100, 248);
            this.txtHGroupID.Name = "txtHGroupID";
            this.txtHGroupID.Size = new System.Drawing.Size(133, 38);
            this.txtHGroupID.Size = new System.Drawing.Size(101, 32);
            this.txtHGroupID.TabIndex = 102;
            this.txtHGroupID.Tag = "0";
            this.txtHGroupID.TextChanged += new System.EventHandler(this.txtHGroupID_TextChanged);
@@ -426,10 +406,9 @@
            this.label8.AutoSize = true;
            this.label8.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label8.ForeColor = System.Drawing.Color.Yellow;
            this.label8.Location = new System.Drawing.Point(11, 317);
            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label8.Location = new System.Drawing.Point(8, 254);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(112, 27);
            this.label8.Size = new System.Drawing.Size(90, 21);
            this.label8.TabIndex = 101;
            this.label8.Text = "生产班组:";
            // 
@@ -438,10 +417,9 @@
            this.cmdHProcID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHProcID.Enabled = false;
            this.cmdHProcID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHProcID.Image")));
            this.cmdHProcID.Location = new System.Drawing.Point(423, 91);
            this.cmdHProcID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHProcID.Location = new System.Drawing.Point(317, 73);
            this.cmdHProcID.Name = "cmdHProcID";
            this.cmdHProcID.Size = new System.Drawing.Size(40, 40);
            this.cmdHProcID.Size = new System.Drawing.Size(30, 32);
            this.cmdHProcID.TabIndex = 106;
            this.cmdHProcID.UseVisualStyleBackColor = false;
            this.cmdHProcID.Click += new System.EventHandler(this.cmdHProcID_Click);
@@ -452,12 +430,11 @@
            this.txtHProcID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHProcID.ForeColor = System.Drawing.Color.Green;
            this.txtHProcID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcID.Location = new System.Drawing.Point(133, 91);
            this.txtHProcID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHProcID.Location = new System.Drawing.Point(100, 73);
            this.txtHProcID.Multiline = true;
            this.txtHProcID.Name = "txtHProcID";
            this.txtHProcID.ReadOnly = true;
            this.txtHProcID.Size = new System.Drawing.Size(287, 40);
            this.txtHProcID.Size = new System.Drawing.Size(216, 33);
            this.txtHProcID.TabIndex = 105;
            this.txtHProcID.Tag = "0";
            this.txtHProcID.TextChanged += new System.EventHandler(this.txtHProcID_TextChanged);
@@ -469,10 +446,9 @@
            this.label10.BackColor = System.Drawing.Color.Gray;
            this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label10.ForeColor = System.Drawing.Color.Yellow;
            this.label10.Location = new System.Drawing.Point(11, 99);
            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label10.Location = new System.Drawing.Point(8, 79);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(112, 27);
            this.label10.Size = new System.Drawing.Size(90, 21);
            this.label10.TabIndex = 104;
            this.label10.Text = "当前工序:";
            // 
@@ -482,12 +458,11 @@
            this.txtHMaterName.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHMaterName.ForeColor = System.Drawing.Color.Green;
            this.txtHMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHMaterName.Location = new System.Drawing.Point(133, 222);
            this.txtHMaterName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHMaterName.Location = new System.Drawing.Point(100, 178);
            this.txtHMaterName.Multiline = true;
            this.txtHMaterName.Name = "txtHMaterName";
            this.txtHMaterName.ReadOnly = true;
            this.txtHMaterName.Size = new System.Drawing.Size(328, 40);
            this.txtHMaterName.Size = new System.Drawing.Size(247, 33);
            this.txtHMaterName.TabIndex = 108;
            this.txtHMaterName.Tag = "0";
            // 
@@ -497,19 +472,17 @@
            this.label11.BackColor = System.Drawing.Color.Gray;
            this.label11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label11.ForeColor = System.Drawing.Color.Yellow;
            this.label11.Location = new System.Drawing.Point(11, 230);
            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label11.Location = new System.Drawing.Point(8, 184);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(112, 27);
            this.label11.Size = new System.Drawing.Size(90, 21);
            this.label11.TabIndex = 107;
            this.label11.Text = "产品名称:";
            // 
            // cmdOK
            // 
            this.cmdOK.Location = new System.Drawing.Point(388, 12);
            this.cmdOK.Margin = new System.Windows.Forms.Padding(4);
            this.cmdOK.Location = new System.Drawing.Point(291, 10);
            this.cmdOK.Name = "cmdOK";
            this.cmdOK.Size = new System.Drawing.Size(113, 52);
            this.cmdOK.Size = new System.Drawing.Size(85, 42);
            this.cmdOK.TabIndex = 109;
            this.cmdOK.Text = "进  ç«™";
            this.cmdOK.UseVisualStyleBackColor = true;
@@ -517,10 +490,9 @@
            // 
            // cmdCancel
            // 
            this.cmdCancel.Location = new System.Drawing.Point(511, 12);
            this.cmdCancel.Margin = new System.Windows.Forms.Padding(4);
            this.cmdCancel.Location = new System.Drawing.Point(383, 10);
            this.cmdCancel.Name = "cmdCancel";
            this.cmdCancel.Size = new System.Drawing.Size(113, 52);
            this.cmdCancel.Size = new System.Drawing.Size(85, 42);
            this.cmdCancel.TabIndex = 110;
            this.cmdCancel.Text = "取  æ¶ˆ";
            this.cmdCancel.UseVisualStyleBackColor = true;
@@ -532,10 +504,9 @@
            this.lblCaption.BackColor = System.Drawing.Color.Gray;
            this.lblCaption.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblCaption.ForeColor = System.Drawing.Color.LimeGreen;
            this.lblCaption.Location = new System.Drawing.Point(9, 9);
            this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.lblCaption.Location = new System.Drawing.Point(7, 7);
            this.lblCaption.Name = "lblCaption";
            this.lblCaption.Size = new System.Drawing.Size(134, 31);
            this.lblCaption.Size = new System.Drawing.Size(107, 26);
            this.lblCaption.TabIndex = 111;
            this.lblCaption.Text = "进站接收单";
            // 
@@ -548,10 +519,8 @@
            this.gbUp.Controls.Add(this.panel2);
            this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gbUp.Location = new System.Drawing.Point(0, 0);
            this.gbUp.Margin = new System.Windows.Forms.Padding(4);
            this.gbUp.Name = "gbUp";
            this.gbUp.Padding = new System.Windows.Forms.Padding(4);
            this.gbUp.Size = new System.Drawing.Size(1381, 736);
            this.gbUp.Size = new System.Drawing.Size(1036, 589);
            this.gbUp.TabIndex = 114;
            this.gbUp.TabStop = false;
            // 
@@ -559,12 +528,12 @@
            // 
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdSub.Location = new System.Drawing.Point(4, 509);
            this.grdSub.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.grdSub.Location = new System.Drawing.Point(3, 407);
            this.grdSub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdSub.Name = "grdSub";
            this.grdSub.RowHeadersWidth = 51;
            this.grdSub.RowTemplate.Height = 27;
            this.grdSub.Size = new System.Drawing.Size(1002, 223);
            this.grdSub.Size = new System.Drawing.Size(752, 179);
            this.grdSub.TabIndex = 149;
            // 
            // tabControl1
@@ -572,11 +541,11 @@
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;
            this.tabControl1.Location = new System.Drawing.Point(4, 77);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabControl1.Location = new System.Drawing.Point(3, 61);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(1002, 432);
            this.tabControl1.Size = new System.Drawing.Size(752, 346);
            this.tabControl1.TabIndex = 150;
            // 
            // tabPage1
@@ -625,11 +594,11 @@
            this.tabPage1.Controls.Add(this.txtHEmpID);
            this.tabPage1.Controls.Add(this.label7);
            this.tabPage1.Controls.Add(this.label6);
            this.tabPage1.Location = new System.Drawing.Point(4, 25);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage1.Size = new System.Drawing.Size(994, 403);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabPage1.Size = new System.Drawing.Size(744, 320);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "进站信息";
            // 
@@ -639,11 +608,10 @@
            this.txtHGroupName.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHGroupName.ForeColor = System.Drawing.Color.Green;
            this.txtHGroupName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHGroupName.Location = new System.Drawing.Point(269, 310);
            this.txtHGroupName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHGroupName.Location = new System.Drawing.Point(202, 248);
            this.txtHGroupName.Name = "txtHGroupName";
            this.txtHGroupName.ReadOnly = true;
            this.txtHGroupName.Size = new System.Drawing.Size(151, 38);
            this.txtHGroupName.Size = new System.Drawing.Size(114, 32);
            this.txtHGroupName.TabIndex = 150;
            this.txtHGroupName.Tag = "0";
            // 
@@ -652,10 +620,9 @@
            this.txtHEmpNumber.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHEmpNumber.ForeColor = System.Drawing.Color.Green;
            this.txtHEmpNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHEmpNumber.Location = new System.Drawing.Point(653, 180);
            this.txtHEmpNumber.Margin = new System.Windows.Forms.Padding(4);
            this.txtHEmpNumber.Location = new System.Drawing.Point(490, 144);
            this.txtHEmpNumber.Name = "txtHEmpNumber";
            this.txtHEmpNumber.Size = new System.Drawing.Size(139, 38);
            this.txtHEmpNumber.Size = new System.Drawing.Size(105, 32);
            this.txtHEmpNumber.TabIndex = 149;
            this.txtHEmpNumber.Tag = "0";
            this.txtHEmpNumber.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHEmpNumber_KeyDown);
@@ -666,11 +633,10 @@
            this.txtHSourceName.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceName.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName.Location = new System.Drawing.Point(269, 352);
            this.txtHSourceName.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName.Location = new System.Drawing.Point(202, 282);
            this.txtHSourceName.Name = "txtHSourceName";
            this.txtHSourceName.ReadOnly = true;
            this.txtHSourceName.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName.TabIndex = 119;
            this.txtHSourceName.Tag = "0";
            // 
@@ -680,12 +646,11 @@
            this.txtHOrderProcNO.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHOrderProcNO.ForeColor = System.Drawing.Color.Green;
            this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHOrderProcNO.Location = new System.Drawing.Point(653, 223);
            this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4);
            this.txtHOrderProcNO.Location = new System.Drawing.Point(490, 178);
            this.txtHOrderProcNO.Multiline = true;
            this.txtHOrderProcNO.Name = "txtHOrderProcNO";
            this.txtHOrderProcNO.ReadOnly = true;
            this.txtHOrderProcNO.Size = new System.Drawing.Size(292, 40);
            this.txtHOrderProcNO.Size = new System.Drawing.Size(220, 33);
            this.txtHOrderProcNO.TabIndex = 148;
            this.txtHOrderProcNO.Tag = "0";
            // 
@@ -695,10 +660,9 @@
            this.label18.BackColor = System.Drawing.Color.Gray;
            this.label18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label18.ForeColor = System.Drawing.Color.Yellow;
            this.label18.Location = new System.Drawing.Point(504, 231);
            this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label18.Location = new System.Drawing.Point(378, 185);
            this.label18.Name = "label18";
            this.label18.Size = new System.Drawing.Size(132, 27);
            this.label18.Size = new System.Drawing.Size(106, 21);
            this.label18.TabIndex = 147;
            this.label18.Text = "订单跟踪号:";
            // 
@@ -708,10 +672,9 @@
            this.label17.BackColor = System.Drawing.Color.Gray;
            this.label17.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label17.ForeColor = System.Drawing.Color.Yellow;
            this.label17.Location = new System.Drawing.Point(11, 56);
            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label17.Location = new System.Drawing.Point(8, 45);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(92, 27);
            this.label17.Size = new System.Drawing.Size(74, 21);
            this.label17.TabIndex = 145;
            this.label17.Text = "流水号:";
            // 
@@ -720,10 +683,9 @@
            this.txtHProcNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHProcNo.ForeColor = System.Drawing.Color.Green;
            this.txtHProcNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHProcNo.Location = new System.Drawing.Point(133, 49);
            this.txtHProcNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHProcNo.Location = new System.Drawing.Point(100, 39);
            this.txtHProcNo.Name = "txtHProcNo";
            this.txtHProcNo.Size = new System.Drawing.Size(328, 38);
            this.txtHProcNo.Size = new System.Drawing.Size(247, 32);
            this.txtHProcNo.TabIndex = 146;
            this.txtHProcNo.TextChanged += new System.EventHandler(this.txtHProcNo_TextChanged);
            this.txtHProcNo.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHProcNo_KeyDown);
@@ -734,10 +696,9 @@
            this.label13.BackColor = System.Drawing.Color.Gray;
            this.label13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label13.ForeColor = System.Drawing.Color.Yellow;
            this.label13.Location = new System.Drawing.Point(496, 318);
            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label13.Location = new System.Drawing.Point(372, 254);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(132, 27);
            this.label13.Size = new System.Drawing.Size(106, 21);
            this.label13.TabIndex = 116;
            this.label13.Text = "任务单数量:";
            // 
@@ -746,10 +707,9 @@
            this.txtHQty.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHQty.ForeColor = System.Drawing.Color.Green;
            this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHQty.Location = new System.Drawing.Point(653, 136);
            this.txtHQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHQty.Location = new System.Drawing.Point(490, 109);
            this.txtHQty.Name = "txtHQty";
            this.txtHQty.Size = new System.Drawing.Size(292, 38);
            this.txtHQty.Size = new System.Drawing.Size(220, 32);
            this.txtHQty.TabIndex = 117;
            this.txtHQty.Tag = "0";
            this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -761,10 +721,9 @@
            this.cmdHCenterID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHCenterID.Enabled = false;
            this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
            this.cmdHCenterID.Location = new System.Drawing.Point(423, 135);
            this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHCenterID.Location = new System.Drawing.Point(317, 108);
            this.cmdHCenterID.Name = "cmdHCenterID";
            this.cmdHCenterID.Size = new System.Drawing.Size(40, 40);
            this.cmdHCenterID.Size = new System.Drawing.Size(30, 32);
            this.cmdHCenterID.TabIndex = 144;
            this.cmdHCenterID.UseVisualStyleBackColor = false;
            this.cmdHCenterID.Click += new System.EventHandler(this.cmdHCenterID_Click);
@@ -775,10 +734,9 @@
            this.label12.BackColor = System.Drawing.Color.Gray;
            this.label12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label12.ForeColor = System.Drawing.Color.Yellow;
            this.label12.Location = new System.Drawing.Point(503, 13);
            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label12.Location = new System.Drawing.Point(377, 10);
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(104, 27);
            this.label12.Size = new System.Drawing.Size(84, 21);
            this.label12.TabIndex = 114;
            this.label12.Text = "单 æ® å·ï¼š";
            // 
@@ -788,10 +746,9 @@
            this.label20.BackColor = System.Drawing.Color.Gray;
            this.label20.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label20.ForeColor = System.Drawing.Color.Yellow;
            this.label20.Location = new System.Drawing.Point(11, 142);
            this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label20.Location = new System.Drawing.Point(8, 114);
            this.label20.Name = "label20";
            this.label20.Size = new System.Drawing.Size(112, 27);
            this.label20.Size = new System.Drawing.Size(90, 21);
            this.label20.TabIndex = 142;
            this.label20.Text = "工作中心:";
            // 
@@ -801,12 +758,11 @@
            this.txtHBillNo.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBillNo.ForeColor = System.Drawing.Color.Green;
            this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBillNo.Location = new System.Drawing.Point(653, 6);
            this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBillNo.Location = new System.Drawing.Point(490, 5);
            this.txtHBillNo.Multiline = true;
            this.txtHBillNo.Name = "txtHBillNo";
            this.txtHBillNo.ReadOnly = true;
            this.txtHBillNo.Size = new System.Drawing.Size(292, 40);
            this.txtHBillNo.Size = new System.Drawing.Size(220, 33);
            this.txtHBillNo.TabIndex = 115;
            // 
            // txtHCenterID
@@ -815,12 +771,11 @@
            this.txtHCenterID.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHCenterID.ForeColor = System.Drawing.Color.Green;
            this.txtHCenterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHCenterID.Location = new System.Drawing.Point(133, 135);
            this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
            this.txtHCenterID.Location = new System.Drawing.Point(100, 108);
            this.txtHCenterID.Multiline = true;
            this.txtHCenterID.Name = "txtHCenterID";
            this.txtHCenterID.ReadOnly = true;
            this.txtHCenterID.Size = new System.Drawing.Size(287, 40);
            this.txtHCenterID.Size = new System.Drawing.Size(216, 33);
            this.txtHCenterID.TabIndex = 143;
            this.txtHCenterID.TabStop = false;
            // 
@@ -830,12 +785,11 @@
            this.txtHStationInTime.Font = new System.Drawing.Font("微软雅黑", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHStationInTime.ForeColor = System.Drawing.Color.Green;
            this.txtHStationInTime.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHStationInTime.Location = new System.Drawing.Point(133, 266);
            this.txtHStationInTime.Margin = new System.Windows.Forms.Padding(4);
            this.txtHStationInTime.Location = new System.Drawing.Point(100, 213);
            this.txtHStationInTime.Multiline = true;
            this.txtHStationInTime.Name = "txtHStationInTime";
            this.txtHStationInTime.ReadOnly = true;
            this.txtHStationInTime.Size = new System.Drawing.Size(328, 40);
            this.txtHStationInTime.Size = new System.Drawing.Size(247, 33);
            this.txtHStationInTime.TabIndex = 113;
            this.txtHStationInTime.Tag = "0";
            // 
@@ -861,11 +815,11 @@
            this.tabPage2.Controls.Add(this.label23);
            this.tabPage2.Controls.Add(this.label22);
            this.tabPage2.Controls.Add(this.label21);
            this.tabPage2.Location = new System.Drawing.Point(4, 25);
            this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage2.Location = new System.Drawing.Point(4, 22);
            this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.tabPage2.Size = new System.Drawing.Size(994, 403);
            this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabPage2.Size = new System.Drawing.Size(744, 320);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "其他信息";
            // 
@@ -875,11 +829,10 @@
            this.txtHSourceName5.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceName5.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName5.Location = new System.Drawing.Point(287, 186);
            this.txtHSourceName5.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName5.Location = new System.Drawing.Point(215, 149);
            this.txtHSourceName5.Name = "txtHSourceName5";
            this.txtHSourceName5.ReadOnly = true;
            this.txtHSourceName5.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName5.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName5.TabIndex = 137;
            this.txtHSourceName5.Tag = "0";
            // 
@@ -888,10 +841,9 @@
            this.txtHSourceID5.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceID5.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID5.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID5.Location = new System.Drawing.Point(151, 186);
            this.txtHSourceID5.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID5.Location = new System.Drawing.Point(113, 149);
            this.txtHSourceID5.Name = "txtHSourceID5";
            this.txtHSourceID5.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID5.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID5.TabIndex = 135;
            this.txtHSourceID5.Tag = "0";
            // 
@@ -899,10 +851,9 @@
            // 
            this.cmdHSourceID5.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID5.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID5.Image")));
            this.cmdHSourceID5.Location = new System.Drawing.Point(439, 186);
            this.cmdHSourceID5.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID5.Location = new System.Drawing.Point(329, 149);
            this.cmdHSourceID5.Name = "cmdHSourceID5";
            this.cmdHSourceID5.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID5.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID5.TabIndex = 136;
            this.cmdHSourceID5.UseVisualStyleBackColor = false;
            this.cmdHSourceID5.Click += new System.EventHandler(this.cmdHSourceID5_Click);
@@ -913,11 +864,10 @@
            this.txtHSourceName4.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceName4.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName4.Location = new System.Drawing.Point(287, 138);
            this.txtHSourceName4.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName4.Location = new System.Drawing.Point(215, 110);
            this.txtHSourceName4.Name = "txtHSourceName4";
            this.txtHSourceName4.ReadOnly = true;
            this.txtHSourceName4.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName4.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName4.TabIndex = 133;
            this.txtHSourceName4.Tag = "0";
            // 
@@ -926,10 +876,9 @@
            this.txtHSourceID4.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceID4.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID4.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID4.Location = new System.Drawing.Point(151, 138);
            this.txtHSourceID4.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID4.Location = new System.Drawing.Point(113, 110);
            this.txtHSourceID4.Name = "txtHSourceID4";
            this.txtHSourceID4.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID4.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID4.TabIndex = 131;
            this.txtHSourceID4.Tag = "0";
            // 
@@ -937,10 +886,9 @@
            // 
            this.cmdHSourceID4.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID4.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID4.Image")));
            this.cmdHSourceID4.Location = new System.Drawing.Point(439, 138);
            this.cmdHSourceID4.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID4.Location = new System.Drawing.Point(329, 110);
            this.cmdHSourceID4.Name = "cmdHSourceID4";
            this.cmdHSourceID4.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID4.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID4.TabIndex = 132;
            this.cmdHSourceID4.UseVisualStyleBackColor = false;
            this.cmdHSourceID4.Click += new System.EventHandler(this.cmdHSourceID4_Click);
@@ -951,11 +899,10 @@
            this.txtHSourceName3.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceName3.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName3.Location = new System.Drawing.Point(287, 88);
            this.txtHSourceName3.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName3.Location = new System.Drawing.Point(215, 70);
            this.txtHSourceName3.Name = "txtHSourceName3";
            this.txtHSourceName3.ReadOnly = true;
            this.txtHSourceName3.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName3.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName3.TabIndex = 129;
            this.txtHSourceName3.Tag = "0";
            // 
@@ -964,10 +911,9 @@
            this.txtHSourceID3.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceID3.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID3.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID3.Location = new System.Drawing.Point(151, 88);
            this.txtHSourceID3.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID3.Location = new System.Drawing.Point(113, 70);
            this.txtHSourceID3.Name = "txtHSourceID3";
            this.txtHSourceID3.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID3.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID3.TabIndex = 127;
            this.txtHSourceID3.Tag = "0";
            // 
@@ -975,10 +921,9 @@
            // 
            this.cmdHSourceID3.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID3.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID3.Image")));
            this.cmdHSourceID3.Location = new System.Drawing.Point(439, 88);
            this.cmdHSourceID3.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID3.Location = new System.Drawing.Point(329, 70);
            this.cmdHSourceID3.Name = "cmdHSourceID3";
            this.cmdHSourceID3.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID3.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID3.TabIndex = 128;
            this.cmdHSourceID3.UseVisualStyleBackColor = false;
            this.cmdHSourceID3.Click += new System.EventHandler(this.cmdHSourceID3_Click);
@@ -989,11 +934,10 @@
            this.txtHSourceName2.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceName2.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceName2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceName2.Location = new System.Drawing.Point(287, 40);
            this.txtHSourceName2.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceName2.Location = new System.Drawing.Point(215, 32);
            this.txtHSourceName2.Name = "txtHSourceName2";
            this.txtHSourceName2.ReadOnly = true;
            this.txtHSourceName2.Size = new System.Drawing.Size(151, 38);
            this.txtHSourceName2.Size = new System.Drawing.Size(114, 32);
            this.txtHSourceName2.TabIndex = 125;
            this.txtHSourceName2.Tag = "0";
            // 
@@ -1002,10 +946,9 @@
            this.txtHSourceID2.Font = new System.Drawing.Font("微软雅黑", 13.8F);
            this.txtHSourceID2.ForeColor = System.Drawing.Color.Green;
            this.txtHSourceID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceID2.Location = new System.Drawing.Point(151, 40);
            this.txtHSourceID2.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceID2.Location = new System.Drawing.Point(113, 32);
            this.txtHSourceID2.Name = "txtHSourceID2";
            this.txtHSourceID2.Size = new System.Drawing.Size(133, 38);
            this.txtHSourceID2.Size = new System.Drawing.Size(101, 32);
            this.txtHSourceID2.TabIndex = 123;
            this.txtHSourceID2.Tag = "0";
            // 
@@ -1013,10 +956,9 @@
            // 
            this.cmdHSourceID2.BackColor = System.Drawing.Color.Transparent;
            this.cmdHSourceID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSourceID2.Image")));
            this.cmdHSourceID2.Location = new System.Drawing.Point(439, 40);
            this.cmdHSourceID2.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHSourceID2.Location = new System.Drawing.Point(329, 32);
            this.cmdHSourceID2.Name = "cmdHSourceID2";
            this.cmdHSourceID2.Size = new System.Drawing.Size(40, 40);
            this.cmdHSourceID2.Size = new System.Drawing.Size(30, 32);
            this.cmdHSourceID2.TabIndex = 124;
            this.cmdHSourceID2.UseVisualStyleBackColor = false;
            this.cmdHSourceID2.Click += new System.EventHandler(this.cmdHSourceID2_Click);
@@ -1027,11 +969,10 @@
            this.txtHPieceQty.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHPieceQty.ForeColor = System.Drawing.Color.Green;
            this.txtHPieceQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHPieceQty.Location = new System.Drawing.Point(719, 38);
            this.txtHPieceQty.Margin = new System.Windows.Forms.Padding(4);
            this.txtHPieceQty.Location = new System.Drawing.Point(539, 30);
            this.txtHPieceQty.Multiline = true;
            this.txtHPieceQty.Name = "txtHPieceQty";
            this.txtHPieceQty.Size = new System.Drawing.Size(249, 40);
            this.txtHPieceQty.Size = new System.Drawing.Size(188, 33);
            this.txtHPieceQty.TabIndex = 121;
            this.txtHPieceQty.Tag = "0";
            this.txtHPieceQty.Visible = false;
@@ -1042,10 +983,9 @@
            this.label15.BackColor = System.Drawing.Color.Gray;
            this.label15.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label15.ForeColor = System.Drawing.Color.Yellow;
            this.label15.Location = new System.Drawing.Point(577, 38);
            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label15.Location = new System.Drawing.Point(433, 30);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(112, 27);
            this.label15.Size = new System.Drawing.Size(90, 21);
            this.label15.TabIndex = 120;
            this.label15.Text = "接收件数:";
            this.label15.Visible = false;
@@ -1055,10 +995,9 @@
            this.label14.AutoSize = true;
            this.label14.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label14.ForeColor = System.Drawing.Color.Yellow;
            this.label14.Location = new System.Drawing.Point(577, 86);
            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label14.Location = new System.Drawing.Point(433, 69);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(108, 27);
            this.label14.Size = new System.Drawing.Size(88, 21);
            this.label14.TabIndex = 118;
            this.label14.Text = "机      å°ï¼š";
            this.label14.Visible = false;
@@ -1068,10 +1007,9 @@
            this.label24.AutoSize = true;
            this.label24.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label24.ForeColor = System.Drawing.Color.Yellow;
            this.label24.Location = new System.Drawing.Point(28, 185);
            this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label24.Location = new System.Drawing.Point(21, 148);
            this.label24.Name = "label24";
            this.label24.Size = new System.Drawing.Size(124, 27);
            this.label24.Size = new System.Drawing.Size(99, 21);
            this.label24.TabIndex = 134;
            this.label24.Text = "生产资源5:";
            // 
@@ -1080,10 +1018,9 @@
            this.label23.AutoSize = true;
            this.label23.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label23.ForeColor = System.Drawing.Color.Yellow;
            this.label23.Location = new System.Drawing.Point(28, 138);
            this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label23.Location = new System.Drawing.Point(21, 110);
            this.label23.Name = "label23";
            this.label23.Size = new System.Drawing.Size(124, 27);
            this.label23.Size = new System.Drawing.Size(99, 21);
            this.label23.TabIndex = 130;
            this.label23.Text = "生产资源4:";
            // 
@@ -1092,10 +1029,9 @@
            this.label22.AutoSize = true;
            this.label22.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label22.ForeColor = System.Drawing.Color.Yellow;
            this.label22.Location = new System.Drawing.Point(28, 88);
            this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label22.Location = new System.Drawing.Point(21, 70);
            this.label22.Name = "label22";
            this.label22.Size = new System.Drawing.Size(124, 27);
            this.label22.Size = new System.Drawing.Size(99, 21);
            this.label22.TabIndex = 126;
            this.label22.Text = "生产资源3:";
            // 
@@ -1104,10 +1040,9 @@
            this.label21.AutoSize = true;
            this.label21.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label21.ForeColor = System.Drawing.Color.Yellow;
            this.label21.Location = new System.Drawing.Point(28, 39);
            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label21.Location = new System.Drawing.Point(21, 31);
            this.label21.Name = "label21";
            this.label21.Size = new System.Drawing.Size(124, 27);
            this.label21.Size = new System.Drawing.Size(99, 21);
            this.label21.TabIndex = 122;
            this.label21.Text = "生产资源2:";
            // 
@@ -1117,11 +1052,11 @@
            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
            this.groupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
            this.groupBox1.Location = new System.Drawing.Point(1006, 77);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.groupBox1.Location = new System.Drawing.Point(755, 61);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.groupBox1.Size = new System.Drawing.Size(371, 655);
            this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Size = new System.Drawing.Size(278, 525);
            this.groupBox1.TabIndex = 152;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "本站工单";
@@ -1130,12 +1065,12 @@
            // 
            this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdCardList.Location = new System.Drawing.Point(3, 25);
            this.grdCardList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.grdCardList.Location = new System.Drawing.Point(2, 21);
            this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdCardList.Name = "grdCardList";
            this.grdCardList.RowHeadersWidth = 51;
            this.grdCardList.RowTemplate.Height = 27;
            this.grdCardList.Size = new System.Drawing.Size(365, 628);
            this.grdCardList.Size = new System.Drawing.Size(274, 502);
            this.grdCardList.TabIndex = 150;
            // 
            // panel2
@@ -1146,10 +1081,10 @@
            this.panel2.Controls.Add(this.label19);
            this.panel2.Controls.Add(this.lblCaption);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel2.Location = new System.Drawing.Point(4, 22);
            this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.panel2.Location = new System.Drawing.Point(3, 17);
            this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(1373, 55);
            this.panel2.Size = new System.Drawing.Size(1030, 44);
            this.panel2.TabIndex = 151;
            // 
            // txtHBarCode_Mater
@@ -1157,11 +1092,10 @@
            this.txtHBarCode_Mater.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode_Mater.ForeColor = System.Drawing.Color.Green;
            this.txtHBarCode_Mater.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode_Mater.Location = new System.Drawing.Point(767, 7);
            this.txtHBarCode_Mater.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBarCode_Mater.Location = new System.Drawing.Point(575, 6);
            this.txtHBarCode_Mater.Multiline = true;
            this.txtHBarCode_Mater.Name = "txtHBarCode_Mater";
            this.txtHBarCode_Mater.Size = new System.Drawing.Size(292, 40);
            this.txtHBarCode_Mater.Size = new System.Drawing.Size(220, 33);
            this.txtHBarCode_Mater.TabIndex = 115;
            this.txtHBarCode_Mater.Tag = "0";
            this.txtHBarCode_Mater.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_Mater_KeyDown);
@@ -1172,10 +1106,9 @@
            this.label25.BackColor = System.Drawing.Color.Gray;
            this.label25.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label25.ForeColor = System.Drawing.Color.Yellow;
            this.label25.Location = new System.Drawing.Point(627, 12);
            this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label25.Location = new System.Drawing.Point(470, 10);
            this.label25.Name = "label25";
            this.label25.Size = new System.Drawing.Size(132, 27);
            this.label25.Size = new System.Drawing.Size(106, 21);
            this.label25.TabIndex = 114;
            this.label25.Text = "配件条形码:";
            // 
@@ -1184,11 +1117,10 @@
            this.txtHBarCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHBarCode.ForeColor = System.Drawing.Color.Green;
            this.txtHBarCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHBarCode.Location = new System.Drawing.Point(248, 8);
            this.txtHBarCode.Margin = new System.Windows.Forms.Padding(4);
            this.txtHBarCode.Location = new System.Drawing.Point(186, 6);
            this.txtHBarCode.Multiline = true;
            this.txtHBarCode.Name = "txtHBarCode";
            this.txtHBarCode.Size = new System.Drawing.Size(279, 40);
            this.txtHBarCode.Size = new System.Drawing.Size(210, 33);
            this.txtHBarCode.TabIndex = 113;
            this.txtHBarCode.Tag = "0";
            this.txtHBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtHBarCode_KeyDown);
@@ -1199,10 +1131,9 @@
            this.label19.BackColor = System.Drawing.Color.Gray;
            this.label19.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label19.ForeColor = System.Drawing.Color.Yellow;
            this.label19.Location = new System.Drawing.Point(160, 12);
            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label19.Location = new System.Drawing.Point(120, 10);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(92, 27);
            this.label19.Size = new System.Drawing.Size(74, 21);
            this.label19.TabIndex = 112;
            this.label19.Text = "流转卡:";
            // 
@@ -1213,6 +1144,8 @@
            // 
            // panel1
            // 
            this.panel1.Controls.Add(this.cmdHmrlk);
            this.panel1.Controls.Add(this.cmdHbclk);
            this.panel1.Controls.Add(this.cmdDelLine);
            this.panel1.Controls.Add(this.cmdXZ);
            this.panel1.Controls.Add(this.button2);
@@ -1223,18 +1156,26 @@
            this.panel1.Controls.Add(this.cmdCancel);
            this.panel1.Controls.Add(this.cmdOK);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel1.Location = new System.Drawing.Point(0, 736);
            this.panel1.Margin = new System.Windows.Forms.Padding(4);
            this.panel1.Location = new System.Drawing.Point(0, 589);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1381, 81);
            this.panel1.Size = new System.Drawing.Size(1036, 65);
            this.panel1.TabIndex = 115;
            //
            // cmdDelLine
            //
            this.cmdDelLine.Location = new System.Drawing.Point(198, 10);
            this.cmdDelLine.Name = "cmdDelLine";
            this.cmdDelLine.Size = new System.Drawing.Size(85, 42);
            this.cmdDelLine.TabIndex = 125;
            this.cmdDelLine.Text = "删    è¡Œ";
            this.cmdDelLine.UseVisualStyleBackColor = true;
            this.cmdDelLine.Click += new System.EventHandler(this.cmdDelLine_Click);
            // 
            // cmdXZ
            // 
            this.cmdXZ.Location = new System.Drawing.Point(20, 12);
            this.cmdXZ.Margin = new System.Windows.Forms.Padding(4);
            this.cmdXZ.Location = new System.Drawing.Point(15, 10);
            this.cmdXZ.Name = "cmdXZ";
            this.cmdXZ.Size = new System.Drawing.Size(113, 52);
            this.cmdXZ.Size = new System.Drawing.Size(85, 42);
            this.cmdXZ.TabIndex = 124;
            this.cmdXZ.Text = "新    å¢ž";
            this.cmdXZ.UseVisualStyleBackColor = true;
@@ -1243,10 +1184,9 @@
            // button2
            // 
            this.button2.Enabled = false;
            this.button2.Location = new System.Drawing.Point(756, 12);
            this.button2.Margin = new System.Windows.Forms.Padding(4);
            this.button2.Location = new System.Drawing.Point(567, 10);
            this.button2.Name = "button2";
            this.button2.Size = new System.Drawing.Size(113, 52);
            this.button2.Size = new System.Drawing.Size(85, 42);
            this.button2.TabIndex = 123;
            this.button2.Text = "反审核";
            this.button2.UseVisualStyleBackColor = true;
@@ -1255,10 +1195,9 @@
            // button1
            // 
            this.button1.Enabled = false;
            this.button1.Location = new System.Drawing.Point(633, 12);
            this.button1.Margin = new System.Windows.Forms.Padding(4);
            this.button1.Location = new System.Drawing.Point(475, 10);
            this.button1.Name = "button1";
            this.button1.Size = new System.Drawing.Size(113, 52);
            this.button1.Size = new System.Drawing.Size(85, 42);
            this.button1.TabIndex = 122;
            this.button1.Text = "审  æ ¸";
            this.button1.UseVisualStyleBackColor = true;
@@ -1266,10 +1205,9 @@
            // 
            // cmdHDelBill
            // 
            this.cmdHDelBill.Location = new System.Drawing.Point(1009, 12);
            this.cmdHDelBill.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHDelBill.Location = new System.Drawing.Point(757, 10);
            this.cmdHDelBill.Name = "cmdHDelBill";
            this.cmdHDelBill.Size = new System.Drawing.Size(113, 52);
            this.cmdHDelBill.Size = new System.Drawing.Size(85, 42);
            this.cmdHDelBill.TabIndex = 121;
            this.cmdHDelBill.Text = "删除领料单";
            this.cmdHDelBill.UseVisualStyleBackColor = true;
@@ -1278,10 +1216,9 @@
            // 
            // cmdXG
            // 
            this.cmdXG.Location = new System.Drawing.Point(143, 12);
            this.cmdXG.Margin = new System.Windows.Forms.Padding(4);
            this.cmdXG.Location = new System.Drawing.Point(107, 10);
            this.cmdXG.Name = "cmdXG";
            this.cmdXG.Size = new System.Drawing.Size(113, 52);
            this.cmdXG.Size = new System.Drawing.Size(85, 42);
            this.cmdXG.TabIndex = 120;
            this.cmdXG.Text = "ä¿®    æ”¹";
            this.cmdXG.UseVisualStyleBackColor = true;
@@ -1289,38 +1226,45 @@
            // 
            // cmdAddNew
            // 
            this.cmdAddNew.Location = new System.Drawing.Point(879, 12);
            this.cmdAddNew.Margin = new System.Windows.Forms.Padding(4);
            this.cmdAddNew.Location = new System.Drawing.Point(847, 11);
            this.cmdAddNew.Name = "cmdAddNew";
            this.cmdAddNew.Size = new System.Drawing.Size(113, 52);
            this.cmdAddNew.Size = new System.Drawing.Size(85, 42);
            this.cmdAddNew.TabIndex = 114;
            this.cmdAddNew.Text = "清    ç©º";
            this.cmdAddNew.UseVisualStyleBackColor = true;
            this.cmdAddNew.Visible = false;
            this.cmdAddNew.Click += new System.EventHandler(this.cmdAddNew_Click);
            // 
            // cmdDelLine
            // cmdHbclk
            // 
            this.cmdDelLine.Location = new System.Drawing.Point(264, 12);
            this.cmdDelLine.Margin = new System.Windows.Forms.Padding(4);
            this.cmdDelLine.Name = "cmdDelLine";
            this.cmdDelLine.Size = new System.Drawing.Size(113, 52);
            this.cmdDelLine.TabIndex = 125;
            this.cmdDelLine.Text = "删    è¡Œ";
            this.cmdDelLine.UseVisualStyleBackColor = true;
            this.cmdDelLine.Click += new System.EventHandler(this.cmdDelLine_Click);
            this.cmdHbclk.Location = new System.Drawing.Point(659, 5);
            this.cmdHbclk.Name = "cmdHbclk";
            this.cmdHbclk.Size = new System.Drawing.Size(85, 28);
            this.cmdHbclk.TabIndex = 126;
            this.cmdHbclk.Text = "保存列宽";
            this.cmdHbclk.UseVisualStyleBackColor = true;
            this.cmdHbclk.Click += new System.EventHandler(this.cmdHbclk_Click);
            //
            // cmdHmrlk
            //
            this.cmdHmrlk.Location = new System.Drawing.Point(659, 33);
            this.cmdHmrlk.Name = "cmdHmrlk";
            this.cmdHmrlk.Size = new System.Drawing.Size(85, 28);
            this.cmdHmrlk.TabIndex = 127;
            this.cmdHmrlk.Text = "默认列宽";
            this.cmdHmrlk.UseVisualStyleBackColor = true;
            this.cmdHmrlk.Click += new System.EventHandler(this.cmdHmrlk_Click);
            // 
            // MES_StationInBill
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = System.Drawing.Color.Gray;
            this.ClientSize = new System.Drawing.Size(1381, 817);
            this.ClientSize = new System.Drawing.Size(1036, 654);
            this.Controls.Add(this.gbUp);
            this.Controls.Add(this.panel1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.KeyPreview = true;
            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "MES_StationInBill";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "进站接收单";
@@ -1432,5 +1376,7 @@
        private System.Windows.Forms.TextBox txtHBarCode_Mater;
        private System.Windows.Forms.Label label25;
        private System.Windows.Forms.Button cmdDelLine;
        private System.Windows.Forms.Button cmdHmrlk;
        private System.Windows.Forms.Button cmdHbclk;
    }
}