From 3a060ae7639eb718355df6f9985add1ef297df8b Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 25 十一月 2021 16:52:18 +0800
Subject: [PATCH] 测试了快速扫码模块 生成条码

---
 LMES/ClsShowMod.cs                     |    6 
 WarM/条码打印/Sc_ICMOToBarCode.cs          |  711 ++++++++++++++++++++++++++++++++---
 WarM/条码打印/Sc_ICMOToBarCode.designer.cs |  441 +++++++++++++++++++--
 WarM/条码打印/Sc_ICMOToBarCode.resx        |   24 +
 4 files changed, 1,055 insertions(+), 127 deletions(-)

diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 8be3bc3..03e5042 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3632,6 +3632,12 @@
                         oGy_BarCodeBill.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
                         oGy_BarCodeBill.ShowDialog();
                         break;
+                    case "sc_icmotobarcode":
+                        //
+                        Sc_ICMOToBarCode oSc_ICMOToBarCode = new Sc_ICMOToBarCode();
+                        oSc_ICMOToBarCode.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+                        oSc_ICMOToBarCode.ShowDialog();
+                        break;
                     case "kf_barcodeoutinreport":
                         //权限
                         Kf_BarCodeOutInReport oKf_BarCodeOutInReport = new Kf_BarCodeOutInReport();
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index 4d1622c..49e50fe 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -28,15 +28,19 @@
         public const string ModRightNameCheck = ModRightName + "_Check";
         public const string ModRightNameClose = ModRightName + "_Close";
         public const string ModRightNameDelete = ModRightName + "_Delete";
+        public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
         //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
         //public  Gy_ICBomBill oFrm;
         public int selectRow = 0;
         public int selectRow2 = 0;
         public string sDlgWhere = "";  //澶栫獥浣撻�掑叆
+        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+        public Int64 HInterID = 0;
         //
         private void initGrid()
         {
-            DBUtility.Xt_BaseBillFun.initGridList(grdMain,this.Name);
+            DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
         }
         //
 
@@ -45,12 +49,56 @@
             ClsCN SubCn = new ClsCN();
             DataSet DSet;
             string sSql = "";
+            string sFastSQL = "";
+            //鐢熶骇璁㈠崟鍙�
+            //if (txtHICMOBillNo.Text.Trim() != "")
+            //{
+            //    sFastSQL = sFastSQL + " and HICMOBillNo  like '%" + txtHICMOBillNo.Text + "%'";
+            //}
+            string HICMOBillNo = "";
+            HICMOBillNo = txtHICMOBillNo.Text.Trim().ToString();
+            //鐗╂枡
+            //if (txtHMaterID.Text.Trim() != "")
+            //{
+            //    sFastSQL = sFastSQL + " and HMaterName  like '%" + txtHMaterID.Text + "%'";
+            //}
+            string HMaterName = "";
+            HMaterName = txtHMaterID.Text.Trim().ToString();
+            //鏈哄彴
+            //if (txtHSourceID.Text.Trim() != "")
+            //{
+            //    sFastSQL = sFastSQL + " and HSourceName  like '%" + txtHSourceID.Text + "%'";
+            //}
+            string HSourceName = "";
+            HSourceName = txtHSourceID.Text.Trim().ToString();
+            //鑱屽憳
+            string HEmpName = "";
+            HEmpName = txtHEmpID.Text.Trim().ToString();
+            //鍒ゆ柇寮�濮嬫棩鏈�
+            //if (dtpHBeginDate.Checked)
+            //{
+            //    sFastSQL = sFastSQL + " and 鏃ユ湡>='" + dtpHBeginDate.Value.ToShortDateString() + "'";
+            //}
+            string HBeginDate = "";
+            HBeginDate = dtpHBeginDate.Value.ToShortDateString();
+
+            //鍒ゆ柇缁撴潫鏃ユ湡
+            //if (dtpHEndDate.Checked)
+            //{
+            //    sFastSQL = sFastSQL + " and 鏃ユ湡<='" + dtpHEndDate.Value.ToShortDateString() + "'";
+            //}
+            string HEndDate = "";
+            HEndDate = dtpHEndDate.Value.ToShortDateString();
+            //if (sFastSQL.Trim() == "")
+            //{
+            //    MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
+            //    return;
+            //}
+
             //杩囨护鏉′欢
-            if (frmCondition.SqlStr.Trim().Length == 0)
-                return;
-            sSql = "Select * from " + ViewName + " Where 1=1 "  + sDlgWhere + " order by HICMOBillNo asc";
+
             //
-            DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+            DSet = SubCn.RunProcReturn("exec h_p_KSTMSC '" + HICMOBillNo + "' , '" + HMaterName + "' , '" + HSourceName + "' ,'" + HEmpName + "' ,'" + HBeginDate + "', '" + HEndDate + "'", "h_p_KSTMSC", ref DBUtility.ClsPub.sExeReturnInfo);
             //鐢熸垚棣栬鏍囬
             if (DSet == null)
             {
@@ -59,15 +107,20 @@
             }
             //
             grdMain.DataSource = DSet.Tables[0].DefaultView;
+          
             //鏍囧噯瑁呯
-            for (int i = 0; i < grdMain.SelectedRows.Count; i++)
-            {
-                txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("HMiniQty")].Value);
-            }
+            //for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+            //{
+            //    txtHMiniQty.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[i].Index].Cells[Fun_GetCol("HMiniQty")].Value);
+            //    if (txtHMiniQty.Text.Trim() != "")
+            //    {
+            //        txtHMiniQty.Enabled = false;
+            //    }
+            //}
             //鍐荤粨
-            int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
-            string s = frmCondition.cmbHComplete.Text;
-            DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
+            //int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+            //string s = frmCondition.cmbHComplete.Text;
+            //DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
             //鐢荤嚎
             GraphLine();
             
@@ -132,11 +185,16 @@
         {
             return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
         }
