From 285fe20712e710790bbf7439b11f77d19a71c50c Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 08 五月 2025 09:46:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WarM/条码打印/Gy_BarCodeBill_Rework.designer.cs |  318 ++++++++------------
 WarM/条码打印/Gy_BarCodeBill_Rework.resx        |   45 +--
 WarM/条码打印/Gy_BarCodeBill_Rework.cs          |  484 +++-----------------------------
 3 files changed, 196 insertions(+), 651 deletions(-)

diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index f270974..985e9f9 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -259,8 +259,6 @@
             this.lblCaption.Text = ModCaption;
             //鍔犺浇缁勭粐淇℃伅
             Sub_AddOrdList();
-            //鍔犺浇婧愬崟绫诲瀷
-            Sub_AddHSourceBillTypeList();
 
             //鑾峰彇绯荤粺鍙傛暟
             ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
@@ -307,25 +305,7 @@
             cmbHOrgID.DisplayMember = "HName";
             cmbHOrgID.ValueMember = "HItemID";
         }
-
-        //鍔犺浇婧愬崟绫诲瀷
-        private void Sub_AddHSourceBillTypeList()
-        {
-            DataSet ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_SourceBillType " + HOrgID.ToString(), "h_p_Gy_BarCodeBill_SourceBillType");
-            if (ds == null || ds.Tables[0].Rows.Count == 0)
-            {
-                cmbSourceBillType.DataSource = null;
-                cmbSourceBillType.Items.Clear();
-                MessageBox.Show("鑾峰彇婧愬崟绫诲瀷澶辫触");
-                return;
-            }
-            cmbSourceBillType.DataSource = null;
-            cmbSourceBillType.Items.Clear();
-            cmbSourceBillType.DataSource = ds.Tables[0];
-            cmbSourceBillType.DisplayMember = "HName";
-            cmbSourceBillType.ValueMember = "HItemID";
-        }
-
+    
         //绐椾綋灏哄鍙樺寲鏃�
         private void Gy_BarCodeBill_Rework_Resize(object sender, EventArgs e)
         {
@@ -567,7 +547,6 @@
                 int HSumBQty = 0;               //鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
                 int n = 0;                      //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
                 DataSet Ds;
-                pb1.Value = 0;
 
                 Int64 HEntryID = 0;             //瀛怚D
                 string HBarCode = "";           //鏉″舰鐮� 
@@ -622,7 +601,6 @@
                     if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
                     {
                         HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
-                        pb1.Maximum = HSumBQty;
                     }
                 }
                 for (int j = 0; j < grdMain.Rows.Count; j++)
@@ -642,39 +620,11 @@
                         //==================================
                         if (HBarCodeType == "鍞竴鏉$爜")
                         {
-                            if (CampanyName == "涓帶")
-                            {
-                                HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
-                                sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
-                                if (HSourceBillNo == "")
-                                {
-                                    //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
-                                    sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
-                                    Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                                    LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
-                                }
-                                else
-                                {
-                                    //鏉$爜 = 婧愬崟鍗曞彿 + 鐗╂枡ID + 琛屽彿
-                                    sTMNumber = HSourceBillNo + sMaterID + sSourceEntryID;
-                                }
-                            }
-                            else  //閫氱敤鏂规硶
-                            {
-                                //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
-                                sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
-                                Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
-                                LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
-                            }
-                        }
-                        else if (HBarCodeType == "鍝佺鏉$爜")
-                        {
-                            TM = HOrgNumber + sMaterID;
-                        }
-                        else if (HBarCodeType == "鎵规鏉$爜")
-                        {
-                            TM = HOrgNumber + sMaterID + HBatchNo;
-                        }
+                            //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                            sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        }                     
                         else
                         {
                             MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉$爜锛�");
@@ -716,31 +666,13 @@
                             }
                             if (HBarCodeType == "鍞竴鏉$爜")
                             {
-                                if (CampanyName == "涓帶")
-                                {
-                                    if (HSourceBillNo == "")
-                                    {
-                                        //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
-                                        TM = sTMNumber + LSH2;
-                                    }
-                                    else
-                                    {
-                                        if (HBQty > 1)
-                                        {
-                                            MessageBox.Show("鐢熶骇姹囨姤鍗曘�佹敹鏂欓�氱煡鍗曠敓鎴愭潯鐮佹椂锛岀鏁颁笉鑳藉ぇ浜�1锛�");
-                                            bc.Enabled = true;
-                                            oCn.RollBack();
-                                            return;
-                                        }
-                                        //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑
-                                        TM = sTMNumber;
-                                    }
-                                }
-                                else
-                                {
-                                    //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
-                                    TM = sTMNumber + LSH2;
-                                }
+                                //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
+                                TM = sTMNumber + LSH2;
+
+                                //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                                sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+                                Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                                LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                             }
 
                             HEntryID = j + 1;
@@ -815,7 +747,6 @@
                                     + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
                                     + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
                                     ")");
-                            pb1.Value = n + 1;
                             n = n + 1;
                             nn = nn + 1;
                         }
@@ -936,6 +867,7 @@
             grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
             grdMain.Columns[HEndDateCol].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
 
+
             //鏍煎紡鍖�   闅愯棌鍒�
             grdMain.Columns[HTagCol].Visible = false;
             grdMain.Columns[HMainIDCol].Visible = false;
@@ -977,6 +909,7 @@
             grdMain.Columns[HSeOrderSEQCol].Visible = false;
             grdMain.Columns[HInnerBillNoCol].Visible = false;
             grdMain.Columns[HEndDateCol].Visible = false;
