Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

ouyangqing

2021-01-25 48c4274b2928d2be93e3a5541e688b5f0776e463

Merge branch 'master' of http://101.37.171.70:10101/r/YqnMes

 .gitignore

@@ -22,3 +22,5 @@

/.vs/SCM/v16
/NETSCM/HXERP.ini
/.vs/YqnMES/v16
/.vs

 BaseSet/BaseSet.csproj

@@ -52,7 +52,7 @@
      <HintPath>..\DLL\DBUtility.dll</HintPath>

    </Reference>

    <Reference Include="Interop.gregn6Lib">

      <HintPath>..\..\..\宁波金睿信息技术\★工作-开发-项目★\项目7绍兴雅琪诺-网页版+MES\SCM源代码V13-0111\SCM源代码V13\SCM\bin\x86\Debug\Interop.gregn6Lib.dll</HintPath>

      <HintPath>..\SCM\bin\x86\Debug\Interop.gregn6Lib.dll</HintPath>

      <EmbedInteropTypes>True</EmbedInteropTypes>

    </Reference>

    <Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">


 NETSCM/ClsShowMod.cs

@@ -21,10 +21,11 @@
//using APSM;
using SCM;
using BaseSet;
//using EAM;
//using ReportM;
//using Kanban;

using SCM.报表;

//using EAM;

//using ReportM;

//using Kanban;



namespace NETSCM
{
    class ClsShowMod
@@ -190,6 +191,27 @@
                        oGy_BarCodeDetailList.ModCaption = gnmc;

                        oGy_BarCodeDetailList.Show();

                        oMainForm.AddTabPage(oGy_BarCodeDetailList);

                        break;

                    case "qk_outprocesslist":

                        Qk_OutProcessList oQk_OutProcessList = new Qk_OutProcessList();

                        oQk_OutProcessList.MdiParent = oMain;

                        oQk_OutProcessList.ModCaption = gnmc;

                        oQk_OutProcessList.Show();

                        oMainForm.AddTabPage(oQk_OutProcessList);

                        break;

                    case "qk_processbilldetail":

                        Qk_ProcessBillDetail oQk_ProcessBillDetail = new Qk_ProcessBillDetail();

                        oQk_ProcessBillDetail.MdiParent = oMain;

                        oQk_ProcessBillDetail.ModCaption = gnmc;

                        oQk_ProcessBillDetail.Show();

                        oMainForm.AddTabPage(oQk_ProcessBillDetail);

                        break;

                    case "qk_processbillmain":

                        Qk_ProcessbillMain oQk_ProcessbillMain = new Qk_ProcessbillMain();

                        oQk_ProcessbillMain.MdiParent = oMain;

                        oQk_ProcessbillMain.ModCaption = gnmc;

                        oQk_ProcessbillMain.Show();

                        oMainForm.AddTabPage(oQk_ProcessbillMain);

                        break;


                    //case "sc_processreport":

@@ -2104,7 +2126,7 @@
                        Sc_PackUnionBill oSc_PackUnionBill = new Sc_PackUnionBill();
                        oSc_PackUnionBill.ShowDialog(); 
                        break;
                    case "sc_packunionbillmainlist":
                    case "sc_packunionbilllist":
                        Sc_PackUnionBillList oSc_PackUnionBillList = new Sc_PackUnionBillList();
                        oSc_PackUnionBillList.MdiParent = oMain;
                        oSc_PackUnionBillList.ModCaption = gnmc;