+
+        private Int32 Fun_GetColList(string sCol)
+        {
+            return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+        }
         //
         private void Sc_ICMOToBarCode_Load(object sender, EventArgs e)
         {
             //
-            frmCondition = new frmBillQueryCondition_New();
+            //frmCondition = new frmBillQueryCondition_New();
             this.Text = ModCaption;
             //lblCaption.Text = ModCaption;
             initGrid();
@@ -149,21 +207,21 @@
 
         private void cx_Click(object sender, EventArgs e)
         {
-            frmCondition = new frmBillQueryCondition_New();
-            SetCondition(frmCondition, ViewName, this.Name);
-            frmCondition.ShowDialog();
-            if (frmCondition.Tag.ToString() == "OK")
-            {
-                Display();
-            }
+            //frmCondition = new frmBillQueryCondition_New();
+            //SetCondition(frmCondition, ViewName, this.Name);
+            //frmCondition.ShowDialog();
+            //if (frmCondition.Tag.ToString() == "OK")
+            //{
+            //    Display();
+            //}
         }
 
-        public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
-        {
-            frmCondition.Tag = "";
-            frmCondition.ViewName = ViewName;
-            frmCondition.ModName = Name;
-        }
+        //public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
+        //{
+        //    frmCondition.Tag = "";
+        //    frmCondition.ViewName = ViewName;
+        //    frmCondition.ModName = Name;
+        //}
 
         private void xz_Click(object sender, EventArgs e)
         {
@@ -257,14 +315,14 @@
 
         private void timer2_Tick(object sender, EventArgs e)
         {
-            timer2.Enabled = false;
-            frmCondition = new frmBillQueryCondition_New();
-            SetCondition(frmCondition, ViewName, this.Name);
-            frmCondition.ShowDialog();
-            if (frmCondition.Tag.ToString() == "OK")
-            {
-                timer1.Enabled = true;
-            }
+            //timer2.Enabled = false;
+            //frmCondition = new frmBillQueryCondition_New();
+            //SetCondition(frmCondition, ViewName, this.Name);
+            //frmCondition.ShowDialog();
+            //if (frmCondition.Tag.ToString() == "OK")
+            //{
+            //    timer1.Enabled = true;
+            //}
         }
 
  
@@ -282,11 +340,11 @@
         // 
         private void GraphLine()
         {
-            int MainIDCol = Fun_GetCol("hmainid");
-            int SubIDCol = Fun_GetCol("hsubid");
-            string s = frmCondition.cmbHComplete.Text;
-            long n=0;
-            DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
+            //int MainIDCol = Fun_GetCol("hmainid");
+            //int SubIDCol = Fun_GetCol("hsubid");
+            //string s = frmCondition.cmbHComplete.Text;
+            //long n=0;
+            //DBUtility.Xt_BaseBillFun.GraphLine(grdMain, MainIDCol, SubIDCol, s,ref n);
             //鏄剧ず
             //lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
             //lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
@@ -693,40 +751,557 @@
 
         private void cmdHSaveBill_Click(object sender, EventArgs e)
         {
-            string sFastSQL = "";
-            //鐢熶骇璁㈠崟鍙�
-            if (txtHICMOBillNo.Text.Trim() != "")
+          
+            Display();
+        }
+
+        private void button4_Click(object sender, EventArgs e)
+        {
+            HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+            string HMaterNumber = "";
+            string HBatchNo = "";
+            string HDate = "";
+            string HYear = "";
+            string HPeriod = "";
+            string HDay = "";
+            string HTMNumber = "";
+            string HOrgNumber = "";
+            DataSet Ds;
+            int LSH = 0;                //娴佹按鍙�
+            string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
+            double HSumQty = 0;         //浜у搧鏁伴噺
+            double HMinQty = 0;         //鏈�灏忓寘瑁呮暟
+            double HBQty = 0;         //绠辨暟
+            int k = 0;
+            int n = 0;                  //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+            string WeiShu = "";         //灏炬暟
+            int LSHlen = 6;             //娴佹按鍙烽暱搴�
+            string TM = "";             //鏉$爜
+            for (int j = 0; j < grdMain.SelectedRows.Count; j++)
             {
-                sFastSQL = sFastSQL + " and HICMOBillNo  like '%" + txtHICMOBillNo.Text + "%'";
+                HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("鐗╂枡浠g爜")].Value);
+                HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.SelectedRows[j].Index].Cells[Fun_GetCol("鎵规")].Value);
+                HDate = DateTime.Now.ToShortDateString();
+                HYear = ClsPub.isDate(HDate).Year.ToString().Substring(2, 2);
+                HPeriod = "0" + ClsPub.isDate(HDate).Month.ToString();
+                HPeriod = HPeriod.Substring(HPeriod.Length - 2, 2);
+                HDay = "0" + ClsPub.isDate(HDate).Day.ToString();
+                HDay = HDay.Substring(HDay.Length - 2, 2);
+                HOrgNumber = ClsPub.HOrgNumber;
+                //绠辨暟鍒�=鏁伴噺/鏈�灏忓寘瑁呮暟
+                //double sMoney = 0;
+                //if ((DBUtility.ClsPub.isLong(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMiniQty")].Value) == 0))
+                //{
+                //    sMoney = 0;
+                //}
+                //else
+                //{
+                //    sMoney = ClsPub.isDoule(grdMain.SelectedRows[j].Cells[Fun_GetCol("HQty")].Value) / ClsPub.isDoule(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMiniQty")].Value);
+                //}
+                //sMoney = Math.Ceiling(sMoney);
+                //grdMain.SelectedRows[j].Cells[Fun_GetCol("HBQty")].Value = sMoney;
+
+
+                HBQty = HBQty + ClsPub.isInt(txtHBQty.Text);
+                HMinQty = ClsPub.isDoule(txtHMiniQty.Text);
+                HSumQty = ClsPub.isDoule(txtHICMOQty.Text);
+
+
+                if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                {
+                    HTMNumber = HOrgNumber + HMaterNumber + HYear + HPeriod + HDay;
+                    Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + HTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                    LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+                }
+                else if (cmbHBarCodeType.Text == "鎵规鏉$爜")
+                {
+                    TM = HOrgNumber + HMaterNumber + HBatchNo;
+                }
+                n = 0;
+                for (int i = k; i < HBQty; i++)
+                {
+                    if (HSumQty - HMinQty > 0)
+                    {
+                        WeiShu = "";
+                        HSumQty = HSumQty - HMinQty;
+                    }
+                    else
+                    {
+                        if (HSumQty == HMinQty)
+                        {
+                            WeiShu = "";
+                        }
+                        else
+                        {
+                            WeiShu = "灏炬暟";
+                        }
+                        HMinQty = HSumQty;
+                    }
+                    //
+                    LSH = LSH + 1;
+                    LSH2 = LSH.ToString();
+                    while (LSH2.Length < LSHlen)  //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+                    {
+                        LSH2 = "0" + LSH2;
+                    }
+                    if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                    {
+                        //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
+                        TM = HTMNumber + LSH2;
+                    }
+                    if (TM.Trim() == "")
+                    {
+                        MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉$爜锛�");
+                        return;
+                    }
+                    string HWei = "";      //灏炬暟
+                    string HBarCode = "";
+                    string HBarCodeType = "";
+                    Int64 HMaterID = 0;
+                    Int64 HAuxPropID = 0;
+                    Int64 HUnitID = 0;
+                    double HQty2 = 0;
+                    string HBatchNo2 = "";
+                    Int64 HSupID = 0;
+                    Int64 HGroupID = 0;
+                    int HPrintQty = 0;
+                    Int64 HSourceInterID = 0;
+                    Int64 HSourceEntryID = 0;
+                    string HSourceBillNo = "";
+                    string HSourceBillType = "";
+                    Int64 HBarcodeNo = 0;       //鎵樺彿
+                    Int64 HBarcodeQtys = 0;     //鎬绘墭鏁�
+                    Int64 HDeptID = 0;
+                    Int64 HWhID = 0;
+                    Int64 HSPID = 0;
+                    string HRemark = "";
+                    string HMaterName = "";
+                    string HMaterModel = "";
+                    string HPinfan = "";
+                    string HMTONo = "";
+                    Int64 HCusID = 0;
+                    string HCusType = "";
+                    DateTime HEndDate;
+                    string HWorkLineName = "";
+                    string HSeOrderBillNo = "";
+                    string HInnerBillNo = "";
+                    try
+                    {
+                        oCn.BeginTran();
+                        HWei = WeiShu;
+                        HBarCode = TM;
+                        HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+                        HMaterID = ClsPub.isLong(grdMain.SelectedRows[j].Cells[Fun_GetCol("HMaterID")].Value);
+                        HAuxPropID = 0;
+                        HUnitID = 0;
+                        HQty2 = HMinQty;
+                        HBatchNo2 = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("鎵规")].Value);
+                        HSourceInterID = 0;
+                        HSourceEntryID = 0;
+                        HSourceBillNo = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("鐢熶骇璁㈠崟鍙�")].Value);
+                        HSourceBillType = "3710";
+                        HBarcodeQtys = 0;
+                        HBarcodeNo = 0;
+                        HSupID = 0;
+                        HDeptID = 0;
+                        HWhID = 0;
+                        HSPID = 0;
+                        HRemark = "";
+                        HMaterName = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value);
+                        HMaterModel = ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+                        HPinfan = "";
+                        HMTONo = "";
+                        HCusID = 0;
+                        HCusType = "";
+                        HEndDate = ClsPub.isDate(grdMain.SelectedRows[j].Cells[Fun_GetCol("鏃ユ湡")].Value);
+                        HWorkLineName = "";
+                        HSeOrderBillNo = "";
+                        HInnerBillNo = "";
+                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+                                            ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+                                            ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+                                            ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+                                            ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+                                            ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+                                            ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+                                            ") values ("
+                                            + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+                                            + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+                                            + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+                                            + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+                                            + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + HDate + "'"
+                                            + ", " + ClsPub.HOrgID.ToString() + "," + ClsPub.HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
+                                            + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+                        oCn.Commit();
+                        MessageBox.Show("鏉$爜鐢熸垚瀹屾瘯锛�");
+                        //grdSub.RowCount = 0;
+                        DisplayTM();
+                    }
+
+                    catch (Exception e1)
+                    {
+                        oCn.RollBack();
+                        MessageBox.Show("鏉$爜鐢熸垚澶辫触锛�" + e1.Message);
+                    }
+
+                }
             }