+            grdMain.Columns[HBillNoCol].Visible = false;
 
             //璁剧疆鍙紪杈戝垪
             string sAllowCol = HQtyCol.ToString() +
@@ -1016,17 +949,9 @@
                 grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell3;
                 //缃戞牸涓嬫媺閫夋嫨妗�
                 DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
-                if (CampanyName == "涓帶")
-                {
-                    column.Items.Add("鎵规鏉$爜");
-                    column.Items.Add("鍝佺鏉$爜");
-                }
-                else
-                {
-                    column.Items.Add("鍞竴鏉$爜");
-                    column.Items.Add("鎵规鏉$爜");
-                    column.Items.Add("鍝佺鏉$爜");
-                }
+
+                column.Items.Add("鍞竴鏉$爜");
+
                 grdMain.Rows[i].Cells[HBarCodeTypeCol] = column;
             }
 
@@ -1125,7 +1050,7 @@
                                         grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
                                         grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
                                         grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
-                                        grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = oMater.omodel.HBarCodeType;
+                                        grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "鍞竴鏉$爜";
                                         //鍚敤鎵规
                                         if (oMater.omodel.HBatchManager)
                                         {
@@ -1150,12 +1075,7 @@
                                             grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
                                             grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
                                         }
-
-                                        if (CampanyName == "涓帶")
-                                        {
-                                            grdMain.Rows[sRow].Cells[HQtyCol].Value = oMater.omodel.HQtyMin;
-                                            grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
-                                        }
+                                       
                                         oEdit.Text = oMater.omodel.HNumber;
                                     }
                                     else
@@ -1375,154 +1295,7 @@
         }
 
         #endregion