 SCM/¹«ÓÃÀà/ClsGy_OpenTmp_Ctl.cs

@@ -27,7 +27,7 @@
        SCM.WMSWeb.WebService1 oWeb = new SCM.WMSWeb.WebService1();
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public string  HOldNumber;
        //新增
        //新增//-//
        public bool AddNew()
        {
            //设置动态URL

 SCM/¹«ÓÃÀà/ClsPub1.cs

@@ -11,7 +11,8 @@
{
    public class ClsPub1
    {
        public static string WEBSURL = "http://124.70.129.242/WEBS-WMS/WebService1.asmx";    //雅琪诺
        //public static string WEBSURL = "http://124.70.129.242/WEBS-WMS/WebService1.asmx";    //雅琪诺
        public static string WEBSURL = "http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx";    //雅琪诺
        //public static string WEBSURL = "http://192.168.1.29/WEBS-WMS/WebService1.asmx";   //圣龙    å†…网
        //public static string WEBSURL = "http://122.227.138.236/WEBS-WMS/WebService1.asmx";   //圣龙
        //public static string WEBSURL = "http://220.189.218.154:8091/WEBS-WMS/WebService1.asmx";         //四维尔    å¤–网

 SCM/¹«ÓÃÀà/Cls_S_K3_PoinStockList.cs

@@ -16,6 +16,7 @@
            base.sCondtion = "  ";
            base.sOrderSql = "  order by å•æ®å· desc,hsubid ";
            base.sKeyCol = "供应商名称";

        }
        //
 

 SCM/µ¥¾Ý×ÊÁÏ/Gy_SourceBillList_Touch.cs

@@ -208,7 +208,11 @@
                MessageBox.Show("源单单号不能为空!");
                return;
            }

            //如果生产订单的话就先同步
            if (HSourceBillType == "生产订单")
            {
                oWeb.getRunProc("exec h_p_IFCLD_ERPSourceBillToLocal_SEOrderToICMO  '" + HSourceBillNo + "'", ref DBUtility.ClsPub.sExeReturnInfo);
            }
            //得到信息
            DataSet DS = oWeb.getDataSetBySQL("exec h_p_SourceBillList_Touch '" + HSourceBillType + "','" + HSourceBillNo + "','" + DBUtility.ClsPub.isStrNull(txtHBarCode.Text) + "'" , "h_p_SourceBillList_Touch", ref DBUtility.ClsPub.sExeReturnInfo);
            if (DS==null ||  DS.Tables[0].Rows.Count == 0)

 SCM/µ¥¾Ý×ÊÁÏ/Sc_ICMOReportToBarCode.cs

@@ -601,22 +601,26 @@
                HUnitID = DBUtility.ClsPub.isLong(txtHUnitName.Tag);

                HQty2 = HQty;

                //HBatchNo2 = HBatchNo;

                //if (HSourceBillType != "生产订单")

                //{

                //HBatchNo2 = TM;

                //HBatchNo2 = HBatchNo + "-" + LSH2;

                //判断按钮类型给批次增加后缀

                if (sType == "SaveDown")

                if (HSourceBillType == "生产订单")

                {

                    HBatchNo2 = HBatchNo + "CP-" + LSH2;

                }

                else if (sType == "Sample")

                {

                    HBatchNo2 = HBatchNo + "B-" + LSH2;

                    HBatchNo2 = HBatchNo;

                }

                else

                {

                    HBatchNo2 = HBatchNo + "-" + LSH2;

                    //HBatchNo2 = HBatchNo + "-" + LSH2;

                    //判断按钮类型给批次增加后缀

                    if (sType == "SaveDown")

                    {

                        HBatchNo2 = HBatchNo + "CP-" + LSH2;

                    }

                    else if (sType == "Sample")

                    {

                        HBatchNo2 = HBatchNo + "B-" + LSH2;

                    }

                    else

                    {

                        HBatchNo2 = HBatchNo + "-" + LSH2;

                    }

                }

                //}

                //HSourceBillType = HSourceBillTypeID;


 SCM/µ¥¾Ý×ÊÁÏ/Sc_PackUnionBill.cs

@@ -449,7 +449,7 @@
            try
            {
                DataTable ds = new DataTable();
                BLL.Utility.FillRecordToReport_FstRow(Report, grdMain, ds, 0);
                BLL.Utility.FillRecordToReport(Report, grdMain, ds, 0);
            }
            catch (Exception e)
            {

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

@@ -165,6 +165,7 @@
        public Int16 HJiaYeLX2Col = 69;
        public Int16 HJiaYeL2Col = 70;
        public Int16 POOrderBillNo2Col = 71;
        public Int16 HMaker = 72;
        //
        public  string ModName = "85";
        public  string ModCaption = "条码生成";
@@ -1336,6 +1337,7 @@
                        grdSub.Rows[i].Cells[HJiaYeLX2Col].Value = grdMain.Rows[j].Cells[HJiaYeLXCol].Value;
                        grdSub.Rows[i].Cells[HJiaYeL2Col].Value = grdMain.Rows[j].Cells[HJiaYeLCol].Value;
                        grdSub.Rows[i].Cells[POOrderBillNo2Col].Value = grdMain.Rows[j].Cells[POOrderBillNoCol].Value;
                        grdSub.Rows[i].Cells[HMaker].Value = ClsPub.CurUserName;
                        k = k + 1;
                        n = n + 1;
                        //oWeb.getRunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -1744,7 +1746,7 @@
            ClsPub1.initGridLast(sAllowCol, sTotalCol, oSumGrid);
            //----------------------------

            grdSub.ColumnCount = 72;                       //总列数
            grdSub.ColumnCount = 73;                       //总列数
            ClsPub1.initGridFst(grdSub, this.Name);
            grdSub.Columns[HSelectCol].HeaderText = "选择";
            grdSub.Columns[HTMCol].HeaderText = "条码编号";
@@ -1816,6 +1818,7 @@
            grdSub.Columns[HJiaYeLX2Col].HeaderText = "制冷液类型";
            grdSub.Columns[HJiaYeL2Col].HeaderText = "加液量";
            grdSub.Columns[POOrderBillNo2Col].HeaderText = "采购订单号";
            grdSub.Columns[HMaker].HeaderText = "制单人";

            //格式化    éšè—åˆ—
            grdSub.Columns[HBarCodeType2Col].Visible = false;

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

@@ -56,6 +56,7 @@
            this.P1 = new System.Windows.Forms.Panel();
            this.pic1 = new System.Windows.Forms.PictureBox();
            this.gbUp = new System.Windows.Forms.GroupBox();
            this.chkAddModel = new System.Windows.Forms.CheckBox();
            this.cmbHWorksNumber = new System.Windows.Forms.ComboBox();
            this.label4 = new System.Windows.Forms.Label();
            this.dtpHDate = new System.Windows.Forms.DateTimePicker();
@@ -102,7 +103,6 @@
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.tabPage2 = new System.Windows.Forms.TabPage();
            this.grdSub = new System.Windows.Forms.DataGridView();
            this.chkAddModel = new System.Windows.Forms.CheckBox();
            this.Tool.SuspendLayout();
            this.P1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -148,7 +148,7 @@
            this.Tool.Location = new System.Drawing.Point(0, 0);
            this.Tool.Name = "Tool";
            this.Tool.Padding = new System.Windows.Forms.Padding(0);
            this.Tool.Size = new System.Drawing.Size(1481, 62);
            this.Tool.Size = new System.Drawing.Size(1028, 50);
            this.Tool.Stretch = true;
            this.Tool.TabIndex = 17;
            this.Tool.Text = "toolStrip1";
@@ -184,7 +184,7 @@
            // toolStripSeparator2
            // 
            this.toolStripSeparator2.Name = "toolStripSeparator2";
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
            // 
            // spRow
            // 
@@ -219,7 +219,7 @@
            // toolStripSeparator6
            // 
            this.toolStripSeparator6.Name = "toolStripSeparator6";
            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
            // 
            // DelRow
            // 
@@ -238,7 +238,7 @@
            // toolStripSeparator4
            // 
            this.toolStripSeparator4.Name = "toolStripSeparator4";
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
            // 
            // bc
            // 
@@ -271,7 +271,7 @@
            // toolStripSeparator1
            // 
            this.toolStripSeparator1.Name = "toolStripSeparator1";
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
            // 
            // kc
            // 
@@ -290,7 +290,7 @@
            // toolStripSeparator3
            // 
            this.toolStripSeparator3.Name = "toolStripSeparator3";
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
            // 
            // tb
            // 
@@ -310,7 +310,7 @@
            // toolStripSeparator5
            // 
            this.toolStripSeparator5.Name = "toolStripSeparator5";
            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
            // 
            // tc
            // 
@@ -330,7 +330,7 @@
            // 
            this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator12.Name = "toolStripSeparator12";
            this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
            // 
            // mrlk
            // 
@@ -340,7 +340,7 @@
            this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
            this.mrlk.Name = "mrlk";
            this.mrlk.Size = new System.Drawing.Size(73, 59);
            this.mrlk.Size = new System.Drawing.Size(60, 47);
            this.mrlk.Text = "默认列宽";
            this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -350,7 +350,7 @@
            // 
            this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator11.Name = "toolStripSeparator11";
            this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
            // 
            // bclk
            // 
@@ -360,7 +360,7 @@
            this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
            this.bclk.ImageTransparentColor = System.Drawing.Color.White;
            this.bclk.Name = "bclk";
            this.bclk.Size = new System.Drawing.Size(73, 59);
            this.bclk.Size = new System.Drawing.Size(60, 47);
            this.bclk.Text = "保存列宽";
            this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
            this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -370,16 +370,15 @@
            // 
            this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
            this.toolStripSeparator10.Name = "toolStripSeparator10";
            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
            // 
            // lblCaption
            // 
            this.lblCaption.AutoSize = true;
            this.lblCaption.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblCaption.Location = new System.Drawing.Point(668, 15);
            this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.lblCaption.Location = new System.Drawing.Point(501, 12);
            this.lblCaption.Name = "lblCaption";
            this.lblCaption.Size = new System.Drawing.Size(110, 24);
            this.lblCaption.Size = new System.Drawing.Size(89, 19);
            this.lblCaption.TabIndex = 18;
            this.lblCaption.Text = "单据编辑";
            // 
@@ -391,18 +390,16 @@
            this.P1.Controls.Add(this.gbUp);
            this.P1.Controls.Add(this.pb1);
            this.P1.Dock = System.Windows.Forms.DockStyle.Top;
            this.P1.Location = new System.Drawing.Point(55, 62);
            this.P1.Margin = new System.Windows.Forms.Padding(4);
            this.P1.Location = new System.Drawing.Point(41, 50);
            this.P1.Name = "P1";
            this.P1.Size = new System.Drawing.Size(1374, 154);
            this.P1.Size = new System.Drawing.Size(948, 123);
            this.P1.TabIndex = 31;
            // 
            // pic1
            // 
            this.pic1.Location = new System.Drawing.Point(417, 4);
            this.pic1.Margin = new System.Windows.Forms.Padding(4);
            this.pic1.Location = new System.Drawing.Point(313, 3);
            this.pic1.Name = "pic1";
            this.pic1.Size = new System.Drawing.Size(104, 51);
            this.pic1.Size = new System.Drawing.Size(78, 41);
            this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.pic1.TabIndex = 36;
            this.pic1.TabStop = false;
@@ -426,50 +423,58 @@
            this.gbUp.Controls.Add(this.label14);
            this.gbUp.Controls.Add(this.cmbSourceBillType);
            this.gbUp.Controls.Add(this.label10);
            this.gbUp.Location = new System.Drawing.Point(19, 52);
            this.gbUp.Margin = new System.Windows.Forms.Padding(4);
            this.gbUp.Location = new System.Drawing.Point(14, 42);
            this.gbUp.Name = "gbUp";
            this.gbUp.Padding = new System.Windows.Forms.Padding(4);
            this.gbUp.Size = new System.Drawing.Size(1334, 94);
            this.gbUp.Size = new System.Drawing.Size(1000, 75);
            this.gbUp.TabIndex = 33;
            this.gbUp.TabStop = false;
            // 
            // chkAddModel
            // 
            this.chkAddModel.AutoSize = true;
            this.chkAddModel.Location = new System.Drawing.Point(878, 49);
            this.chkAddModel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.chkAddModel.Name = "chkAddModel";
            this.chkAddModel.Size = new System.Drawing.Size(72, 16);
            this.chkAddModel.TabIndex = 101;
            this.chkAddModel.Text = "追加模式";
            this.chkAddModel.UseVisualStyleBackColor = true;
            // 
            // cmbHWorksNumber
            // 
            this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHWorksNumber.FormattingEnabled = true;
            this.cmbHWorksNumber.Location = new System.Drawing.Point(525, 21);
            this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4);
            this.cmbHWorksNumber.Location = new System.Drawing.Point(394, 17);
            this.cmbHWorksNumber.Name = "cmbHWorksNumber";
            this.cmbHWorksNumber.Size = new System.Drawing.Size(249, 23);
            this.cmbHWorksNumber.Size = new System.Drawing.Size(188, 20);
            this.cmbHWorksNumber.TabIndex = 100;
            // 
            // label4
            // 
            this.label4.AutoSize = true;
            this.label4.ForeColor = System.Drawing.Color.Black;
            this.label4.Location = new System.Drawing.Point(436, 26);
            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label4.Location = new System.Drawing.Point(327, 21);
            this.label4.Name = "label4";
            this.label4.Size = new System.Drawing.Size(67, 15);
            this.label4.Size = new System.Drawing.Size(53, 12);
            this.label4.TabIndex = 99;
            this.label4.Text = "工厂代码";
            // 
            // dtpHDate
            // 
            this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
            this.dtpHDate.Location = new System.Drawing.Point(901, 21);
            this.dtpHDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.dtpHDate.Location = new System.Drawing.Point(676, 17);
            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.dtpHDate.Name = "dtpHDate";
            this.dtpHDate.Size = new System.Drawing.Size(249, 25);
            this.dtpHDate.Size = new System.Drawing.Size(188, 21);
            this.dtpHDate.TabIndex = 94;
            // 
            // label2
            // 
            this.label2.AutoSize = true;
            this.label2.Location = new System.Drawing.Point(812, 26);
            this.label2.Location = new System.Drawing.Point(609, 21);
            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(69, 15);
            this.label2.Size = new System.Drawing.Size(53, 12);
            this.label2.TabIndex = 93;
            this.label2.Text = "日    æœŸ";
            // 
@@ -477,20 +482,18 @@
            // 
            this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHOrgID.FormattingEnabled = true;
            this.cmbHOrgID.Location = new System.Drawing.Point(135, 21);
            this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4);
            this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
            this.cmbHOrgID.Name = "cmbHOrgID";
            this.cmbHOrgID.Size = new System.Drawing.Size(249, 23);
            this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
            this.cmbHOrgID.TabIndex = 85;
            // 
            // label3
            // 
            this.label3.AutoSize = true;
            this.label3.ForeColor = System.Drawing.Color.Black;
            this.label3.Location = new System.Drawing.Point(47, 26);
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label3.Location = new System.Drawing.Point(35, 21);
            this.label3.Name = "label3";
            this.label3.Size = new System.Drawing.Size(69, 15);
            this.label3.Size = new System.Drawing.Size(53, 12);
            this.label3.TabIndex = 84;
            this.label3.Text = "组    ç»‡";
            // 
@@ -498,20 +501,18 @@
            // 
            this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHBarCodeType.FormattingEnabled = true;
            this.cmbHBarCodeType.Location = new System.Drawing.Point(901, 58);
            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
            this.cmbHBarCodeType.Location = new System.Drawing.Point(676, 46);
            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
            this.cmbHBarCodeType.Size = new System.Drawing.Size(249, 23);
            this.cmbHBarCodeType.Size = new System.Drawing.Size(188, 20);
            this.cmbHBarCodeType.TabIndex = 81;
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.ForeColor = System.Drawing.Color.Black;
            this.label1.Location = new System.Drawing.Point(812, 62);
            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label1.Location = new System.Drawing.Point(609, 50);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(67, 15);
            this.label1.Size = new System.Drawing.Size(53, 12);
            this.label1.TabIndex = 80;
            this.label1.Text = "条码类型";
            // 
@@ -520,10 +521,9 @@
            this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
            this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
            this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdHEmpID.Location = new System.Drawing.Point(1189, -9);
            this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(4);
            this.cmdHEmpID.Location = new System.Drawing.Point(892, -7);
            this.cmdHEmpID.Name = "cmdHEmpID";
            this.cmdHEmpID.Size = new System.Drawing.Size(29, 28);
            this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
            this.cmdHEmpID.TabIndex = 79;
            this.cmdHEmpID.UseVisualStyleBackColor = false;
            this.cmdHEmpID.Visible = false;
@@ -532,10 +532,9 @@
            // 
            this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
            this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
            this.cmdSourceBillNo.Location = new System.Drawing.Point(747, 56);
            this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
            this.cmdSourceBillNo.Name = "cmdSourceBillNo";
            this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
            this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
            this.cmdSourceBillNo.TabIndex = 42;
            this.cmdSourceBillNo.UseVisualStyleBackColor = true;
            this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -543,10 +542,9 @@
            // txtHSourceBillNo
            // 
            this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHSourceBillNo.Location = new System.Drawing.Point(525, 58);
            this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
            this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
            this.txtHSourceBillNo.Name = "txtHSourceBillNo";
            this.txtHSourceBillNo.Size = new System.Drawing.Size(220, 25);
            this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
            this.txtHSourceBillNo.TabIndex = 41;
            this.txtHSourceBillNo.TextChanged += new System.EventHandler(this.txtHSourceBillNo_TextChanged);
            this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
@@ -555,10 +553,9 @@
            // 
            this.label14.AutoSize = true;
            this.label14.ForeColor = System.Drawing.Color.Black;
            this.label14.Location = new System.Drawing.Point(436, 62);
            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label14.Location = new System.Drawing.Point(327, 50);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(68, 15);
            this.label14.Size = new System.Drawing.Size(53, 12);
            this.label14.TabIndex = 40;
            this.label14.Text = "选 å• å·";
            // 
@@ -567,29 +564,26 @@
            this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbSourceBillType.FormattingEnabled = true;
            this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.cmbSourceBillType.Location = new System.Drawing.Point(135, 58);
            this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
            this.cmbSourceBillType.Location = new System.Drawing.Point(101, 46);
            this.cmbSourceBillType.Name = "cmbSourceBillType";
            this.cmbSourceBillType.Size = new System.Drawing.Size(249, 23);
            this.cmbSourceBillType.Size = new System.Drawing.Size(188, 20);
            this.cmbSourceBillType.TabIndex = 36;
            // 
            // label10
            // 
            this.label10.AutoSize = true;
            this.label10.ForeColor = System.Drawing.Color.Black;
            this.label10.Location = new System.Drawing.Point(47, 62);
            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label10.Location = new System.Drawing.Point(35, 50);
            this.label10.Name = "label10";
            this.label10.Size = new System.Drawing.Size(67, 15);
            this.label10.Size = new System.Drawing.Size(53, 12);
            this.label10.TabIndex = 35;
            this.label10.Text = "源单类型";
            // 
            // pb1
            // 
            this.pb1.Location = new System.Drawing.Point(829, 15);
            this.pb1.Margin = new System.Windows.Forms.Padding(4);
            this.pb1.Location = new System.Drawing.Point(622, 12);
            this.pb1.Name = "pb1";
            this.pb1.Size = new System.Drawing.Size(341, 29);
            this.pb1.Size = new System.Drawing.Size(256, 23);
            this.pb1.TabIndex = 92;
            // 
            // panel2
@@ -616,20 +610,18 @@
            this.panel2.Controls.Add(this.txtHMaker);
            this.panel2.Controls.Add(this.label8);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel2.Location = new System.Drawing.Point(55, 634);
            this.panel2.Margin = new System.Windows.Forms.Padding(4);
            this.panel2.Location = new System.Drawing.Point(41, 506);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(1374, 116);
            this.panel2.Size = new System.Drawing.Size(948, 93);
            this.panel2.TabIndex = 32;
            // 
            // txtHDeleteDate
            // 
            this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHDeleteDate.Location = new System.Drawing.Point(967, 59);
            this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
            this.txtHDeleteDate.Name = "txtHDeleteDate";
            this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
            this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
            this.txtHDeleteDate.TabIndex = 19;
            // 
            // label25
@@ -637,10 +629,9 @@
            this.label25.AutoSize = true;
            this.label25.BackColor = System.Drawing.Color.Transparent;
            this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label25.Location = new System.Drawing.Point(888, 62);
            this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label25.Location = new System.Drawing.Point(666, 50);
            this.label25.Name = "label25";
            this.label25.Size = new System.Drawing.Size(67, 15);
            this.label25.Size = new System.Drawing.Size(53, 12);
            this.label25.TabIndex = 18;
            this.label25.Text = "作废日期";
            // 
@@ -648,10 +639,9 @@
            // 
            this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
            this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
            this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
            this.txtHDeleteMan.Name = "txtHDeleteMan";
            this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
            this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
            this.txtHDeleteMan.TabIndex = 17;
            // 
            // label27
@@ -659,10 +649,9 @@
            this.label27.AutoSize = true;
            this.label27.BackColor = System.Drawing.Color.Transparent;
            this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label27.Location = new System.Drawing.Point(888, 15);
            this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label27.Location = new System.Drawing.Point(666, 12);
            this.label27.Name = "label27";
            this.label27.Size = new System.Drawing.Size(52, 15);
            this.label27.Size = new System.Drawing.Size(41, 12);
            this.label27.TabIndex = 16;
            this.label27.Text = "作废人";
            // 
@@ -670,10 +659,9 @@
            // 
            this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
            this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
            this.txtHUpDateDate.Name = "txtHUpDateDate";
            this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
            this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
            this.txtHUpDateDate.TabIndex = 15;
            // 
            // label23
@@ -681,10 +669,9 @@
            this.label23.AutoSize = true;
            this.label23.BackColor = System.Drawing.Color.Transparent;
            this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label23.Location = new System.Drawing.Point(671, 59);
            this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label23.Location = new System.Drawing.Point(503, 47);
            this.label23.Name = "label23";
            this.label23.Size = new System.Drawing.Size(67, 15);
            this.label23.Size = new System.Drawing.Size(53, 12);
            this.label23.TabIndex = 14;
            this.label23.Text = "修改日期";
            // 
@@ -692,10 +679,9 @@
            // 
            this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
            this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
            this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
            this.txtHUpDater.Name = "txtHUpDater";
            this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
            this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
            this.txtHUpDater.TabIndex = 13;
            // 
            // label21
@@ -703,10 +689,9 @@
            this.label21.AutoSize = true;
            this.label21.BackColor = System.Drawing.Color.Transparent;
            this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label21.Location = new System.Drawing.Point(671, 15);
            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label21.Location = new System.Drawing.Point(503, 12);
            this.label21.Name = "label21";
            this.label21.Size = new System.Drawing.Size(52, 15);
            this.label21.Size = new System.Drawing.Size(41, 12);
            this.label21.TabIndex = 12;
            this.label21.Text = "修改人";
            // 
@@ -714,10 +699,9 @@
            // 
            this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
            this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
            this.txtHCloseDate.Name = "txtHCloseDate";
            this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
            this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
            this.txtHCloseDate.TabIndex = 11;
            // 
            // label19
@@ -725,10 +709,9 @@
            this.label19.AutoSize = true;
            this.label19.BackColor = System.Drawing.Color.Transparent;
            this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label19.Location = new System.Drawing.Point(451, 62);
            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label19.Location = new System.Drawing.Point(338, 50);
            this.label19.Name = "label19";
            this.label19.Size = new System.Drawing.Size(67, 15);
            this.label19.Size = new System.Drawing.Size(53, 12);
            this.label19.TabIndex = 10;
            this.label19.Text = "关闭日期";
            // 
@@ -736,10 +719,9 @@
            // 
            this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
            this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
            this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
            this.txtHCloseMan.Name = "txtHCloseMan";
            this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
            this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
            this.txtHCloseMan.TabIndex = 9;
            // 
            // label17
@@ -747,10 +729,9 @@
            this.label17.AutoSize = true;
            this.label17.BackColor = System.Drawing.Color.Transparent;
            this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label17.Location = new System.Drawing.Point(451, 20);
            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label17.Location = new System.Drawing.Point(338, 16);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(52, 15);
            this.label17.Size = new System.Drawing.Size(41, 12);
            this.label17.TabIndex = 8;
            this.label17.Text = "关闭人";
            // 
@@ -758,10 +739,9 @@
            // 
            this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
            this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
            this.txtHCheckDate.Name = "txtHCheckDate";
            this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
            this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
            this.txtHCheckDate.TabIndex = 7;
            // 
            // label15
@@ -769,10 +749,9 @@
            this.label15.AutoSize = true;
            this.label15.BackColor = System.Drawing.Color.Transparent;
            this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label15.Location = new System.Drawing.Point(233, 62);
            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label15.Location = new System.Drawing.Point(175, 50);
            this.label15.Name = "label15";
            this.label15.Size = new System.Drawing.Size(67, 15);
            this.label15.Size = new System.Drawing.Size(53, 12);
            this.label15.TabIndex = 6;
            this.label15.Text = "审核日期";
            // 
@@ -780,10 +759,9 @@
            // 
            this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
            this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHChecker.Location = new System.Drawing.Point(312, 16);
            this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHChecker.Location = new System.Drawing.Point(234, 13);
            this.txtHChecker.Name = "txtHChecker";
            this.txtHChecker.Size = new System.Drawing.Size(131, 19);
            this.txtHChecker.Size = new System.Drawing.Size(98, 15);
            this.txtHChecker.TabIndex = 5;
            // 
            // label13
@@ -791,10 +769,9 @@
            this.label13.AutoSize = true;
            this.label13.BackColor = System.Drawing.Color.Transparent;
            this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label13.Location = new System.Drawing.Point(233, 20);
            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label13.Location = new System.Drawing.Point(175, 16);
            this.label13.Name = "label13";
            this.label13.Size = new System.Drawing.Size(52, 15);
            this.label13.Size = new System.Drawing.Size(41, 12);
            this.label13.TabIndex = 4;
            this.label13.Text = "审核人";
            // 
@@ -802,10 +779,9 @@
            // 
            this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
            this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
            this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
            this.txtHMakeDate.Name = "txtHMakeDate";
            this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
            this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
            this.txtHMakeDate.TabIndex = 3;
            // 
            // label11
@@ -813,10 +789,9 @@
            this.label11.AutoSize = true;
            this.label11.BackColor = System.Drawing.Color.Transparent;
            this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label11.Location = new System.Drawing.Point(16, 62);
            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label11.Location = new System.Drawing.Point(12, 50);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(67, 15);
            this.label11.Size = new System.Drawing.Size(53, 12);
            this.label11.TabIndex = 2;
            this.label11.Text = "制单日期";
            // 
@@ -824,10 +799,9 @@
            // 
            this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
            this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.txtHMaker.Location = new System.Drawing.Point(95, 16);
            this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.txtHMaker.Location = new System.Drawing.Point(71, 13);
            this.txtHMaker.Name = "txtHMaker";
            this.txtHMaker.Size = new System.Drawing.Size(131, 19);
            this.txtHMaker.Size = new System.Drawing.Size(98, 15);
            this.txtHMaker.TabIndex = 1;
            // 
            // label8
@@ -835,10 +809,9 @@
            this.label8.AutoSize = true;
            this.label8.BackColor = System.Drawing.Color.Transparent;
            this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
            this.label8.Location = new System.Drawing.Point(16, 20);
            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.label8.Location = new System.Drawing.Point(12, 16);
            this.label8.Name = "label8";
            this.label8.Size = new System.Drawing.Size(52, 15);
            this.label8.Size = new System.Drawing.Size(41, 12);
            this.label8.TabIndex = 0;
            this.label8.Text = "制单人";
            // 
@@ -850,19 +823,17 @@
            // panel1
            // 
            this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
            this.panel1.Location = new System.Drawing.Point(0, 62);
            this.panel1.Margin = new System.Windows.Forms.Padding(4);
            this.panel1.Location = new System.Drawing.Point(0, 50);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(55, 688);
            this.panel1.Size = new System.Drawing.Size(41, 549);
            this.panel1.TabIndex = 33;
            // 
            // panel3
            // 
            this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
            this.panel3.Location = new System.Drawing.Point(1429, 62);
            this.panel3.Margin = new System.Windows.Forms.Padding(4);
            this.panel3.Location = new System.Drawing.Point(989, 50);
            this.panel3.Name = "panel3";
            this.panel3.Size = new System.Drawing.Size(52, 688);
            this.panel3.Size = new System.Drawing.Size(39, 549);
            this.panel3.TabIndex = 34;
            // 
            // grdMain
@@ -874,13 +845,12 @@
            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.grdMain.Location = new System.Drawing.Point(4, 4);
            this.grdMain.Margin = new System.Windows.Forms.Padding(4);
            this.grdMain.Location = new System.Drawing.Point(3, 3);
            this.grdMain.Name = "grdMain";
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersWidth = 30;
            this.grdMain.RowTemplate.Height = 23;
            this.grdMain.Size = new System.Drawing.Size(1358, 357);
            this.grdMain.Size = new System.Drawing.Size(934, 282);
            this.grdMain.TabIndex = 44;
            this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
            this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -897,23 +867,21 @@
            this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.grdSum.Location = new System.Drawing.Point(55, 610);
            this.grdSum.Margin = new System.Windows.Forms.Padding(4);
            this.grdSum.Location = new System.Drawing.Point(41, 487);
            this.grdSum.Name = "grdSum";
            this.grdSum.ReadOnly = true;
            this.grdSum.RowTemplate.Height = 23;
            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
            this.grdSum.Size = new System.Drawing.Size(1374, 24);
            this.grdSum.Size = new System.Drawing.Size(948, 19);
            this.grdSum.TabIndex = 45;
            // 
            // grdPrint
            // 
            this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdPrint.Location = new System.Drawing.Point(1079, 679);
            this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
            this.grdPrint.Location = new System.Drawing.Point(809, 543);
            this.grdPrint.Name = "grdPrint";
            this.grdPrint.RowTemplate.Height = 23;
            this.grdPrint.Size = new System.Drawing.Size(33, 30);
            this.grdPrint.Size = new System.Drawing.Size(25, 24);
            this.grdPrint.TabIndex = 46;
            this.grdPrint.Visible = false;
            // 
@@ -922,21 +890,19 @@
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabControl1.Location = new System.Drawing.Point(55, 216);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
            this.tabControl1.Location = new System.Drawing.Point(41, 173);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(1374, 394);
            this.tabControl1.Size = new System.Drawing.Size(948, 314);
            this.tabControl1.TabIndex = 47;
            // 
            // tabPage1
            // 
            this.tabPage1.Controls.Add(this.grdMain);
            this.tabPage1.Location = new System.Drawing.Point(4, 25);
            this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
            this.tabPage1.Size = new System.Drawing.Size(1366, 365);
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage1.Size = new System.Drawing.Size(940, 288);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "物料信息";
            this.tabPage1.UseVisualStyleBackColor = true;
@@ -944,11 +910,10 @@
            // tabPage2
            // 
            this.tabPage2.Controls.Add(this.grdSub);
            this.tabPage2.Location = new System.Drawing.Point(4, 25);
            this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
            this.tabPage2.Location = new System.Drawing.Point(4, 22);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
            this.tabPage2.Size = new System.Drawing.Size(1241, 365);
            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
            this.tabPage2.Size = new System.Drawing.Size(940, 288);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "条码信息";
            this.tabPage2.UseVisualStyleBackColor = true;
@@ -962,33 +927,22 @@
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.grdSub.Location = new System.Drawing.Point(4, 4);
            this.grdSub.Margin = new System.Windows.Forms.Padding(4);
            this.grdSub.Location = new System.Drawing.Point(3, 3);
            this.grdSub.Name = "grdSub";
            this.grdSub.ReadOnly = true;
            this.grdSub.RowHeadersWidth = 30;
            this.grdSub.RowTemplate.Height = 23;
            this.grdSub.Size = new System.Drawing.Size(1233, 357);
            this.grdSub.Size = new System.Drawing.Size(934, 282);
            this.grdSub.TabIndex = 45;
            this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
            this.grdSub.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellEndEdit);
            // 
            // chkAddModel
            // 
            this.chkAddModel.AutoSize = true;
            this.chkAddModel.Location = new System.Drawing.Point(1170, 61);
            this.chkAddModel.Name = "chkAddModel";
            this.chkAddModel.Size = new System.Drawing.Size(89, 19);
            this.chkAddModel.TabIndex = 101;
            this.chkAddModel.Text = "追加模式";
            this.chkAddModel.UseVisualStyleBackColor = true;
            // 
            // Gy_BarCodeBill
            // 
            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.Lavender;
            this.ClientSize = new System.Drawing.Size(1481, 750);
            this.ClientSize = new System.Drawing.Size(1028, 599);
            this.Controls.Add(this.tabControl1);
            this.Controls.Add(this.grdSum);
            this.Controls.Add(this.panel2);