-            //鐗╂枡
-            if (txtHMaterID.Text.Trim() != "")
+        }
+
+
+        private void DisplayTM()
+        {
+            DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+            //鐢熸垚棣栬鏍囬
+            if (DSet == null)
             {
-                sFastSQL = sFastSQL + " and HMaterID  like '%" + txtHMaterID.Text + "%'";
-            }
-            //鏈哄彴
-            if (txtHSourceID.Text.Trim() != "")
-            {
-                sFastSQL = sFastSQL + " and HSourceID  like '%" + txtHSourceID.Text + "%'";
-            }
-            //鍒ゆ柇寮�濮嬫棩鏈�
-            if (dtpHBeginDate.Checked)
-            {
-                sFastSQL = sFastSQL + " and 鏃ユ湡>='" + dtpHBeginDate.Value.ToShortDateString() + "'";
-            }
-            //鍒ゆ柇缁撴潫鏃ユ湡
-            if (dtpHEndDate.Checked)
-            {
-                sFastSQL = sFastSQL + " and 鏃ユ湡<='" + dtpHEndDate.Value.ToShortDateString() + "'";
-            }
-            if (sFastSQL.Trim() == "")
-            {
-                MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
+                MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉$爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
                 return;
             }
-            sDlgWhere = sFastSQL;
-            Display();
-            sDlgWhere = "";
+            //
+            grdList.DataSource = DSet.Tables[0].DefaultView;
+            //鍐荤粨
+            int FrCol = 0;
+            string s = "鏄�";
+            DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
+            //鐢荤嚎
+            //GraphLine();
+            // 
+        }
+
+        //private void button5_Click(object sender, EventArgs e)
+        //{
+        //    //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉$爜
+        //    for (int j = 0; j < grdMain.SelectedRows.Count; j++)
+        //    {
+        //        if (DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("HBarCode")].Value) == "")
+        //        {
+        //            MessageBox.Show("鏉$爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉$爜鍚庡啀棰勮锛�");
+        //            return;
+        //        }
+
+        //        //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+        //        if (ReportPrintBegin())
+        //        {
+        //            return;
+        //        }
+
+        //        //閫夋嫨鎵撳嵃妯℃澘
+        //        BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+        //        oFrm.sBillName = ModName;
+        //        oFrm.sBillModel = ModCaption;
+        //        oFrm.ShowDialog();
+        //        if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+        //        {
+        //            Sub_SetReport(oFrm.sOpenTmp);
+        //            Report.PrintPreview(false);
+        //            Thread.Sleep(1000);
+        //        }
+        //    }
+        //}
+
+
+        //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+        //private bool ReportPrintBegin()
+        //{
+        //        string sRelQty = "";
+
+        //        if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[j].Cells[Fun_GetCol("HBarCode")].Value), ref sRelQty))
+        //        {
+        //            MessageBox.Show("鏉$爜宸茬粡鎵撳嵃杩囷紝涓嶅彲閲嶅鎵撳嵃锛�");
+        //            return true;
+        //        }
+        //        else
+        //        {
+        //            return false;
+        //        }
+        //}
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+            //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+            string sBarCode = "";
+            string sRelQty = "";
+            for (int i = 0; i < grdSub.SelectedRows.Count; i++)
+            {
+                sBarCode = sBarCode + "," + DBUtility.ClsPub.isStrNull(grdSub.Rows[grdSub.SelectedRows[i].Index].Cells[Fun_GetCol("HBarcode")].Value);
+            }
+            //if (oBar.Set_BPrintQty(sBarCode.Substring(1), ref sRelQty))
+            //{
+            //    MessageBox.Show(sRelQty);
+            //    return;
+            //}
+
+            //閫夋嫨鎵撳嵃妯℃澘
+            BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+            //DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+            oFrm.sBillName = ModName;
+            oFrm.sBillModel = ModCaption;
+            oFrm.ShowDialog();
+            if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+            {
+                Sub_SetReport(oFrm.sOpenTmp);
+                Report.Print(false);
+                //oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.Rows[CurRows].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value));
+                Thread.Sleep(1000);
+            }
+
+            //鎵归噺鏇存柊鏉$爜鎵撳嵃娆℃暟
+            oBar.Set_EPrintQty(sBarCode.Substring(1));
+        }
+
+        private void cmdHSaveBill1_Click(object sender, EventArgs e)
+        {
+            Display1();
+        }
+
+        private void Display1()
+        {
+            ClsCN SubCn = new ClsCN();
+            DataSet DSet;
+            string sSql = "";
+            string sFastSQL = "";
+            //鐢熶骇璁㈠崟鍙�
+            //if (txtHICMOBillNo.Text.Trim() != "")
+            //{
+            //    sFastSQL = sFastSQL + " and HICMOBillNo  like '%" + txtHICMOBillNo.Text + "%'";
+            //}
+            string HICMOBillNo = "";
+            HICMOBillNo = txtHICMOBillNo1.Text.Trim().ToString();
+            //鐗╂枡
+            //if (txtHMaterID.Text.Trim() != "")
+            //{
+            //    sFastSQL = sFastSQL + " and HMaterName  like '%" + txtHMaterID.Text + "%'";
+            //}
+            string HMaterName = "";
+            HMaterName = txtHMaterID1.Text.Trim().ToString();
+            //鍒ゆ柇寮�濮嬫棩鏈�
+            //if (dtpHBeginDate.Checked)
+            //{
+            //    sFastSQL = sFastSQL + " and 鏃ユ湡>='" + dtpHBeginDate.Value.ToShortDateString() + "'";
+            //}
+            string HBeginDate = "";
+            HBeginDate = dtpHBeginDate1.Value.ToShortDateString();
+
+            //鍒ゆ柇缁撴潫鏃ユ湡
+            //if (dtpHEndDate.Checked)
+            //{
+            //    sFastSQL = sFastSQL + " and 鏃ユ湡<='" + dtpHEndDate.Value.ToShortDateString() + "'";
+            //}
+            string HEndDate = "";
+            HEndDate = dtpHEndDate1.Value.ToShortDateString();
+            //if (sFastSQL.Trim() == "")
+            //{
+            //    MessageBox.Show("娌℃湁杈撳叆鏉′欢!");
+            //    return;
+            //}
+
+            //杩囨护鏉′欢
+
+            //
+            DSet = SubCn.RunProcReturn("exec h_p_KSTMCX '" + HICMOBillNo + "' , '" + HMaterName + "' ,'" + HBeginDate + "', '" + HEndDate + "'", "h_p_KSTMCX", ref DBUtility.ClsPub.sExeReturnInfo);
+            //鐢熸垚棣栬鏍囬
+            if (DSet == null)
+            {
+                MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+                return;
+            }
+            //
+            grdSub.DataSource = DSet.Tables[0].DefaultView;
+            //鍐荤粨
+            //int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+            //string s = frmCondition.cmbHComplete.Text;
+            //DBUtility.Xt_BaseBillFun.DisplayGrid(grdSub, this.Name, s, FrCol);
+            //鐢荤嚎
+            GraphLine();
+
+
+            // 
+        }
+
+        private void cmdHSourceID_Click(object sender, EventArgs e)
+        {
+            DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
+            if (oSource.RefreshView())
+            {
+                this.txtHSourceID.Text = oSource.oModel.HName;
+                this.txtHSourceID.Tag = oSource.oModel.HItemID.ToString();
+            }
+            else
+            {
+                this.txtHSourceID.Text = "";
+            }
+        }
+
+        private void cmdHEmpID_Click(object sender, EventArgs e)
+        {
+            DAL.ClsGy_Employee_View oEmp = new DAL.ClsGy_Employee_View();
+            if (oEmp.RefreshView())
+            {
+                this.txtHEmpID.Text = oEmp.oModel.HName;
+                this.txtHEmpID.Tag = oEmp.oModel.HItemID.ToString();
+            }
+            else
+            {
+                this.txtHEmpID.Text = "";
+            }
+        }
+
+        private void cmdHMaterID_Click(object sender, EventArgs e)
+        {
+            DAL.ClsGy_Material_View oMater = new DAL.ClsGy_Material_View();
+            if (oMater.RefreshView())
+            {
+                this.txtHMaterID.Text = oMater.oModel.HName;
+                this.txtHMaterID.Tag = oMater.oModel.HItemID.ToString();
+            }
+            else
+            {
+                this.txtHMaterID.Text = "";
+            }
+        }
+
+        private void cmdHMaterID1_Click(object sender, EventArgs e)
+        {
+            DAL.ClsGy_Material_View oMater = new DAL.ClsGy_Material_View();
+            if (oMater.RefreshView())
+            {
+                this.txtHMaterID1.Text = oMater.oModel.HName;
+                this.txtHMaterID1.Tag = oMater.oModel.HItemID.ToString();
+            }
+            else
+            {
+                this.txtHMaterID1.Text = "";
+            }
+        }
+
+        private void txtHMiniQty_TextChanged(object sender, EventArgs e)
+        {
+            //double HMiniQty = 0;
+            //double HBQty = 0;
+            //HMiniQty = DBUtility.ClsPub.isDoule(txtHMiniQty.Text.Trim());
+            //HBQty = 
+
+         
+        }
+
+        private void txtHBQty_TextChanged(object sender, EventArgs e)
+        {
+            double HICMOQty = 0;
+            double HMiniQty = 0;
+            double HBQty = 0;
+
+           
+
+
+            for (int i = 0; i < grdMain.SelectedRows.Count; i++)
+            {
+                txtHICMOQty.Text = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("璁㈠崟鏁伴噺")].Value);
+            }
+            HICMOQty = DBUtility.ClsPub.isDoule(txtHICMOQty.Text.Trim());
+            HMiniQty = DBUtility.ClsPub.isDoule(txtHMiniQty.Text.Trim());
+            if (HMiniQty == 0)
+            {
+                HBQty = 0;
+            }
+            else
+            {
+                HBQty = HICMOQty / HMiniQty;
+            }
+            HBQty = Math.Ceiling(HBQty);
+            txtHBQty.Text = DBUtility.ClsPub.isStrNull(HBQty);
+        }
+
+        private void button5_Click(object sender, EventArgs e)
+        {
+            //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉$爜
+            for (int i = 0; i < grdList.SelectedRows.Count; i++)
+            {
+                if (DBUtility.ClsPub.isStrNull(grdList.SelectedRows[i].Cells[Fun_GetColList("鏉$爜缂栧彿")].Value) == "")
+                {
+                    MessageBox.Show("鏉$爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉$爜鍚庡啀棰勮锛�");
+                    return;
+                }
+            }
+
+            //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+            if (ReportPrintBegin())
+            {
+                return;
+            }
+
+            //閫夋嫨鎵撳嵃妯℃澘
+            BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+            oFrm.sBillName = ModName;
+            oFrm.sBillModel = ModCaption;
+            oFrm.ShowDialog();
+            if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+            {
+                Sub_SetReport(oFrm.sOpenTmp);
+                Report.PrintPreview(false);
+                Thread.Sleep(1000);
+            }
+        }
+
+        private bool ReportPrintBegin()
+        {
+            string sRelQty = "";
+
+            if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetColList("鏉$爜缂栧彿")].Value), ref sRelQty))
+            {
+                MessageBox.Show("鏉$爜宸茬粡鎵撳嵃杩囷紝涓嶅彲閲嶅鎵撳嵃锛�");
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void button6_Click(object sender, EventArgs e)
+        {
+            //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉$爜
+            if (DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetColList("鏉$爜缂栧彿")].Value) == "")
+            {
+                MessageBox.Show("鏉$爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉$爜鍚庡啀棰勮锛�");
+                return;
+            }
+
+            //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+            if (ReportPrintBegin())
+            {
+                return;
+            }
+
+            //閫夋嫨鎵撳嵃妯℃澘
+            BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+            oFrm.sBillName = ModName;
+            oFrm.sBillModel = ModCaption;
+            oFrm.ShowDialog();
+            if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+            {
+                Sub_SetReport(oFrm.sOpenTmp);
+                Report.PrintPreview(false);
+                Thread.Sleep(1000);
+            }
+        }
+
+        private void cz_Click(object sender, EventArgs e)
+        {
+            txtHBQty.Text = "";
+            txtHEmpID.Text = "";
+            txtHICMOBillNo.Text = "";
+            txtHICMOBillNo1.Text = "";
+            txtHICMOQty.Text = "";
+            txtHMaterID.Text = "";
+            txtHMaterID1.Text = "";
+            txtHMiniQty.Text = "";
+            txtHSourceID.Text = "";
+            cmbHBarCodeType.Items.Clear();
+            grdList.DataSource = null;
+            grdSub.DataSource = null;
+            grdMain.DataSource = null;
         }
     }
 }
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
index 2ddc6c8..02598f9 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.designer.cs"
@@ -53,21 +53,49 @@
             this.txtHMaterID = new System.Windows.Forms.TextBox();
             this.cmdHMaterID = new System.Windows.Forms.Button();
             this.gbUp = new System.Windows.Forms.GroupBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.dtpHBeginDate = new System.Windows.Forms.DateTimePicker();