-
-
-        #region 閫夋簮鍗曡繑鍥炰俊鎭�     鎸夋斁澶ч暅鍥炬爣杩斿洖
-
-        private void cmdSourceBillNo_Click(object sender, EventArgs e)
-        {
-            if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
-            {
-                string sWhere = "";
-                //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
-                if (SourceQtyCtl == "N")
-                {
-                    sWhere = " and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0";
-                }
-                else
-                {
-                    sWhere = " and HOrgID =" + HOrgID.ToString();
-                }
-
-                DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
-                if (oIFCLD_ICMOList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
-                if (oIF_ICMOReportBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
-                if (oIF_POInStockBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_POInStockBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
-                if (oIF_POOrderBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_POOrderBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
-                if (oIF_EntrustOrderBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
-            {
-                string sWhere = "";
-                DAL.Cls_S_IF_POStockInBillList oIF_POStockInBillList = new DAL.Cls_S_IF_POStockInBillList();
-                if (oIF_POStockInBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_POStockInBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
-            {
-                string sWhere = "";
-                DAL.Cls_S_IF_SeOutStockBackBillList oIF_SeOutStockBackBillList = new DAL.Cls_S_IF_SeOutStockBackBillList();
-                if (oIF_SeOutStockBackBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_SeOutStockBackBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_OtherInBillList oIF_OtherInBillList = new DAL.Cls_S_IF_OtherInBillList();
-                if (oIF_OtherInBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_OtherInBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "鐩存帴璋冩嫧鍗�")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_MoveStockBillList oIF_MoveStockBillList = new DAL.Cls_S_IF_MoveStockBillList();
-                if (oIF_MoveStockBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_MoveStockBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "閲囪喘閫�鏂欏崟")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_POStockInBackBillList oIF_POStockInBackBillList = new DAL.Cls_S_IF_POStockInBackBillList();
-                if (oIF_POStockInBackBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_POStockInBackBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "鐢熶骇閫�鏂欏崟")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_MateOutBackBillList oIF_MateOutBackBillList = new DAL.Cls_S_IF_MateOutBackBillList();
-                if (oIF_MateOutBackBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_MateOutBackBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "缁勮鎷嗗嵏鍗�")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_PackageDismantleBillList oIF_PackageDismantleBillList = new DAL.Cls_S_IF_PackageDismantleBillList();
-                if (oIF_PackageDismantleBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_PackageDismantleBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "宸ュ簭娴佽浆鍗�")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_ProcessExchangeBillList oIF_ProcessExchangeBillList = new DAL.Cls_S_IF_ProcessExchangeBillList();
-                if (oIF_ProcessExchangeBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_ProcessExchangeBillList.oBillSelectColl);
-                }
-            }
-            else if (cmbSourceBillType.Text.Trim() == "宸ュ簭姹囨姤鍗�")
-            {
-                string sWhere = " and HOrgID =" + HOrgID.ToString();
-                DAL.Cls_S_IF_ProcessReportBillList oIF_ProcessReportBillList = new DAL.Cls_S_IF_ProcessReportBillList();
-                if (oIF_ProcessReportBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
-                {
-                    FillSelectData(oIF_ProcessReportBillList.oBillSelectColl);
-                }
-            }
-            else
-            {
-
-            }
-        }
-
+       
         private void FillSelectData(List<DBUtility.BillSelect> oList)
         {
             DataSet Ds;
@@ -1838,51 +1611,8 @@
                 grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
             }
 
-            if (CampanyName == "涓帶")
-            {
-                grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
-            }
-            else
-            {
-                grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
-            }
-            if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�" || cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
-                || cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟" || cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
-            {
-                grdMain.Rows[i].Cells[HInnerBillNoCol].Value = oTable.Rows[0]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
-                grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
-                grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
-                grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
-                if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
-                {
-                    if (oTable.Rows[0]["鏄惁璧犲搧"].ToString() == "鏄�")
-                    {
-                        grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 1;
-                    }
-                    else
-                    {
-                        grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 0;
-                    }
-                    grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oTable.Rows[0]["閿�鍞鍗曞彿"].ToString();
-                    grdMain.Rows[i].Cells[HSeOrderSEQCol].Value = oTable.Rows[0]["閿�鍞鍗曡鍙�"].ToString();
-                }
+            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
 
-            }
-            if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
-            {
-                grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
-                grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["瀹㈡埛浠g爜"].ToString();
-                grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["瀹㈡埛"].ToString();
-            }
-            if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
-            {
-                grdMain.Rows[i].Cells[HWhIDCol].Value = oTable.Rows[0]["HWhID"].ToString();
-                grdMain.Rows[i].Cells[HWhNumberCol].Value = oTable.Rows[0]["浠撳簱浠g爜"].ToString();
-                grdMain.Rows[i].Cells[HWhNameCol].Value = oTable.Rows[0]["浠撳簱"].ToString();
-                grdMain.Rows[i].Cells[HSPIDCol].Value = oTable.Rows[0]["HSPID"].ToString();
-                grdMain.Rows[i].Cells[HSPNumberCol].Value = oTable.Rows[0]["浠撲綅浠g爜"].ToString();
-                grdMain.Rows[i].Cells[HSPNameCol].Value = oTable.Rows[0]["浠撲綅"].ToString();
-            }
             //--
             //璁剧疆鍙紪杈戝垪
             string sAllowCol = HQtyCol.ToString() +
@@ -1952,10 +1682,6 @@
                 grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
             }
 
-            if (CampanyName == "涓帶")
-            {
-                grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
-            }
             //--
             //璁剧疆鍙紪杈戝垪
             string sAllowCol = HQtyCol.ToString() +
@@ -1972,117 +1698,9 @@
             RowCount(i, 0);
         }
 
-        #endregion
 
 
-        #region 閫夋簮鍗曡繑鍥炰俊鎭�     鎸夊洖杞﹂敭杩斿洖
-        private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
-        {
-            if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
-            {
-                if (txtHSourceBillNo.Text.Length < 4)
-                {
-                    MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
-                    return;
-                }
-                //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
-                if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
-                {
-                    DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
-                    //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
-                    if (SourceQtyCtl == "N")
-                    {
-                        if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0"))  //閫夋嫨鍘熷崟
-                        {
-                            FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
-                            txtHSourceBillNo.Text = "";
-                        }
-                        else
-                        {
-                            MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString()))  //閫夋嫨鍘熷崟
-                        {
-                            FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
-                            txtHSourceBillNo.Text = "";
-                        }
-                        else
-                        {
-                            MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
-                            return;
-                        }
-                    }
-                }
-                else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
-                {
-                    DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
-                    if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString()))  //閫夋嫨鍘熷崟
-                    {
-                        FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
-                        txtHSourceBillNo.Text = "";
-                    }
-                    else
-                    {
-                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
-                        return;
-                    }
-                }
-                else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
-                {
-                    DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
-                    if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString()))  //閫夋嫨鍘熷崟
-                    {
-                        FillSelectData(oIF_POInStockBillList.oBillSelectColl);
-                        txtHSourceBillNo.Text = "";
-                    }
-                    else
-                    {
-                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
-                        return;
-                    }
-                }
-                else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
-                {
-                    DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
-                    if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString()))  //閫夋嫨鍘熷崟
-                    {
-                        FillSelectData(oIF_POOrderBillList.oBillSelectColl);
-                        txtHSourceBillNo.Text = "";
-                    }
-                    else
-                    {
-                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
-                        return;
-                    }
-                }
-                else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
-                {
-                    DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
-                    if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + HOrgID.ToString()))  //閫夋嫨鍘熷崟
-                    {
-                        FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
-                        txtHSourceBillNo.Text = "";
-                    }
-                    else
-                    {
-                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
-                        return;
-                    }
-                }
-                else
-                {
-                    MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
-                    return;
-                }
-            }
-        }
-
-        #endregion
-
+      
 
         #region  //鎵撳嵃璁剧疆
 
@@ -2328,28 +1946,28 @@
         #region 閫夋嫨鏃ユ湡
         private void dtpHDate_ValueChanged(object sender, EventArgs e)
         {
-            if (chkUpdateSubDate.Checked == true)
-            {
-                for (int j = 0; j < grdMain.Rows.Count; j++)
-                {
-                    long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);  // 鐗╂枡鍐呯爜
-                    if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
-                    {
-                        //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
-                        DateTime HProduceDate = dtpHDate.Value;                                                 //鐢熶骇鏃ユ湡
-                        string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
-                        int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value);    //淇濊川鏈�
-                        //鐢熶骇鏃ユ湡
-                        grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+            //if (chkUpdateSubDate.Checked == true)
+            //{
+            //    for (int j = 0; j < grdMain.Rows.Count; j++)
+            //    {
+            //        long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);  // 鐗╂枡鍐呯爜
+            //        if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
+            //        {
+            //            //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
+            //            DateTime HProduceDate = dtpHDate.Value;                                                 //鐢熶骇鏃ユ湡
+            //            string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+            //            int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value);    //淇濊川鏈�
+            //            //鐢熶骇鏃ユ湡
+            //            grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
 
-                        if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
-                        {
-                            //鏈夋晥鏈熻嚦
-                            grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
-                        }
-                    }
-                }
-            }
+            //            if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+            //            {
+            //                //鏈夋晥鏈熻嚦
+            //                grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
+            //            }
+            //        }
+            //    }
+            //}
         }
 
         #endregion