@@ -999,7 +953,6 @@
            this.Controls.Add(this.grdPrint);
            this.ForeColor = System.Drawing.Color.Black;
            this.KeyPreview = true;
            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "Gy_BarCodeBill";
            this.Text = "单据编辑";
            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;

 SCM/ÌõÂë´òÓ¡/Gy_BarCodeBill.resx

@@ -112,15 +112,15 @@
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
@@ -360,7 +360,7 @@
  <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
        jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
        grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
        FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
  <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
        UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
        V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
        9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
  <data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
        W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
        mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -394,7 +394,7 @@
  <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
        9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
        W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
        mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -405,7 +405,7 @@
  <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
        G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
        5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
        EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -415,7 +415,7 @@
  <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
        /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
        mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
        ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -430,7 +430,7 @@
  <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
        wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
        mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
        OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -439,7 +439,7 @@
  <data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
        2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
        vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
        8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -450,7 +450,7 @@
  <data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
        EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
        cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
        6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -465,7 +465,7 @@
  <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
        bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
        rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
        wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -475,7 +475,7 @@
  <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
        oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
        znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
        vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -490,7 +490,7 @@
  <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
        /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
        77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
        aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -532,10 +532,10 @@
        FIYcEAA7
</value>
  </data>
  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>93, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>42</value>
  </metadata>
</root>

 SCM/Éú²ú¹ÜÀí/Sc_PackUnionBillList.cs

@@ -105,7 +105,7 @@
                sql += " and æ¡ç  like '%" + txtHBarCode.Text.Trim() + "%'";
            }
            //得到信息
            string sql2 = "select * from " + ViewName + sql +" order by å”¯ä¸€æ¡ç  desc";
            string sql2 = "select * from " + ViewName + sql;/*+" order by å”¯ä¸€æ¡ç  desc";*/
            DataSet DS = oWeb.getDataSetBySQL(sql2, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
            if (DS==null ||  DS.Tables[0].Rows.Count == 0)
            {