+            this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
+            this.label8 = new System.Windows.Forms.Label();
+            this.cmdHSaveBill = new System.Windows.Forms.Button();
             this.dtpHEndDate = new System.Windows.Forms.DateTimePicker();
             this.label5 = new System.Windows.Forms.Label();
-            this.cmdHSaveBill = new System.Windows.Forms.Button();
+            this.dtpHBeginDate = new System.Windows.Forms.DateTimePicker();
+            this.label6 = new System.Windows.Forms.Label();
             this.button4 = new System.Windows.Forms.Button();
             this.button5 = new System.Windows.Forms.Button();
             this.button6 = new System.Windows.Forms.Button();
             this.txtHMiniQty = new System.Windows.Forms.TextBox();
             this.鏍囧噯瑁呯 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
-            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.txtHBQty = new System.Windows.Forms.TextBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.cmdHSaveBill1 = new System.Windows.Forms.Button();
+            this.dtpHEndDate1 = new System.Windows.Forms.DateTimePicker();
+            this.label10 = new System.Windows.Forms.Label();
+            this.dtpHBeginDate1 = new System.Windows.Forms.DateTimePicker();
+            this.label11 = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
+            this.txtHICMOBillNo1 = new System.Windows.Forms.TextBox();
+            this.txtHMaterID1 = new System.Windows.Forms.TextBox();
+            this.label13 = new System.Windows.Forms.Label();
+            this.cmdHMaterID1 = new System.Windows.Forms.Button();
+            this.grdSub = new System.Windows.Forms.DataGridView();
+            this.button1 = new System.Windows.Forms.Button();
+            this.璁㈠崟鏁伴噺 = new System.Windows.Forms.Label();
+            this.txtHICMOQty = new System.Windows.Forms.TextBox();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.grdList = new System.Windows.Forms.DataGridView();
+            this.cz = new System.Windows.Forms.ToolStripButton();
             this.Tool.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
             this.gbUp.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
             this.SuspendLayout();
             // 
             // Tool