@@ -2480,17 +2098,9 @@
                 grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell3;
                 //缃戞牸涓嬫媺閫夋嫨妗�
                 DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
-                if (CampanyName == "涓帶")
-                {
-                    column.Items.Add("鎵规鏉$爜");
-                    column.Items.Add("鍝佺鏉$爜");
-                }
-                else
-                {
-                    column.Items.Add("鍞竴鏉$爜");
-                    column.Items.Add("鎵规鏉$爜");
-                    column.Items.Add("鍝佺鏉$爜");
-                }
+
+                column.Items.Add("鍞竴鏉$爜");
+
                 grdMain.Rows[row + r].Cells[HBarCodeTypeCol] = column;
             }
             DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs"
index 6233030..8fd84e7 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.designer.cs"
@@ -58,20 +58,13 @@
             this.tc = new System.Windows.Forms.ToolStripButton();
             this.lblCaption = new System.Windows.Forms.Label();
             this.P1 = new System.Windows.Forms.Panel();
-            this.pb1 = new System.Windows.Forms.ProgressBar();
             this.pic1 = new System.Windows.Forms.PictureBox();
             this.gbUp = new System.Windows.Forms.GroupBox();
-            this.chkUpdateSubDate = new System.Windows.Forms.CheckBox();
             this.dtpHDate = new System.Windows.Forms.DateTimePicker();
             this.label2 = new System.Windows.Forms.Label();
             this.cmbHOrgID = new System.Windows.Forms.ComboBox();
             this.label3 = new System.Windows.Forms.Label();
             this.cmdHEmpID = new System.Windows.Forms.Button();
-            this.cmdSourceBillNo = new System.Windows.Forms.Button();
-            this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
-            this.label14 = new System.Windows.Forms.Label();
-            this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
-            this.label10 = new System.Windows.Forms.Label();
             this.panel2 = new System.Windows.Forms.Panel();
             this.txtHDeleteDate = new System.Windows.Forms.Label();
             this.label25 = new System.Windows.Forms.Label();
@@ -152,7 +145,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(1017, 50);
+            this.Tool.Size = new System.Drawing.Size(2034, 100);
             this.Tool.Stretch = true;
             this.Tool.TabIndex = 17;
             this.Tool.Text = "toolStrip1";
@@ -202,7 +195,7 @@
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
-            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 100);
             // 
             // AddRow
             // 
@@ -249,7 +242,7 @@
             // toolStripSeparator3
             // 
             this.toolStripSeparator3.Name = "toolStripSeparator3";
-            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 100);
             // 
             // bc
             // 
@@ -282,7 +275,7 @@
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 100);
             // 
             // kc
             // 
@@ -301,13 +294,13 @@
             // toolStripSeparator4
             // 
             this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 100);
             // 
             // toolStripSeparator6
             // 
             this.toolStripSeparator6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator6.Name = "toolStripSeparator6";
-            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 100);
             // 
             // tb
             // 
@@ -327,7 +320,7 @@
             // toolStripSeparator9
             // 
             this.toolStripSeparator9.Name = "toolStripSeparator9";
-            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 100);
             // 
             // gl
             // 
@@ -346,7 +339,7 @@
             // toolStripSeparator13
             // 
             this.toolStripSeparator13.Name = "toolStripSeparator13";
-            this.toolStripSeparator13.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator13.Size = new System.Drawing.Size(6, 100);
             // 
             // BatchNo
             // 
@@ -365,7 +358,7 @@
             // toolStripSeparator5
             // 
             this.toolStripSeparator5.Name = "toolStripSeparator5";
-            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 100);
             // 
             // mrlk
             // 
@@ -375,7 +368,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(60, 47);
+            this.mrlk.Size = new System.Drawing.Size(114, 94);
             this.mrlk.Text = "榛樿鍒楀";
             this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -385,7 +378,7 @@
             // 
             this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator11.Name = "toolStripSeparator11";
-            this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator11.Size = new System.Drawing.Size(6, 100);
             // 
             // bclk
             // 
@@ -395,7 +388,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(60, 47);
+            this.bclk.Size = new System.Drawing.Size(114, 94);
             this.bclk.Text = "淇濆瓨鍒楀";
             this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -405,7 +398,7 @@
             // 
             this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
             this.toolStripSeparator10.Name = "toolStripSeparator10";
-            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
+            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 100);
             // 
             // tc
             // 
@@ -425,37 +418,32 @@
             // 
             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(501, 12);
+            this.lblCaption.Location = new System.Drawing.Point(1002, 24);
+            this.lblCaption.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.lblCaption.Name = "lblCaption";
-            this.lblCaption.Size = new System.Drawing.Size(89, 19);
+            this.lblCaption.Size = new System.Drawing.Size(173, 38);
             this.lblCaption.TabIndex = 18;
             this.lblCaption.Text = "鍗曟嵁缂栬緫";
             // 
             // P1
             // 
             this.P1.BackColor = System.Drawing.Color.Lavender;