@@ -83,7 +111,8 @@
             this.mrlk,
             this.toolStripSeparator7,
             this.bclk,
-            this.toolStripSeparator8});
+            this.toolStripSeparator8,
+            this.cz});
             this.Tool.Location = new System.Drawing.Point(0, 0);
             this.Tool.Name = "Tool";
             this.Tool.Padding = new System.Windows.Forms.Padding(0);
@@ -172,11 +201,12 @@
             this.grdMain.AllowUserToDeleteRows = false;
             this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
             this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.grdMain.Location = new System.Drawing.Point(12, 201);
+            this.grdMain.Location = new System.Drawing.Point(4, 6);
+            this.grdMain.Margin = new System.Windows.Forms.Padding(0);
             this.grdMain.Name = "grdMain";
             this.grdMain.ReadOnly = true;
             this.grdMain.RowTemplate.Height = 23;
-            this.grdMain.Size = new System.Drawing.Size(866, 231);
+            this.grdMain.Size = new System.Drawing.Size(866, 263);
             this.grdMain.TabIndex = 19;
             this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
             this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
@@ -231,7 +261,7 @@
             this.cmdHSourceID.Size = new System.Drawing.Size(32, 32);
             this.cmdHSourceID.TabIndex = 51;
             this.cmdHSourceID.UseVisualStyleBackColor = true;
-            this.cmdHSourceID.Visible = false;
+            this.cmdHSourceID.Click += new System.EventHandler(this.cmdHSourceID_Click);
             // 
             // label3
             // 
@@ -262,7 +292,7 @@
             this.cmdHEmpID.Size = new System.Drawing.Size(32, 32);
             this.cmdHEmpID.TabIndex = 54;
             this.cmdHEmpID.UseVisualStyleBackColor = true;
-            this.cmdHEmpID.Visible = false;
+            this.cmdHEmpID.Click += new System.EventHandler(this.cmdHEmpID_Click);
             // 
             // label4
             // 