-            this.P1.Controls.Add(this.pb1);
             this.P1.Controls.Add(this.pic1);
             this.P1.Controls.Add(this.lblCaption);
             this.P1.Controls.Add(this.gbUp);
             this.P1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.P1.Location = new System.Drawing.Point(41, 50);
+            this.P1.Location = new System.Drawing.Point(82, 100);
+            this.P1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.P1.Name = "P1";
-            this.P1.Size = new System.Drawing.Size(937, 137);
+            this.P1.Size = new System.Drawing.Size(1874, 196);
             this.P1.TabIndex = 31;
-            // 
-            // pb1
-            // 
-            this.pb1.Location = new System.Drawing.Point(76, 12);
-            this.pb1.Name = "pb1";
-            this.pb1.Size = new System.Drawing.Size(256, 23);
-            this.pb1.TabIndex = 93;
             // 
             // pic1
             // 
-            this.pic1.Location = new System.Drawing.Point(313, 3);
+            this.pic1.Location = new System.Drawing.Point(626, 6);
+            this.pic1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.pic1.Name = "pic1";
-            this.pic1.Size = new System.Drawing.Size(78, 41);
+            this.pic1.Size = new System.Drawing.Size(156, 82);
             this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pic1.TabIndex = 36;
             this.pic1.TabStop = false;
@@ -464,51 +452,36 @@
             // gbUp
             // 
             this.gbUp.BackColor = System.Drawing.Color.Transparent;
-            this.gbUp.Controls.Add(this.chkUpdateSubDate);
             this.gbUp.Controls.Add(this.dtpHDate);
             this.gbUp.Controls.Add(this.label2);
             this.gbUp.Controls.Add(this.cmbHOrgID);
             this.gbUp.Controls.Add(this.label3);
             this.gbUp.Controls.Add(this.cmdHEmpID);
-            this.gbUp.Controls.Add(this.cmdSourceBillNo);
-            this.gbUp.Controls.Add(this.txtHSourceBillNo);
-            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(14, 39);
+            this.gbUp.Location = new System.Drawing.Point(28, 78);
+            this.gbUp.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.gbUp.Name = "gbUp";
-            this.gbUp.Size = new System.Drawing.Size(892, 80);
+            this.gbUp.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.gbUp.Size = new System.Drawing.Size(1784, 103);
             this.gbUp.TabIndex = 33;
             this.gbUp.TabStop = false;
-            // 
-            // chkUpdateSubDate
-            // 
-            this.chkUpdateSubDate.AutoSize = true;
-            this.chkUpdateSubDate.Location = new System.Drawing.Point(596, 24);
-            this.chkUpdateSubDate.Margin = new System.Windows.Forms.Padding(2);
-            this.chkUpdateSubDate.Name = "chkUpdateSubDate";
-            this.chkUpdateSubDate.Size = new System.Drawing.Size(120, 16);
-            this.chkUpdateSubDate.TabIndex = 103;
-            this.chkUpdateSubDate.Text = "鎵归噺鏇存柊鐢熶骇鏃ユ湡";
-            this.chkUpdateSubDate.UseVisualStyleBackColor = true;
             // 
             // dtpHDate
             // 
             this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dtpHDate.Location = new System.Drawing.Point(394, 17);
-            this.dtpHDate.Margin = new System.Windows.Forms.Padding(2);
+            this.dtpHDate.Location = new System.Drawing.Point(788, 34);
+            this.dtpHDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dtpHDate.Name = "dtpHDate";
-            this.dtpHDate.Size = new System.Drawing.Size(188, 21);
+            this.dtpHDate.Size = new System.Drawing.Size(372, 35);
             this.dtpHDate.TabIndex = 96;
             this.dtpHDate.ValueChanged += new System.EventHandler(this.dtpHDate_ValueChanged);
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(327, 21);
-            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label2.Location = new System.Drawing.Point(654, 42);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.Size = new System.Drawing.Size(106, 24);
             this.label2.TabIndex = 95;
             this.label2.Text = "鏃�    鏈�";
             // 
@@ -516,9 +489,10 @@
             // 
             this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbHOrgID.FormattingEnabled = true;
-            this.cmbHOrgID.Location = new System.Drawing.Point(101, 17);
+            this.cmbHOrgID.Location = new System.Drawing.Point(202, 34);
+            this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.cmbHOrgID.Name = "cmbHOrgID";
-            this.cmbHOrgID.Size = new System.Drawing.Size(188, 20);
+            this.cmbHOrgID.Size = new System.Drawing.Size(372, 32);
             this.cmbHOrgID.TabIndex = 85;
             this.cmbHOrgID.SelectionChangeCommitted += new System.EventHandler(this.cmbHOrgID_SelectionChangeCommitted);
             // 
@@ -526,9 +500,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.ForeColor = System.Drawing.Color.Black;
-            this.label3.Location = new System.Drawing.Point(35, 21);
+            this.label3.Location = new System.Drawing.Point(70, 42);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(53, 12);
+            this.label3.Size = new System.Drawing.Size(106, 24);
             this.label3.TabIndex = 84;
             this.label3.Text = "缁�    缁�";
             // 
@@ -537,62 +512,13 @@
             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(892, -7);
+            this.cmdHEmpID.Location = new System.Drawing.Point(1784, -14);
+            this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.cmdHEmpID.Name = "cmdHEmpID";
-            this.cmdHEmpID.Size = new System.Drawing.Size(22, 22);
+            this.cmdHEmpID.Size = new System.Drawing.Size(44, 44);
             this.cmdHEmpID.TabIndex = 79;
             this.cmdHEmpID.UseVisualStyleBackColor = false;
             this.cmdHEmpID.Visible = false;
-            // 
-            // cmdSourceBillNo
-            // 
-            this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
-            this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
-            this.cmdSourceBillNo.Location = new System.Drawing.Point(560, 45);
-            this.cmdSourceBillNo.Name = "cmdSourceBillNo";
-            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);
-            // 
-            // txtHSourceBillNo
-            // 
-            this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-            this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
-            this.txtHSourceBillNo.Name = "txtHSourceBillNo";
-            this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
-            this.txtHSourceBillNo.TabIndex = 41;
-            this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
-            // 
-            // label14
-            // 
-            this.label14.AutoSize = true;
-            this.label14.ForeColor = System.Drawing.Color.Black;
-            this.label14.Location = new System.Drawing.Point(327, 50);
-            this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(53, 12);
-            this.label14.TabIndex = 40;
-            this.label14.Text = "閫� 鍗� 鍙�";
-            // 
-            // cmbSourceBillType
-            // 
-            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(101, 46);
-            this.cmbSourceBillType.Name = "cmbSourceBillType";
-            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(35, 50);
-            this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(53, 12);
-            this.label10.TabIndex = 35;
-            this.label10.Text = "婧愬崟绫诲瀷";
             // 
             // panel2
             // 
@@ -618,18 +544,20 @@
             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(41, 506);
+            this.panel2.Location = new System.Drawing.Point(82, 1012);
+            this.panel2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(937, 93);
+            this.panel2.Size = new System.Drawing.Size(1874, 186);
             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(725, 47);
+            this.txtHDeleteDate.Location = new System.Drawing.Point(1450, 94);
+            this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHDeleteDate.Name = "txtHDeleteDate";
-            this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
+            this.txtHDeleteDate.Size = new System.Drawing.Size(196, 30);
             this.txtHDeleteDate.TabIndex = 19;
             // 
             // label25
@@ -637,9 +565,10 @@
             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(666, 50);
+            this.label25.Location = new System.Drawing.Point(1332, 100);
+            this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label25.Name = "label25";
-            this.label25.Size = new System.Drawing.Size(53, 12);
+            this.label25.Size = new System.Drawing.Size(106, 24);
             this.label25.TabIndex = 18;
             this.label25.Text = "浣滃簾鏃ユ湡";
             // 
@@ -647,9 +576,10 @@
             // 
             this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
             this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
+            this.txtHDeleteMan.Location = new System.Drawing.Point(1450, 24);
+            this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHDeleteMan.Name = "txtHDeleteMan";
-            this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
+            this.txtHDeleteMan.Size = new System.Drawing.Size(196, 30);
             this.txtHDeleteMan.TabIndex = 17;
             // 
             // label27
@@ -657,9 +587,10 @@
             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(666, 12);
+            this.label27.Location = new System.Drawing.Point(1332, 24);
+            this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label27.Name = "label27";
-            this.label27.Size = new System.Drawing.Size(41, 12);
+            this.label27.Size = new System.Drawing.Size(82, 24);
             this.label27.TabIndex = 16;
             this.label27.Text = "浣滃簾浜�";
             // 
@@ -667,9 +598,10 @@
             // 
             this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
             this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
+            this.txtHUpDateDate.Location = new System.Drawing.Point(1124, 94);
+            this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHUpDateDate.Name = "txtHUpDateDate";
-            this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
+            this.txtHUpDateDate.Size = new System.Drawing.Size(196, 30);
             this.txtHUpDateDate.TabIndex = 15;
             // 
             // label23
@@ -677,9 +609,10 @@
             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(503, 47);
+            this.label23.Location = new System.Drawing.Point(1006, 94);
+            this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label23.Name = "label23";
-            this.label23.Size = new System.Drawing.Size(53, 12);
+            this.label23.Size = new System.Drawing.Size(106, 24);
             this.label23.TabIndex = 14;
             this.label23.Text = "淇敼鏃ユ湡";
             // 
@@ -687,9 +620,10 @@
             // 
             this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
             this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
+            this.txtHUpDater.Location = new System.Drawing.Point(1124, 24);
+            this.txtHUpDater.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHUpDater.Name = "txtHUpDater";
-            this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
+            this.txtHUpDater.Size = new System.Drawing.Size(196, 30);
             this.txtHUpDater.TabIndex = 13;
             // 
             // label21
@@ -697,9 +631,10 @@
             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(503, 12);
+            this.label21.Location = new System.Drawing.Point(1006, 24);
+            this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(41, 12);
+            this.label21.Size = new System.Drawing.Size(82, 24);
             this.label21.TabIndex = 12;
             this.label21.Text = "淇敼浜�";
             // 
@@ -707,9 +642,10 @@
             // 
             this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
             this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
+            this.txtHCloseDate.Location = new System.Drawing.Point(794, 94);
+            this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHCloseDate.Name = "txtHCloseDate";
-            this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
+            this.txtHCloseDate.Size = new System.Drawing.Size(196, 30);
             this.txtHCloseDate.TabIndex = 11;
             // 
             // label19
@@ -717,9 +653,10 @@
             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(338, 50);
+            this.label19.Location = new System.Drawing.Point(676, 100);
+            this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(53, 12);
+            this.label19.Size = new System.Drawing.Size(106, 24);
             this.label19.TabIndex = 10;
             this.label19.Text = "鍏抽棴鏃ユ湡";
             // 