@@ -293,11 +323,13 @@
             this.cmdHMaterID.Size = new System.Drawing.Size(32, 32);
             this.cmdHMaterID.TabIndex = 57;
             this.cmdHMaterID.UseVisualStyleBackColor = true;
-            this.cmdHMaterID.Visible = false;
+            this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
             // 
             // gbUp
             // 
             this.gbUp.BackColor = System.Drawing.Color.Transparent;
+            this.gbUp.Controls.Add(this.cmbHBarCodeType);
+            this.gbUp.Controls.Add(this.label8);
             this.gbUp.Controls.Add(this.cmdHSaveBill);
             this.gbUp.Controls.Add(this.dtpHEndDate);
             this.gbUp.Controls.Add(this.label5);
@@ -314,37 +346,51 @@
             this.gbUp.Controls.Add(this.txtHEmpID);
             this.gbUp.Controls.Add(this.label2);
             this.gbUp.Controls.Add(this.cmdHEmpID);
-            this.gbUp.Location = new System.Drawing.Point(12, 69);
+            this.gbUp.Location = new System.Drawing.Point(11, 55);
             this.gbUp.Name = "gbUp";
             this.gbUp.Size = new System.Drawing.Size(1148, 126);
             this.gbUp.TabIndex = 58;
             this.gbUp.TabStop = false;
             // 
-            // label6
+            // cmbHBarCodeType
             // 
-            this.label6.AutoSize = true;
-            this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.ForeColor = System.Drawing.Color.Black;
-            this.label6.Location = new System.Drawing.Point(33, 85);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(72, 16);
-            this.label6.TabIndex = 99;
-            this.label6.Text = "寮�濮嬫棩鏈�";
+            this.cmbHBarCodeType.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmbHBarCodeType.FormattingEnabled = true;
+            this.cmbHBarCodeType.Items.AddRange(new object[] {
+            "鍞竴鏉$爜",
+            "鎵规鏉$爜"});
+            this.cmbHBarCodeType.Location = new System.Drawing.Point(826, 75);
+            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(2);
+            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
+            this.cmbHBarCodeType.Size = new System.Drawing.Size(140, 28);
+            this.cmbHBarCodeType.TabIndex = 139;
             // 
-            // dtpHBeginDate
+            // label8
             // 
-            this.dtpHBeginDate.Enabled = false;
-            this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpHBeginDate.Location = new System.Drawing.Point(112, 77);
-            this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
-            this.dtpHBeginDate.Name = "dtpHBeginDate";
-            this.dtpHBeginDate.Size = new System.Drawing.Size(213, 30);
-            this.dtpHBeginDate.TabIndex = 100;
+            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.Black;
+            this.label8.Location = new System.Drawing.Point(748, 82);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(72, 16);
+            this.label8.TabIndex = 138;
+            this.label8.Text = "鏉$爜绫诲瀷";
+            // 
+            // cmdHSaveBill
+            // 
+            this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
+            this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmdHSaveBill.Location = new System.Drawing.Point(1010, 66);
+            this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
+            this.cmdHSaveBill.Name = "cmdHSaveBill";
+            this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
+            this.cmdHSaveBill.TabIndex = 137;
+            this.cmdHSaveBill.Text = "鏌ヨ";
+            this.cmdHSaveBill.UseVisualStyleBackColor = false;
+            this.cmdHSaveBill.Click += new System.EventHandler(this.cmdHSaveBill_Click);
             // 
             // dtpHEndDate
             // 
-            this.dtpHEndDate.Enabled = false;
             this.dtpHEndDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpHEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             this.dtpHEndDate.Location = new System.Drawing.Point(478, 75);
@@ -364,68 +410,80 @@
             this.label5.TabIndex = 101;
             this.label5.Text = "缁撴潫鏃ユ湡";
             // 
-            // cmdHSaveBill
+            // dtpHBeginDate
             // 
-            this.cmdHSaveBill.BackColor = System.Drawing.Color.White;
-            this.cmdHSaveBill.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cmdHSaveBill.Location = new System.Drawing.Point(776, 66);
-            this.cmdHSaveBill.Margin = new System.Windows.Forms.Padding(2);
-            this.cmdHSaveBill.Name = "cmdHSaveBill";
-            this.cmdHSaveBill.Size = new System.Drawing.Size(112, 50);
-            this.cmdHSaveBill.TabIndex = 137;
-            this.cmdHSaveBill.Text = "鏌ヨ";
-            this.cmdHSaveBill.UseVisualStyleBackColor = false;
-            this.cmdHSaveBill.Click += new System.EventHandler(this.cmdHSaveBill_Click);
+            this.dtpHBeginDate.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpHBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dtpHBeginDate.Location = new System.Drawing.Point(112, 77);
+            this.dtpHBeginDate.Margin = new System.Windows.Forms.Padding(2);
+            this.dtpHBeginDate.Name = "dtpHBeginDate";
+            this.dtpHBeginDate.Size = new System.Drawing.Size(213, 30);
+            this.dtpHBeginDate.TabIndex = 100;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.ForeColor = System.Drawing.Color.Black;
+            this.label6.Location = new System.Drawing.Point(33, 85);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(72, 16);
+            this.label6.TabIndex = 99;
+            this.label6.Text = "寮�濮嬫棩鏈�";
             // 
             // button4
             // 
             this.button4.BackColor = System.Drawing.Color.White;
             this.button4.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button4.Location = new System.Drawing.Point(899, 214);
+            this.button4.Location = new System.Drawing.Point(1036, 218);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(112, 50);
             this.button4.TabIndex = 138;
             this.button4.Text = "鐢熸垚鏉$爜";
             this.button4.UseVisualStyleBackColor = false;
+            this.button4.Click += new System.EventHandler(this.button4_Click);
             // 
             // button5
             // 
             this.button5.BackColor = System.Drawing.Color.White;
             this.button5.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button5.Location = new System.Drawing.Point(1037, 214);
+            this.button5.Location = new System.Drawing.Point(1036, 297);
             this.button5.Margin = new System.Windows.Forms.Padding(2);
             this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(112, 50);
+            this.button5.Size = new System.Drawing.Size(112, 42);
             this.button5.TabIndex = 139;
             this.button5.Text = "棰勮";
             this.button5.UseVisualStyleBackColor = false;
+            this.button5.Click += new System.EventHandler(this.button5_Click);
             // 
             // button6
             // 
             this.button6.BackColor = System.Drawing.Color.White;
             this.button6.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button6.Location = new System.Drawing.Point(1037, 292);
+            this.button6.Location = new System.Drawing.Point(1036, 379);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(112, 50);
+            this.button6.Size = new System.Drawing.Size(112, 44);
             this.button6.TabIndex = 140;
             this.button6.Text = "鎵撳嵃";
             this.button6.UseVisualStyleBackColor = false;