@@ -727,9 +664,10 @@
             // 
             this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
             this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
+            this.txtHCloseMan.Location = new System.Drawing.Point(792, 26);
+            this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHCloseMan.Name = "txtHCloseMan";
-            this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
+            this.txtHCloseMan.Size = new System.Drawing.Size(196, 30);
             this.txtHCloseMan.TabIndex = 9;
             // 
             // label17
@@ -737,9 +675,10 @@
             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(338, 16);
+            this.label17.Location = new System.Drawing.Point(676, 32);
+            this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(41, 12);
+            this.label17.Size = new System.Drawing.Size(82, 24);
             this.label17.TabIndex = 8;
             this.label17.Text = "鍏抽棴浜�";
             // 
@@ -747,9 +686,10 @@
             // 
             this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
             this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
+            this.txtHCheckDate.Location = new System.Drawing.Point(468, 94);
+            this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHCheckDate.Name = "txtHCheckDate";
-            this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
+            this.txtHCheckDate.Size = new System.Drawing.Size(196, 30);
             this.txtHCheckDate.TabIndex = 7;
             // 
             // label15
@@ -757,9 +697,10 @@
             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(175, 50);
+            this.label15.Location = new System.Drawing.Point(350, 100);
+            this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(53, 12);
+            this.label15.Size = new System.Drawing.Size(106, 24);
             this.label15.TabIndex = 6;
             this.label15.Text = "瀹℃牳鏃ユ湡";
             // 
@@ -767,9 +708,10 @@
             // 
             this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
             this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHChecker.Location = new System.Drawing.Point(234, 13);
+            this.txtHChecker.Location = new System.Drawing.Point(468, 26);
+            this.txtHChecker.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHChecker.Name = "txtHChecker";
-            this.txtHChecker.Size = new System.Drawing.Size(98, 15);
+            this.txtHChecker.Size = new System.Drawing.Size(196, 30);
             this.txtHChecker.TabIndex = 5;
             // 
             // label13
@@ -777,9 +719,10 @@
             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(175, 16);
+            this.label13.Location = new System.Drawing.Point(350, 32);
+            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(41, 12);
+            this.label13.Size = new System.Drawing.Size(82, 24);
             this.label13.TabIndex = 4;
             this.label13.Text = "瀹℃牳浜�";
             // 
@@ -787,9 +730,10 @@
             // 
             this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
             this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
+            this.txtHMakeDate.Location = new System.Drawing.Point(142, 94);
+            this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHMakeDate.Name = "txtHMakeDate";
-            this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
+            this.txtHMakeDate.Size = new System.Drawing.Size(196, 30);
             this.txtHMakeDate.TabIndex = 3;
             // 
             // label11
@@ -797,9 +741,10 @@
             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(12, 50);
+            this.label11.Location = new System.Drawing.Point(24, 100);
+            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(53, 12);
+            this.label11.Size = new System.Drawing.Size(106, 24);
             this.label11.TabIndex = 2;
             this.label11.Text = "鍒跺崟鏃ユ湡";
             // 
@@ -807,9 +752,10 @@
             // 
             this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
             this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.txtHMaker.Location = new System.Drawing.Point(71, 13);
+            this.txtHMaker.Location = new System.Drawing.Point(142, 26);
+            this.txtHMaker.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.txtHMaker.Name = "txtHMaker";
-            this.txtHMaker.Size = new System.Drawing.Size(98, 15);
+            this.txtHMaker.Size = new System.Drawing.Size(196, 30);
             this.txtHMaker.TabIndex = 1;
             // 
             // label8
@@ -817,9 +763,10 @@
             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(12, 16);
+            this.label8.Location = new System.Drawing.Point(24, 32);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(41, 12);
+            this.label8.Size = new System.Drawing.Size(82, 24);
             this.label8.TabIndex = 0;
             this.label8.Text = "鍒跺崟浜�";
             // 
@@ -831,17 +778,19 @@
             // panel1
             // 
             this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.panel1.Location = new System.Drawing.Point(0, 50);
+            this.panel1.Location = new System.Drawing.Point(0, 100);
+            this.panel1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(41, 549);
+            this.panel1.Size = new System.Drawing.Size(82, 1098);
             this.panel1.TabIndex = 33;
             // 
             // panel3
             // 
             this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel3.Location = new System.Drawing.Point(978, 50);
+            this.panel3.Location = new System.Drawing.Point(1956, 100);
+            this.panel3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(39, 549);
+            this.panel3.Size = new System.Drawing.Size(78, 1098);
             this.panel3.TabIndex = 34;
             // 
             // grdSum
@@ -851,32 +800,35 @@
             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(41, 487);
+            this.grdSum.Location = new System.Drawing.Point(82, 974);
+            this.grdSum.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.grdSum.Name = "grdSum";
             this.grdSum.ReadOnly = true;
             this.grdSum.RowHeadersWidth = 51;
             this.grdSum.RowTemplate.Height = 23;
             this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
-            this.grdSum.Size = new System.Drawing.Size(937, 19);
+            this.grdSum.Size = new System.Drawing.Size(1874, 38);
             this.grdSum.TabIndex = 45;
             // 
             // grdPrint
             // 
             this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.grdPrint.Location = new System.Drawing.Point(809, 543);
+            this.grdPrint.Location = new System.Drawing.Point(1618, 1086);
+            this.grdPrint.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.grdPrint.Name = "grdPrint";
             this.grdPrint.RowHeadersWidth = 51;
             this.grdPrint.RowTemplate.Height = 23;