+            this.button6.Click += new System.EventHandler(this.button6_Click);
             // 
             // txtHMiniQty
             // 
-            this.txtHMiniQty.Location = new System.Drawing.Point(899, 297);
+            this.txtHMiniQty.Location = new System.Drawing.Point(898, 296);
             this.txtHMiniQty.Multiline = true;
             this.txtHMiniQty.Name = "txtHMiniQty";
             this.txtHMiniQty.Size = new System.Drawing.Size(112, 42);
             this.txtHMiniQty.TabIndex = 141;
+            this.txtHMiniQty.TextChanged += new System.EventHandler(this.txtHMiniQty_TextChanged);
             // 
             // 鏍囧噯瑁呯
             // 
             this.鏍囧噯瑁呯.AutoSize = true;
             this.鏍囧噯瑁呯.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.鏍囧噯瑁呯.Location = new System.Drawing.Point(895, 266);
+            this.鏍囧噯瑁呯.Location = new System.Drawing.Point(894, 265);
             this.鏍囧噯瑁呯.Name = "鏍囧噯瑁呯";
             this.鏍囧噯瑁呯.Size = new System.Drawing.Size(120, 27);
             this.鏍囧噯瑁呯.TabIndex = 142;
@@ -435,35 +493,271 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(878, 350);
+            this.label7.Location = new System.Drawing.Point(877, 349);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(174, 27);
             this.label7.TabIndex = 144;
             this.label7.Text = "鏈鐢熸垚鏁伴噺";
             // 
-            // textBox1
+            // txtHBQty
             // 
-            this.textBox1.Location = new System.Drawing.Point(902, 381);
-            this.textBox1.Multiline = true;
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(112, 42);
-            this.textBox1.TabIndex = 143;
+            this.txtHBQty.Location = new System.Drawing.Point(901, 380);
+            this.txtHBQty.Multiline = true;
+            this.txtHBQty.Name = "txtHBQty";
+            this.txtHBQty.Size = new System.Drawing.Size(112, 42);
+            this.txtHBQty.TabIndex = 143;
+            this.txtHBQty.TextChanged += new System.EventHandler(this.txtHBQty_TextChanged);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.BackColor = System.Drawing.Color.Transparent;
+            this.groupBox1.Controls.Add(this.cmdHSaveBill1);
+            this.groupBox1.Controls.Add(this.dtpHEndDate1);
+            this.groupBox1.Controls.Add(this.label10);
+            this.groupBox1.Controls.Add(this.dtpHBeginDate1);
+            this.groupBox1.Controls.Add(this.label11);
+            this.groupBox1.Controls.Add(this.label12);
+            this.groupBox1.Controls.Add(this.txtHICMOBillNo1);
+            this.groupBox1.Controls.Add(this.txtHMaterID1);
+            this.groupBox1.Controls.Add(this.label13);
+            this.groupBox1.Controls.Add(this.cmdHMaterID1);
+            this.groupBox1.Location = new System.Drawing.Point(10, 485);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(1148, 126);
+            this.groupBox1.TabIndex = 140;
+            this.groupBox1.TabStop = false;
+            // 
+            // cmdHSaveBill1
+            // 
+            this.cmdHSaveBill1.BackColor = System.Drawing.Color.White;
+            this.cmdHSaveBill1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cmdHSaveBill1.Location = new System.Drawing.Point(771, 35);
+            this.cmdHSaveBill1.Margin = new System.Windows.Forms.Padding(2);
+            this.cmdHSaveBill1.Name = "cmdHSaveBill1";
+            this.cmdHSaveBill1.Size = new System.Drawing.Size(112, 50);
+            this.cmdHSaveBill1.TabIndex = 137;
+            this.cmdHSaveBill1.Text = "鏌ヨ";
+            this.cmdHSaveBill1.UseVisualStyleBackColor = false;
+            this.cmdHSaveBill1.Click += new System.EventHandler(this.cmdHSaveBill1_Click);
+            // 
+            // dtpHEndDate1
+            // 
+            this.dtpHEndDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpHEndDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dtpHEndDate1.Location = new System.Drawing.Point(478, 75);
+            this.dtpHEndDate1.Margin = new System.Windows.Forms.Padding(2);
+            this.dtpHEndDate1.Name = "dtpHEndDate1";
+            this.dtpHEndDate1.Size = new System.Drawing.Size(213, 30);
+            this.dtpHEndDate1.TabIndex = 102;
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label10.ForeColor = System.Drawing.Color.Black;
+            this.label10.Location = new System.Drawing.Point(399, 83);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(72, 16);
+            this.label10.TabIndex = 101;
+            this.label10.Text = "缁撴潫鏃ユ湡";
+            // 
+            // dtpHBeginDate1
+            // 
+            this.dtpHBeginDate1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtpHBeginDate1.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dtpHBeginDate1.Location = new System.Drawing.Point(112, 77);
+            this.dtpHBeginDate1.Margin = new System.Windows.Forms.Padding(2);
+            this.dtpHBeginDate1.Name = "dtpHBeginDate1";
+            this.dtpHBeginDate1.Size = new System.Drawing.Size(213, 30);
+            this.dtpHBeginDate1.TabIndex = 100;
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label11.ForeColor = System.Drawing.Color.Black;
+            this.label11.Location = new System.Drawing.Point(33, 85);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(72, 16);
+            this.label11.TabIndex = 99;
+            this.label11.Text = "寮�濮嬫棩鏈�";
+            // 
+            // label12
+            // 
+            this.label12.AutoSize = true;
+            this.label12.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label12.ForeColor = System.Drawing.Color.Black;
+            this.label12.Location = new System.Drawing.Point(427, 35);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(40, 16);
+            this.label12.TabIndex = 55;
+            this.label12.Text = "鐗╂枡";
+            // 
+            // txtHICMOBillNo1
+            // 
+            this.txtHICMOBillNo1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtHICMOBillNo1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.txtHICMOBillNo1.Location = new System.Drawing.Point(112, 29);
+            this.txtHICMOBillNo1.Name = "txtHICMOBillNo1";
+            this.txtHICMOBillNo1.ReadOnly = true;
+            this.txtHICMOBillNo1.Size = new System.Drawing.Size(214, 30);
+            this.txtHICMOBillNo1.TabIndex = 47;
+            // 
+            // txtHMaterID1
+            // 
+            this.txtHMaterID1.Font = new System.Drawing.Font("瀹嬩綋", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtHMaterID1.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.txtHMaterID1.Location = new System.Drawing.Point(477, 29);
+            this.txtHMaterID1.Name = "txtHMaterID1";
+            this.txtHMaterID1.ReadOnly = true;
+            this.txtHMaterID1.Size = new System.Drawing.Size(184, 30);
+            this.txtHMaterID1.TabIndex = 56;
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label13.ForeColor = System.Drawing.Color.Black;
+            this.label13.Location = new System.Drawing.Point(19, 35);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(88, 16);
+            this.label13.TabIndex = 46;
+            this.label13.Text = "鐢熶骇璁㈠崟鍙�";
+            // 
+            // cmdHMaterID1
+            // 
+            this.cmdHMaterID1.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID1.Image")));
+            this.cmdHMaterID1.Location = new System.Drawing.Point(660, 27);
+            this.cmdHMaterID1.Name = "cmdHMaterID1";
+            this.cmdHMaterID1.Size = new System.Drawing.Size(32, 32);
+            this.cmdHMaterID1.TabIndex = 57;
+            this.cmdHMaterID1.UseVisualStyleBackColor = true;
+            this.cmdHMaterID1.Click += new System.EventHandler(this.cmdHMaterID1_Click);
+            // 
+            // grdSub
+            // 
+            this.grdSub.AllowUserToAddRows = false;
+            this.grdSub.AllowUserToDeleteRows = false;
+            this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdSub.Location = new System.Drawing.Point(9, 618);
+            this.grdSub.Name = "grdSub";
+            this.grdSub.ReadOnly = true;
+            this.grdSub.RowTemplate.Height = 23;
+            this.grdSub.Size = new System.Drawing.Size(866, 228);
+            this.grdSub.TabIndex = 145;
+            // 
+            // button1
+            // 
+            this.button1.BackColor = System.Drawing.Color.White;
+            this.button1.Font = new System.Drawing.Font("瀹嬩綋", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.button1.Location = new System.Drawing.Point(901, 688);
+            this.button1.Margin = new System.Windows.Forms.Padding(2);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(112, 50);
+            this.button1.TabIndex = 146;
+            this.button1.Text = "琛ユ墦鏉$爜";
+            this.button1.UseVisualStyleBackColor = false;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // 璁㈠崟鏁伴噺
+            // 
+            this.璁㈠崟鏁伴噺.AutoSize = true;
+            this.璁㈠崟鏁伴噺.Font = new System.Drawing.Font("瀹嬩綋", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.璁㈠崟鏁伴噺.Location = new System.Drawing.Point(900, 190);
+            this.璁㈠崟鏁伴噺.Name = "璁㈠崟鏁伴噺";
+            this.璁㈠崟鏁伴噺.Size = new System.Drawing.Size(120, 27);
+            this.璁㈠崟鏁伴噺.TabIndex = 148;
+            this.璁㈠崟鏁伴噺.Text = "璁㈠崟鏁伴噺";
+            // 
+            // txtHICMOQty
+            // 
+            this.txtHICMOQty.Location = new System.Drawing.Point(900, 221);
+            this.txtHICMOQty.Multiline = true;
+            this.txtHICMOQty.Name = "txtHICMOQty";
+            this.txtHICMOQty.Size = new System.Drawing.Size(112, 42);
+            this.txtHICMOQty.TabIndex = 147;
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Location = new System.Drawing.Point(9, 181);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(879, 298);
+            this.tabControl1.TabIndex = 149;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.grdMain);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(871, 272);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "鐗╂枡淇℃伅";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.grdList);
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(871, 272);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "鏉$爜淇℃伅";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // grdList
+            // 
+            this.grdList.AllowUserToAddRows = false;
+            this.grdList.AllowUserToDeleteRows = false;
+            this.grdList.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;
+            this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdList.Location = new System.Drawing.Point(3, 3);
+            this.grdList.Margin = new System.Windows.Forms.Padding(0);
+            this.grdList.Name = "grdList";
+            this.grdList.ReadOnly = true;
+            this.grdList.RowTemplate.Height = 23;
+            this.grdList.Size = new System.Drawing.Size(866, 269);
+            this.grdList.TabIndex = 20;
+            // 
+            // cz
+            // 
+            this.cz.AutoSize = false;
+            this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
+            this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.cz.Name = "cz";
+            this.cz.Size = new System.Drawing.Size(35, 47);
+            this.cz.Text = "閲嶇疆";
+            this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cz.Click += new System.EventHandler(this.cz_Click);
             // 
             // Sc_ICMOToBarCode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.ActiveCaption;
-            this.ClientSize = new System.Drawing.Size(1172, 599);
+            this.ClientSize = new System.Drawing.Size(1172, 869);
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.璁㈠崟鏁伴噺);
+            this.Controls.Add(this.txtHICMOQty);
+            this.Controls.Add(this.button1);
+            this.Controls.Add(this.grdSub);
+            this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.label7);
-            this.Controls.Add(this.textBox1);
+            this.Controls.Add(this.txtHBQty);
             this.Controls.Add(this.鏍囧噯瑁呯);
             this.Controls.Add(this.txtHMiniQty);
             this.Controls.Add(this.button6);
             this.Controls.Add(this.button5);
             this.Controls.Add(this.button4);
             this.Controls.Add(this.gbUp);