-            this.grdPrint.Size = new System.Drawing.Size(25, 24);
+            this.grdPrint.Size = new System.Drawing.Size(50, 48);
             this.grdPrint.TabIndex = 46;
             this.grdPrint.Visible = false;
             // 
             // tabPage3
             // 
             this.tabPage3.Controls.Add(this.grdList);
-            this.tabPage3.Location = new System.Drawing.Point(4, 22);
+            this.tabPage3.Location = new System.Drawing.Point(8, 39);
+            this.tabPage3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(929, 274);
+            this.tabPage3.Size = new System.Drawing.Size(1858, 553);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "鏉$爜鏄庣粏";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -891,20 +843,22 @@
             this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
             this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
             this.grdList.Location = new System.Drawing.Point(0, 0);
+            this.grdList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.grdList.Name = "grdList";
             this.grdList.ReadOnly = true;
             this.grdList.RowHeadersWidth = 30;
             this.grdList.RowTemplate.Height = 23;
-            this.grdList.Size = new System.Drawing.Size(929, 274);
+            this.grdList.Size = new System.Drawing.Size(1858, 553);
             this.grdList.TabIndex = 46;
             // 
             // tabPage1
             // 
             this.tabPage1.Controls.Add(this.grdMain);
-            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Location = new System.Drawing.Point(8, 39);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(929, 274);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.tabPage1.Size = new System.Drawing.Size(1858, 631);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "鐗╂枡淇℃伅";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -918,12 +872,13 @@
             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(3, 3);
+            this.grdMain.Location = new System.Drawing.Point(6, 6);
+            this.grdMain.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.grdMain.Name = "grdMain";
             this.grdMain.ReadOnly = true;
             this.grdMain.RowHeadersWidth = 30;
             this.grdMain.RowTemplate.Height = 23;
-            this.grdMain.Size = new System.Drawing.Size(923, 268);
+            this.grdMain.Size = new System.Drawing.Size(1846, 619);
             this.grdMain.TabIndex = 44;
             this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
             this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -938,18 +893,19 @@
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage3);
             this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(41, 187);
+            this.tabControl1.Location = new System.Drawing.Point(82, 296);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(937, 300);
+            this.tabControl1.Size = new System.Drawing.Size(1874, 678);
             this.tabControl1.TabIndex = 47;
             // 
             // Gy_BarCodeBill_Rework
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Lavender;
-            this.ClientSize = new System.Drawing.Size(1017, 599);
+            this.ClientSize = new System.Drawing.Size(2034, 1198);
             this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.grdSum);
             this.Controls.Add(this.panel2);
@@ -960,6 +916,7 @@
             this.Controls.Add(this.grdPrint);
             this.ForeColor = System.Drawing.Color.Black;
             this.KeyPreview = true;
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "Gy_BarCodeBill_Rework";
             this.Text = "鍗曟嵁缂栬緫";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -1021,11 +978,6 @@
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.ToolStripButton DelRow;
         private System.Windows.Forms.GroupBox gbUp;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.ComboBox cmbSourceBillType;
-        private System.Windows.Forms.Button cmdSourceBillNo;
-        private System.Windows.Forms.TextBox txtHSourceBillNo;
-        private System.Windows.Forms.Label label14;
         private System.Windows.Forms.ToolStripButton tc;
         private System.Windows.Forms.ToolStripButton mrlk;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
@@ -1047,7 +999,6 @@
         private System.Windows.Forms.TabPage tabPage1;
         private System.Windows.Forms.DataGridView grdMain;
         private System.Windows.Forms.TabControl tabControl1;
-        private System.Windows.Forms.ProgressBar pb1;
         private System.Windows.Forms.ToolStripButton sdy;
         private System.Windows.Forms.ToolStripButton spRow;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
@@ -1061,6 +1012,5 @@
         private System.Windows.Forms.ToolStripButton gl;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
         private System.Windows.Forms.ToolStripButton BatchNo;
-        private System.Windows.Forms.CheckBox chkUpdateSubDate;
     }
 }
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx"
index 4269726..0700745 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.resx"
@@ -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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
         jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
         grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
         FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -370,7 +370,7 @@
   <data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
         UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
         V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
         9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -383,7 +383,7 @@
   <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
         UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
         V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
         9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -396,7 +396,7 @@
   <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
         9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
         W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
         mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -407,7 +407,7 @@
   <data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
         9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
         W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
         mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -418,7 +418,7 @@
   <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
         G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
         5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
         EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -428,7 +428,7 @@
   <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
         /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
         mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
         ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -443,7 +443,7 @@
   <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
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
         wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
         mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
         OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -452,7 +452,7 @@
   <data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
         2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
         vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
         8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
@@ -463,7 +463,7 @@
   <data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
         EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
         cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
         6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -478,7 +478,7 @@
   <data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
         taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
         NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
         Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -492,7 +492,7 @@
   <data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
         BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
         CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
         tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -502,7 +502,7 @@
   <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
         oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
         znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
         vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -517,7 +517,7 @@
   <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
         /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
         77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
         aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
@@ -532,7 +532,7 @@
   <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+        YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
         bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
         rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
         wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -542,21 +542,6 @@
   <data name="cmdHEmpID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         R0lGODlhEAAQAIZBAAAzmQBmzP///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>
-  <data name="cmdSourceBillNo.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

--
Gitblit v1.9.1