-            this.Controls.Add(this.grdMain);
             this.Controls.Add(this.Tool);
             this.Name = "Sc_ICMOToBarCode";
             this.Text = "蹇�熺敓鎴愭潯鐮�";
@@ -474,6 +768,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
             this.gbUp.ResumeLayout(false);
             this.gbUp.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -514,6 +815,28 @@
         private System.Windows.Forms.TextBox txtHMiniQty;
         private System.Windows.Forms.Label 鏍囧噯瑁呯;
         private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.TextBox txtHBQty;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.ComboBox cmbHBarCodeType;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button cmdHSaveBill1;
+        private System.Windows.Forms.DateTimePicker dtpHEndDate1;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.DateTimePicker dtpHBeginDate1;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.TextBox txtHICMOBillNo1;
+        private System.Windows.Forms.TextBox txtHMaterID1;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Button cmdHMaterID1;
+        private System.Windows.Forms.DataGridView grdSub;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Label 璁㈠崟鏁伴噺;
+        private System.Windows.Forms.TextBox txtHICMOQty;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.DataGridView grdList;
+        private System.Windows.Forms.ToolStripButton cz;
     }
 }
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
index ebceeae..19878a1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.resx"
@@ -397,6 +397,15 @@
         AAAASUVORK5CYII=
 </value>
   </data>
+  <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+        wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+        mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+        OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+  </data>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>102, 16</value>
   </metadata>
@@ -448,6 +457,21 @@
         FIYcEAA7
 </value>
   </data>
+  <data name="cmdHMaterID1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+        /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+        /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+        /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+        gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+        wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+        FIYcEAA7
+</value>
+  </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>37</value>
   </metadata>

--
Gitblit v1.9.1