From cfedb44b75f0ab526b80f06857a6b097f19c8489 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 27 五月 2022 15:35:49 +0800
Subject: [PATCH] 条码档案列表优化

---
 WarM/条码打印/Gy_BarCodeBillList.resx                      |  656 +++++++------------
 WarM/条码打印/Sc_ICMOToBarCode.cs                          |   56 -
 WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs |    8 
 WarM/条码打印/Gy_BarCodeBillList.cs                        |  866 ++++++++++---------------
 WarM/条码打印/Gy_BarCodeBillList.designer.cs               |  170 +---
 DAL/WMS/ClsGy_BarCodeBill_Ctl.cs                       |  184 +++--
 6 files changed, 759 insertions(+), 1,181 deletions(-)

diff --git a/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs b/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
index 260ac0b..d03c159 100644
--- a/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
+++ b/DAL/WMS/ClsGy_BarCodeBill_Ctl.cs
@@ -167,42 +167,6 @@
             }
         }
 
-        //浣滃簾鏉$爜
-        public bool Cancelltion(string sBarCode)
-        {
-            try
-            {
-                oCn.BeginTran();
-                //浣滃簾鏉$爜
-                oCn.RunProc("update Gy_BarCodeBill set HStopflag=1 where HBarCode='" + sBarCode + "'", ref DBUtility.ClsPub.sExeReturnInfo);
-                oCn.Commit();
-                return true;
-            }
-            catch (Exception e)
-            {
-                oCn.RollBack();
-                throw (e);
-            }
-        }
-
-        //鍙嶄綔搴熸潯鐮�
-        public bool UnCancelltion(string sBarCode)
-        {
-            try
-            {
-                oCn.BeginTran();
-                //鍙嶄綔搴熸潯鐮�
-                oCn.RunProc("update Gy_BarCodeBill set HStopflag=0 where HBarCode='" + sBarCode + "'", ref DBUtility.ClsPub.sExeReturnInfo);
-                oCn.Commit();
-                return true;
-            }
-            catch (Exception e)
-            {
-                oCn.RollBack();
-                throw (e);
-            }
-        }
-
         public bool DeleteByMul(string[] sSQL, ref string sReturn)
         {
             try
@@ -225,42 +189,115 @@
         }
 
 
-        //鍒犻櫎鏉$爜
-        public bool DeleteBill(long sHItemID, string sHBarCode, string CurUserName, ref string sReturn)
+
+        //---------------------------------------------------------
+        //New
+
+        //浣滃簾鏉$爜
+        public bool Cancelltion(string sHItemID, string sHBarCode, string sHDeleteMan)
         {
-            //缂栬緫鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, CurUserName))
-            {
-                sReturn = "鎮ㄦ病鏈夊垹闄ゆ潈闄愶紒";
-                return true;
-            }
             try
             {
-                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_Delete " + sHItemID + ",'" + sHBarCode + "','" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','" + DBUtility.ClsPub.IPAddress + "'", "h_p_Gy_BarCodeBill_Delete", ref DBUtility.ClsPub.sExeReturnInfo);
+                oCn.BeginTran();
+                string[] NewBarCode;
+                NewBarCode = sHBarCode.Split(Convert.ToChar("#"));
+
+                //浣滃簾鏉$爜
+                oCn.RunProc("update Gy_BarCodeBill set HStopflag=1,HDeleteMan='" + sHDeleteMan + "',HDeleteDate=getdate() where HItemID in (" + sHItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+                //鍐欏叆绯荤粺鏃ュ織
+                for (int i = 0; i <= NewBarCode.Length - 1; i++)
+                {
+                    oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','浣滃簾鏉$爜锛�" + NewBarCode[i] + "','WMS绯荤粺-鏉$爜妗f鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','浣滃簾'", ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+
+        //鍙嶄綔搴熸潯鐮�
+        public bool UnCancelltion(string sHItemID, string sHBarCode, string sSourceQtyCtl, ref string sReturn)
+        {
+            try
+            {
+                oCn.BeginTran();
+                string[] NewBarCode;
+                NewBarCode = sHBarCode.Split(Convert.ToChar("#"));
+                //鍙嶄綔搴熸潯鐮佸墠杩涜鍒ゆ柇
+                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_UnCancelltion '" + sHItemID + "','" + sSourceQtyCtl + "'", "h_p_Gy_BarCodeBill_UnCancelltion", ref DBUtility.ClsPub.sExeReturnInfo);
                 if (DS == null || DS.Tables[0].Rows.Count <= 0)
                 {
                     oCn.CnClose();
                     oCn.CnDispose();
-                    sReturn = "鍒犻櫎鏉$爜鏃跺彂鐢熼敊璇紒";
-                    return true;
+                    sReturn = "鍙嶄綔搴熸潯鐮佸墠鍒ゆ柇鍙戠敓閿欒锛�";
+                    return false;
                 }
                 else
                 {
-                    //鍒犻櫎澶辫触
                     if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
                     {
                         oCn.CnClose();
                         oCn.CnDispose();
                         sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
-                        return true;
+                        return false;
                     }
                     else
-                    //鍒犻櫎鎴愬姛
+                    {
+                        //鍙嶄綔搴熸潯鐮�
+                        oCn.RunProc("update Gy_BarCodeBill set HStopflag=0,HDeleteMan='',HDeleteDate=null where HItemID in (" + sHItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+                        //鍐欏叆绯荤粺鏃ュ織
+                        for (int i = 0; i <= NewBarCode.Length - 1; i++)
+                        {
+                            oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','鍙嶄綔搴熸潯鐮侊細" + NewBarCode[i] + "','WMS绯荤粺-鏉$爜妗f鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','鍙嶄綔搴�'", ref DBUtility.ClsPub.sExeReturnInfo);
+                        }
+                        oCn.Commit();
+                        return true;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+
+        //鍗曟潯鍒犻櫎鏉$爜
+        public bool DeleteBill(long sHItemID, string sHBarCode, ref string sReturn)
+        {
+            try
+            {
+                oCn.BeginTran();
+                //鍒犻櫎鏉$爜鍓嶈繘琛屽垽鏂�
+                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_Delete_Before " + sHItemID + ",'" + sHBarCode + "'", "h_p_Gy_BarCodeBill_Delete_Before", ref DBUtility.ClsPub.sExeReturnInfo);
+                if (DS == null || DS.Tables[0].Rows.Count <= 0)
+                {
+                    oCn.CnClose();
+                    oCn.CnDispose();
+                    sReturn = "鍒犻櫎鏉$爜鍓嶅垽鏂彂鐢熼敊璇紒";
+                    return false;
+                }
+                else
+                {
+                    if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
                     {
                         oCn.CnClose();
                         oCn.CnDispose();
                         sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                         return false;
+                    }
+                    else
+                    {
+                        //鍒犻櫎鏉$爜
+                        oCn.RunProc("Delete from Gy_BarCodeBill where HItemID = " + sHItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                        //鍐欏叆绯荤粺鏃ュ織
+                        oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','鍒犻櫎鏉$爜锛�" + sHBarCode + "','WMS绯荤粺-鏉$爜妗f鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','鍒犻櫎'", ref DBUtility.ClsPub.sExeReturnInfo);
+                        oCn.Commit();
+                        return true;
                     }
                 }
             }
@@ -272,41 +309,42 @@
         }
 
         //鎵归噺鍒犻櫎鏉$爜
-        public bool MulDeleteBill(string sHItemID, string sHBarCode, string CurUserName, ref string sReturn)
+        public bool MulDeleteBill(string sHItemID, string sHBarCode, ref string sReturn)
         {
-            //缂栬緫鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, CurUserName))
-            {
-                sReturn = "鎮ㄦ病鏈夊垹闄ゆ潈闄愶紒";
-                return true;
-            }
             try
             {
-                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_MulDelete '" + sHItemID + "','" + sHBarCode + "','" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','" + DBUtility.ClsPub.IPAddress + "'", "h_p_Gy_BarCodeBill_MulDelete", ref DBUtility.ClsPub.sExeReturnInfo);
+                oCn.BeginTran();
+                string[] NewBarCode;
+                NewBarCode = sHBarCode.Split(Convert.ToChar("#"));
+                //鎵归噺鍒犻櫎鏉$爜鍓嶈繘琛屽垽鏂�
+                DataSet DS = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_MulDelete_Before '" + sHItemID + "','" + sHBarCode + "'", "h_p_Gy_BarCodeBill_MulDelete_Before", ref DBUtility.ClsPub.sExeReturnInfo);
                 if (DS == null || DS.Tables[0].Rows.Count <= 0)
                 {
                     oCn.CnClose();
                     oCn.CnDispose();
-                    sReturn = "鎵归噺鍒犻櫎鏉$爜鏃跺彂鐢熼敊璇紒";
-                    return true;
+                    sReturn = "鎵归噺鍒犻櫎鏉$爜鍓嶅垽鏂彂鐢熼敊璇紒";
+                    return false;
                 }
                 else
                 {
-                    //鎵归噺鍒犻櫎澶辫触
                     if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
                     {
                         oCn.CnClose();
                         oCn.CnDispose();
                         sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
-                        return true;
+                        return false;
                     }
                     else
-                    //鎵归噺鍒犻櫎鎴愬姛
                     {
-                        oCn.CnClose();
-                        oCn.CnDispose();
-                        sReturn = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
-                        return false;
+                        //鎵归噺鍒犻櫎鏉$爜
+                        oCn.RunProc("Delete from Gy_BarCodeBill where HItemID in (" + sHItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+                        //鍐欏叆绯荤粺鏃ュ織
+                        for (int i = 0; i <= NewBarCode.Length - 1; i++)
+                        {
+                            oCn.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','鎵归噺鍒犻櫎鏉$爜锛�" + NewBarCode[i] + "','WMS绯荤粺-鏉$爜妗f鍒楄〃妯″潡','" + DBUtility.ClsPub.IPAddress + "','鎵归噺鍒犻櫎'", ref DBUtility.ClsPub.sExeReturnInfo);
+                        }
+                        oCn.Commit();
+                        return true;
                     }
                 }
             }
@@ -316,10 +354,6 @@
                 throw (e);
             }
         }
-
-
-
-
 
         //鏉$爜鐢熸垚妯″潡璋冪敤    鏉$爜鎵撳嵃鍓嶏紝鏉$爜鎵撳嵃娆℃暟鎺у埗锛堟槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟锛�
         public bool Set_CheckPrintQty_SD(Int64 HInterID, long PrintQty, ref string sReturn)
@@ -349,7 +383,7 @@
         }
 
         //鏉$爜妗f鍒楄〃妯″潡璋冪敤    鏉$爜鎵撳嵃鍓嶏紝鏉$爜鎵撳嵃娆℃暟鎺у埗锛堟槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟锛�
-        public bool Set_CheckPrintQty(string sBarCodeItemID,long PrintQty, ref string sReturn)
+        public bool Set_CheckPrintQty(string sBarCodeItemID, long PrintQty, ref string sReturn)
         {
             DataSet DS;
             string sBarCode = "";
@@ -410,12 +444,6 @@
                 throw (e);
             }
         }
-
-
-
-
-
-
 
 
 
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
index f9f460f..28c328d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.cs"
@@ -25,123 +25,33 @@
         public string ModCaption = "鏉$爜妗f鍒楄〃";
         public const string ModName = "3302";
         public const string ModRightName = "Gy_BarCodeBillList";
-        public const string ModRightNameEdit = ModRightName + "_Edit";
-        public const string ModRightNameCheck = ModRightName + "_Check";
-        public const string ModRightNameClose = ModRightName + "_Close";
-        public const string ModRightNameDelete = ModRightName + "_Delete";
+        public const string ModRightNameEdit = ModRightName + "_Edit";      //鍒犻櫎
+        public const string ModRightNameDelete = ModRightName + "_Delete";  //浣滃簾
         public const string ModRightNamePrint = ModRightName + "_Print";    //鎵撳嵃
-        //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
-        //public  Gy_ICBomBill oFrm;
+
+        DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
         SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
         public int selectRow = 0;
         public int selectRow2 = 0;
         public long PrintQty = 0;               //鍏佽鏉$爜鎵撳嵃娆℃暟
         public string PrintQtyCtl = "";         //鏉$爜鎵撳嵃娆℃暟鎺у埗
         public string UpdatePrintQtyCtl = "";   //鏉$爜鎵撳嵃娆℃暟鏇存柊
-        //
-        private void initGrid()
-        {
-            DBUtility.Xt_BaseBillFun.initGridList(grdMain,this.Name);
-        }
-        //
+        public string SourceQtyCtl = "";        //瓒呮簮鍗曟暟閲忔帶鍒�
 
-        private void Display()
-        {
-            ClsCN SubCn = new ClsCN();
-            DataSet DSet;
-            string sSql = "";
-            string sWhere = "";
-            //杩囨护鏉′欢
-            if (frmCondition.SqlStr.Trim().Length == 0)
-                return;
-            sSql = frmCondition.SqlStr + sWhere + " order by 鏉$爜缂栧彿  ";
-            //
-            DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
-            //鐢熸垚棣栬鏍囬
-            if (DSet == null)
-            {
-                MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
-                return;
-            }
-            //
-            grdMain.DataSource = DSet.Tables[0].DefaultView;
-            //鍐荤粨
-            int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
-            string s = frmCondition.cmbHComplete.Text;
-            DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s,FrCol);
-            //鐢荤嚎
-            GraphLine();
-            
-            
-            // 
-        }
+        #region  鍥哄畾浠g爜
 
-        //
-        private void timer1_Tick(object sender, EventArgs e)
-        {
-            timer1.Enabled=false;
-            initGrid();
-            Display();
-        }
-
-        private void tc_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
-        private void sx_Click(object sender, EventArgs e)
-        {
-            timer1.Enabled = true;
-        }
-
-        private void dj_Click(object sender, EventArgs e)
-        {
-            Sub_ShowBill();
-        }
-        //鏄剧ず鍗曟嵁
-        private void Sub_ShowBill()
-        {
-            //Int64 lngBillKey = 0;
-            //if (grdMain.CurrentRow == null)
-            //    return;
-            //lngBillKey =DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
-            //if (lngBillKey == 0)
-            //    return;
-            //DAL.ClsGy_ICBomBill oBill = new DAL.ClsGy_ICBomBill();
-            //if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
-            //{
-            //    oFrm = new Gy_ICBomBill();
-            //    oFrm.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_View;
-            //    oFrm.BillOld = oBill;
-            //    oFrm.ShowDialog();
-            //    if (oFrm.BillChange)
-            //    {
-            //        if (MessageBox.Show("鍗曟嵁鍒楄〃宸茬粡鍙戠敓鍙樺寲,鏄惁鍒锋柊", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
-            //        {
-            //            timer1.Enabled = true;
-            //        }
-            //    }
-            //}
-            //else 
-            //{
-            //    MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
-            //}
-            //oBill = null;
-        }
-        //
-        private Int32 Fun_GetCol(string sCol)
-        {
-            return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
-        }
-        //
         private void Gy_BarCodeBillList_Load(object sender, EventArgs e)
         {
-            //
             frmCondition = new frmBillQueryCondition_New();
             this.Text = ModCaption;
             lblCaption.Text = ModCaption;
             initGrid();
             Sub_GetSystemParameter();
+        }
+
+        private void initGrid()
+        {
+            DBUtility.Xt_BaseBillFun.initGridList(grdMain, this.Name);
         }
 
         //鑾峰彇绯荤粺鍙傛暟淇℃伅
@@ -159,119 +69,14 @@
                 PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
                 PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
                 UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
+                SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
             }
         }
 
-        private void grdMain_DblClick(object sender, EventArgs e)
+        private void timer1_Tick(object sender, EventArgs e)
         {
-            Sub_ShowBill();
-        }
-
-        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();
-            }
-        }
-
-        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)
-        {
-            //
-            //oFrm = new Gy_ICBomBill();
-            //oFrm.ShowDialog();
-        }
-
-        private void sc_Click(object sender, EventArgs e)
-        {
-            Sub_DeleteBill();
-        }
-        //鍒犻櫎
-        private void Sub_DeleteBill()
-        {
-        //    //缂栬緫鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
-            {
-                return;
-            }
-            //
-            //Int64 lngBillKey = 0;
-            //if (grdMain.CurrentRow == null)
-            //    return;
-            //lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
-            //if (lngBillKey == 0)
-            //    return;
-            //DAL.ClsGy_BarCodeBill_View oBill = new DAL.ClsGy_BarCodeBill_View();
-            //DAL.ClsGy_BarCodeBill_Ctl oBillC = new DAL.ClsGy_BarCodeBill_Ctl();
-            //if (oBill.GetInfoByID(lngBillKey))
-            //{
-            //    if (MessageBox.Show("纭畾瑕佸垹闄ゅ綋鍓嶅崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.OK)
-            //    { 
-            //        if (!oBillC.DeleteByID(lngBillKey))
-            //        {
-            //            MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
-            //            return;
-            //        }
-            //        else
-            //        {
-            //            Display();
-            //        }
-
-            //    }
-            //}
-            //else
-            //{
-            //    MessageBox.Show("鍗曟嵁鏈壘鍒�", "鎻愮ず");
-            //}
-
-            Int64 lngBillKey = 0;
-            if (grdMain.CurrentRow == null)
-                return;
-            if (MessageBox.Show("纭畾瑕佸垹闄ゆ墍閫夊崟鎹紵", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
-            {
-                for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
-                {
-                    lngBillKey = DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value);
-                    if (lngBillKey == 0)
-                        return;
-                    DAL.ClsGy_BarCodeBill_View oBill = new DAL.ClsGy_BarCodeBill_View();
-                    DAL.ClsGy_BarCodeBill_Ctl oBillC = new DAL.ClsGy_BarCodeBill_Ctl();
-                    if (oBill.GetInfoByID(lngBillKey))
-                    {
-                        try
-                        {
-                            oBillC.DeleteByID(lngBillKey);
-                        }
-                        catch (Exception ex)
-                        {
-                            MessageBox.Show("鍒犻櫎澶辫触锛屾潯鐮�" + grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value + "宸茶浣跨敤", "鎻愮ず");
-                            Display();
-                            return;
-                        }
-                        if (oBillC.DeleteByID(lngBillKey) != true)
-                        {
-                            MessageBox.Show("鍒犻櫎澶辫触,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        MessageBox.Show("鍗曟嵁鏈壘鍒帮紒", "鎻愮ず");
-                        return;
-                    }
-                }
-            }
-            MessageBox.Show("鍒犻櫎鎴愬姛锛�", "鎻愮ず");
+            timer1.Enabled = false;
+            initGrid();
             Display();
         }
 
@@ -287,124 +92,16 @@
             }
         }
 
- 
-
-        private void bclk_Click(object sender, EventArgs e)
+        public void SetCondition(frmBillQueryCondition_New frmCondition, string ViewName, string Name)
         {
-            //淇濆瓨鍒楀
-            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+            frmCondition.Tag = "";
+            frmCondition.ViewName = ViewName;
+            frmCondition.ModName = Name;
         }
 
-        private void mrlk_Click(object sender, EventArgs e)
+        private void grdMain_Paint(object sender, PaintEventArgs e)
         {
-            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
-        }
-        // 
-        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);
-            //鏄剧ず
-            lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
-            lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
-        }
-        //瀹℃牳
-        private void sh_Click(object sender, EventArgs e)
-        {
-            this.Sub_CheckBill();
-        }
-
-        //瀹℃牳鍗曟嵁
-        private void Sub_CheckBill()
-        {
-            //瀹℃牳鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
-            {
-                return;
-            }
-            //
-            Int64 lngBillKey = 0;
-            if (grdMain.CurrentRow == null)
-                return;
-            lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
-            if (lngBillKey == 0)
-                return;
-            DAL.ClsGy_ICBomBill  oBill = new DAL.ClsGy_ICBomBill();
-            //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
-            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
-            {
-                if (oBill.omodel.HChecker.Trim() != "")
-                {
-                    MessageBox.Show("鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳", "鎻愮ず");
-                    return;
-                }
-            }
-            else
-            {
-                MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
-                return;
-            }
-            //瀹℃牳
-            if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
-            {
-                MessageBox.Show("瀹℃牳鎴愬姛!", "鎻愮ず");
-                return;
-            }
-            else
-            {
-                MessageBox.Show("瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
-                return;
-            }
-        }
-        //鍙嶅鍗曟嵁
-        private void Sub_AbandonCheck()
-        {
-            //瀹℃牳鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true,DBUtility.ClsPub.CurUserName))
-            {
-                return;
-            }
-            //
-            Int64 lngBillKey = 0;
-            if (grdMain.CurrentRow == null)
-                return;
-            lngBillKey = DBUtility.ClsPub.isLong(grdMain.Rows[grdMain.CurrentRow.Index].Cells[Fun_GetCol("hmainid")].Value);
-            if (lngBillKey == 0)
-                return;
-            DAL.ClsGy_ICBomBill  oBill = new DAL.ClsGy_ICBomBill();
-            //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
-            if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
-            {
-                if (oBill.omodel.HChecker.Trim() == "")
-                {
-                    MessageBox.Show("鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!", "鎻愮ず");
-                    return;
-                }
-            }
-            else
-            {
-                MessageBox.Show("鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
-                return;
-            }
-            //鍙嶅鏍�
-            if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
-            {
-                MessageBox.Show("鍙嶅鏍告垚鍔�!", "鎻愮ず");
-                return;
-            }
-            else
-            {
-                MessageBox.Show("鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
-                return;
-            }
-        }
-        //鍙嶅鏍�
-        private void qsh_Click(object sender, EventArgs e)
-        {
-            Sub_AbandonCheck();
+            GraphicsGrid();
         }
 
         private void GraphicsGrid()
@@ -412,7 +109,320 @@
             DBUtility.Xt_BaseBillFun.GraphicsGrid(grdMain);
         }
 
-        #region  //鎵撳嵃璁剧疆
+        private Int32 Fun_GetCol(string sCol)
+        {
+            return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdMain);
+        }
+
+        //淇濆瓨鍒楀
+        private void bclk_Click(object sender, EventArgs e)
+        {
+            //淇濆瓨鍒楀
+            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+        }
+
+        //榛樿鍒楀
+        private void mrlk_Click(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+        }
+
+        #endregion
+
+
+        #region  鏌ヨ鍔熻兘
+
+        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();
+            }
+        }
+
+        private void Display()
+        {
+            ClsCN SubCn = new ClsCN();
+            DataSet DSet;
+            string sSql = "";
+            string sWhere = "";
+            //杩囨护鏉′欢
+            if (frmCondition.SqlStr.Trim().Length == 0)
+                return;
+            sSql = frmCondition.SqlStr + sWhere + " order by HItemID desc  ";
+            //
+            DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+            //鐢熸垚棣栬鏍囬
+            if (DSet == null)
+            {
+                MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,璇峰湪杩囨护妗嗕腑鐐瑰嚮銆愭仮澶嶃�戞寜閽�,灏濊瘯鍐嶆鏌ヨ锛�" + DBUtility.ClsPub.sExeReturnInfo);
+                return;
+            }
+            //
+            grdMain.DataSource = DSet.Tables[0].DefaultView;
+            //鍐荤粨
+            int FrCol = DBUtility.ClsPub.isInt(frmCondition.txtFrozenCol.Text);
+            string s = frmCondition.cmbHComplete.Text;
+            DBUtility.Xt_BaseBillFun.DisplayGrid(grdMain, this.Name, s, FrCol);
+            //鐢荤嚎
+            GraphLine();
+        }
+
+        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);
+            //鏄剧ず
+            lbldj.Text = "鏌ヨ鍑� " + n.ToString() + " 寮犲崟鎹�";
+            lbljl.Text = "鍏辨湁 " + grdMain.RowCount.ToString() + " 鏉¤褰�";
+        }
+
+        #endregion
+
+
+        #region  鍒锋柊鍔熻兘
+
+        private void sx_Click(object sender, EventArgs e)
+        {
+            timer1.Enabled = true;
+        }
+
+        #endregion
+
+
+        #region  鍒犻櫎鍔熻兘
+
+        //鍗曟潯鍒犻櫎
+        private void sc_Click(object sender, EventArgs e)
+        {
+            Sub_DeleteBill();
+        }
+
+        private void Sub_DeleteBill()
+        {
+            //鍒ゆ柇鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+            {
+                return;
+            }
+            if (grdMain.CurrentRow == null)
+            {
+                MessageBox.Show("璇峰厛閫夋嫨闇�瑕佸垹闄ょ殑鏉$爜锛�", "鎻愮ず");
+                return;
+            }
+            if (grdMain.SelectedRows.Count != 1)
+            {
+                MessageBox.Show("涓嶅厑璁稿琛屽垹闄わ紝璇烽噸鏂伴�夋嫨瑕佸垹闄ょ殑鏉$爜锛�");
+                return;
+            }
+            else
+            {
+                if (MessageBox.Show("纭畾瑕佸垹闄ゆ墍閫夋潯鐮侊紵鍒犻櫎鍚庝笉鑳芥仮澶嶏紝璇疯皑鎱庢搷浣滐紒", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+                {
+                    Int64 HItemID = 0;
+                    string HBarCode = "";
+                    HItemID = DBUtility.ClsPub.isLong(grdMain.SelectedRows[0].Cells[Fun_GetCol("hmainid")].Value);
+                    HBarCode = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[0].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+
+                    if (!oBar.DeleteBill(HItemID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
+                    {
+                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+                        return;
+                    }
+                    else
+                    {
+                        MessageBox.Show("鍒犻櫎鎴愬姛锛�", "鎻愮ず");
+                        Display();
+                    }
+                }
+            }
+        }
+
+        //鎵归噺鍒犻櫎
+        private void ps_Click(object sender, EventArgs e)
+        {
+            Sub_MulDeleteBill();
+        }
+
+        private void Sub_MulDeleteBill()
+        {
+            //鍒ゆ柇鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+            {
+                return;
+            }
+            if (grdMain.CurrentRow == null)
+            {
+                MessageBox.Show("璇峰厛閫夋嫨闇�瑕佸垹闄ょ殑鏉$爜锛�", "鎻愮ず");
+                return;
+            }
+            if (grdMain.SelectedRows.Count > 300)
+            {
+                MessageBox.Show("鎵归噺鍒犻櫎鏉$爜閫変腑琛屾暟涓嶈兘瓒呰繃300琛岋紒", "鎻愮ず");
+                return;
+            }
+            else
+            {
+                if (MessageBox.Show("纭畾瑕佹壒閲忓垹闄ゆ墍閫夋潯鐮侊紵鍒犻櫎鍚庝笉鑳芥仮澶嶏紝璇疯皑鎱庢搷浣滐紒", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+                {
+                    string HItemID = "";
+                    string HBarCode = "";
+                    for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+                    {
+                        HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+                        if (i != 0 && i % 100 == 0)
+                        {
+                            HBarCode = HBarCode + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+                        }
+                        else
+                        {
+                            HBarCode = HBarCode + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+                        }
+                    }
+
+                    HItemID = HItemID.Remove(0, 1);     //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+                    HBarCode = HBarCode.Remove(0, 1);
+                    if (!oBar.MulDeleteBill(HItemID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
+                    {
+                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+                        return;
+                    }
+                    else
+                    {
+                        MessageBox.Show("鎵归噺鍒犻櫎鎴愬姛锛�", "鎻愮ず");
+                        Display();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+
+        #region  浣滃簾鍔熻兘
+
+        private void zf_Click(object sender, EventArgs e)
+        {
+            //鍒ゆ柇鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+            {
+                return;
+            }
+            if (grdMain.CurrentRow == null)
+            {
+                MessageBox.Show("璇峰厛閫夋嫨闇�瑕佷綔搴熺殑鏉$爜锛�", "鎻愮ず");
+                return;
+            }
+            else
+            {
+                if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+                {
+                    return;
+                }
+                else
+                {
+                    string HItemID = "";
+                    string HBarCode = "";
+                    for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+                    {
+                        HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+                        if (i != 0 && i % 100 == 0)
+                        {
+                            HBarCode = HBarCode + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+                        }
+                        else
+                        {
+                            HBarCode = HBarCode + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+                        }
+                    }
+
+                    HItemID = HItemID.Remove(0, 1);     //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+                    HBarCode = HBarCode.Remove(0, 1);
+                    if (!oBar.Cancelltion(HItemID, HBarCode, DBUtility.ClsPub.CurUserName))
+                    {
+                        MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
+                        return;
+                    }
+                    else
+                    {
+                        MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
+                        Display();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+
+        #region  鍙嶄綔搴熷姛鑳�
+
+        private void fzf_Click(object sender, EventArgs e)
+        {
+            //鍒ゆ柇鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
+            {
+                return;
+            }
+            if (grdMain.CurrentRow == null)
+            {
+                MessageBox.Show("璇峰厛閫夋嫨闇�瑕佸弽浣滃簾鐨勬潯鐮侊紒", "鎻愮ず");
+                return;
+            }
+            if (grdMain.SelectedRows.Count>300)
+            {
+                MessageBox.Show("鍚屾椂鍙嶄綔搴熸潯鐮侀�変腑琛屾暟涓嶈兘瓒呰繃300琛岋紒", "鎻愮ず");
+                return;
+            }
+            else
+            {
+                if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+                {
+                    return;
+                }
+                else
+                {
+                    string HItemID = "";
+                    string HBarCode = "";
+                    for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
+                    {
+                        HItemID = HItemID + "," + DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("hmainid")].Value.ToString());
+                        if (i != 0 && i % 100 == 0)
+                        {
+                            HBarCode = HBarCode + "#" + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+                        }
+                        else
+                        {
+                            HBarCode = HBarCode + "," + DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+                        }
+                    }
+
+                    HItemID = HItemID.Remove(0, 1);     //鍘绘帀瀛楃涓茬涓�涓瓧绗�
+                    HBarCode = HBarCode.Remove(0, 1);
+                    if (!oBar.UnCancelltion(HItemID, HBarCode, SourceQtyCtl, ref DBUtility.ClsPub.sExeReturnInfo))
+                    {
+                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+                        return;
+                    }
+                    else
+                    {
+                        MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
+                        Display();
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+
+        #region  鎵撳嵃璁剧疆
 
         GridppReport Report;
         int CurRows = 0;
@@ -484,7 +494,7 @@
             }
             sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
 
-            if (PrintQtyCtl=="Y")
+            if (PrintQtyCtl == "Y")
             {
                 if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
                 {
@@ -526,24 +536,11 @@
                 //Report.FieldByName("鐗╂枡浠g爜").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐗╂枡浠g爜")].Value.ToString();
                 //Report.FieldByName("鐗╂枡鍚嶇О").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐗╂枡鍚嶇О")].Value.ToString();
                 //Report.FieldByName("瑙勬牸鍨嬪彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value.ToString();
-                ////Report.FieldByName("鑷畾涔夎鏍�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鑷畾涔夎鏍�")].Value.ToString();
-                //Report.FieldByName("鏉$爜缂栧彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value.ToString();
-                //Report.FieldByName("鏁伴噺").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鏁伴噺")].Value.ToString();
-                //Report.FieldByName("鎵规").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鎵瑰彿")].Value.ToString();
-                //Report.FieldByName("婧愬崟鍗曞彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("婧愬崟鍗曞彿")].Value.ToString();
-                //Report.FieldByName("閿�鍞鍗曞彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("閿�鍞鍗曞彿")].Value.ToString();
-                //Report.FieldByName("閲囪喘璁㈠崟鍙�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("閲囪喘璁㈠崟鍙�")].Value.ToString();
-                //Report.FieldByName("渚涘簲鍟�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("寰�鏉ュ崟浣�")].Value.ToString();
-                //Report.FieldByName("鐢熶骇杞﹂棿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鐢熶骇杞﹂棿")].Value.ToString();
-                //Report.FieldByName("澶囨敞").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("澶囨敞")].Value.ToString();
-                //Report.FieldByName("鎬绘墭鏁�").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鎬绘墭鏁�")].Value.ToString();
-                //Report.FieldByName("鎵樺彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鎵樺彿")].Value.ToString();
             }
             catch (Exception e)
             {
                 MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
             }
-            //CurRows = CurRows + 1;
         }
 
         //濉叆鍗曟嵁琛ㄤ綋淇℃伅
@@ -570,198 +567,39 @@
             }
         }
 
+        #endregion
 
 
-        //杩炴墦
-        private void dy2_Click(object sender, EventArgs e)
+        #region  寮曞嚭鍔熻兘
+
+        private void eXCELToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            //閫夋嫨鎵撳嵃妯℃澘
-            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)
-            {
-                //
-                for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
-                {
-                    selectRow = i;
-                    selectRow2 = i + 1;
-                    Sub_SetReport(oFrm.sOpenTmp);
-                    Report.Print(false);
-                    oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value));
-                    //
-                    if (selectRow2 > grdMain.SelectedRows.Count - 1)
-                    {
-                    }
-                    else
-                    {
-                        oBar.Set_PrintQty(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i + 1].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value));
-                    }
-                    Thread.Sleep(1000);
-                    i++;
-                }
-            }
+            DBUtility.Gy_BaseFun.DataToExcel(this.Text, grdMain);
+        }
+
+        private void cSVToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            DBUtility.Gy_BaseFun.DataGridViewToExcel2(grdMain, this.Text, this.Text);
         }
 
         #endregion
 
 
-        //
-        private void grdMain_Paint(object sender, PaintEventArgs e)
+        #region  閫�鍑哄姛鑳�
+
+        private void tc_Click(object sender, EventArgs e)
         {
-            GraphicsGrid();
+            this.Close();
         }
 
-        private void yc_Click(object sender, EventArgs e)
-        {
-            DataGridViewToExcel2(grdMain, this.Text, this.Text);
-        }
 
-        /// <summary>
-        /// 缃戞牸 瀵煎嚭EXCEL   缃戞牸锛屾枃浠跺悕锛屾爣棰樺悕
-        /// </summary>
-        public static void DataGridViewToExcel2(DataGridView grdMain, string sText, string sBTText)
-        {
-            SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.Filter = "Execl鏂囦欢(*.xls)|*.xls";
-            saveFileDialog.FilterIndex = 0;
-            saveFileDialog.RestoreDirectory = true;
-            saveFileDialog.CreatePrompt = true;
-            saveFileDialog.Title = "鏁版嵁瑙嗗浘瀵煎嚭EXCEL鏂囦欢";
-            saveFileDialog.FileName = sText;
-            //saveFileDialog.ShowDialog();
-            if (saveFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                Stream myStream;
-                myStream = saveFileDialog.OpenFile();
-                StreamWriter sw = new StreamWriter(myStream, System.Text.Encoding.GetEncoding("gb2312"));
-                string str = "";
-                DateTime start = DateTime.Now;
-                try
-                {
-                    if (sBTText != "")
-                    {
-                        sw.WriteLine(sBTText);
-                    }
-                    //鍐欐爣棰�
-                    bool sFirstCol = true;
-                    for (int i = 0; i < grdMain.ColumnCount; i++)
-                    {
-                        if (i > 0 && grdMain.Columns[i].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[i].HeaderText.Substring(0, 1) != "H" && sFirstCol != true)
-                        {
-                            str += "\t";
-                        }
-                        if (grdMain.Columns[i].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[i].HeaderText.Substring(0, 1) != "H")
-                        {
-                            sFirstCol = false;
-                            str += grdMain.Columns[i].HeaderText;
-                        }
-                    }
-                    str = str.Replace("\n", "");
-                    sw.WriteLine(str);
 
-                    //鍐欏唴瀹�
-                    for (int j = 0; j < grdMain.Rows.Count; j++)
-                    {
-                        string tempStr = "";
-                        sFirstCol = true;
-                        for (int k = 0; k < grdMain.Columns.Count; k++)
-                        {
-                            if (k > 0 && grdMain.Columns[k].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[k].HeaderText.Substring(0, 1) != "H" && sFirstCol != true)
-                            {
-                                tempStr += "\t";
-                            }
-                            if (grdMain.Columns[k].HeaderText.Substring(0, 1) != "h" && grdMain.Columns[k].HeaderText.Substring(0, 1) != "H")
-                            {
-                                sFirstCol = false;
-                                if (grdMain.Rows[j].Cells[k].Value == null)
-                                {
-                                    tempStr += string.Empty;
-                                }
-                                else
-                                {
-                                    tempStr += grdMain.Rows[j].Cells[k].Value.ToString();
-                                }
-                            }
-                        }
-                        tempStr = tempStr.Replace("\n", "");
-                        sw.WriteLine(tempStr);
-                    }
-                    sw.Close();
-                    myStream.Close();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show(ex.Message);
-                }
-                finally
-                {
-                    sw.Close();
-                    myStream.Close();
-                }
-                MessageBox.Show("灏嗘宸ヤ綔琛ㄥ鍑轰负excel鍏辫�楁椂锛�" + DateTime.Now.Subtract(start).TotalMilliseconds.ToString() + "姣");
-            }
-        }
 
-        private void zf_Click(object sender, EventArgs e)
-        {
-            //Sub_AbandonCheck();
-            if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
-            {
-                return;
-            }
-            if (grdMain.CurrentRow == null)
-                return;
-            DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
-            if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
-            {
-                return;
-            }
-            for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
-            {
-                if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
-                {
-                    if (!oBar.Cancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value)))
-                    {
-                        MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
-                        return;
-                    }
-                }
-            }
-            MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
-        }
 
-        private void fzf_Click(object sender, EventArgs e)
-        {
-            //this.Sub_CheckBill();
-            if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
-            {
-                return;
-            }
-            if (grdMain.CurrentRow == null)
-                return;
-            DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
-            if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
-            {
-                return;
-            }
-            for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
-            {
-                if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
-                {
-                    if (!oBar.UnCancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value)))
-                    {
-                        MessageBox.Show("鍙嶄綔搴熷け璐ワ紒", "鎻愮ず");
-                        return;
-                    }
-                }
-            }
-            MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
-        }
 
 
+        #endregion
+
 
 
 
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
index 283100a..95a0fd1 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.designer.cs"
@@ -37,23 +37,17 @@
             this.lblCaption = new System.Windows.Forms.Label();
             this.Tool = new System.Windows.Forms.ToolStrip();
             this.dy = new System.Windows.Forms.ToolStripButton();
-            this.dy2 = new System.Windows.Forms.ToolStripButton();
             this.yl = new System.Windows.Forms.ToolStripButton();
-            this.yc = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.cx = new System.Windows.Forms.ToolStripButton();
             this.sx = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.xz = new System.Windows.Forms.ToolStripButton();
-            this.dj = new System.Windows.Forms.ToolStripButton();
             this.sc = new System.Windows.Forms.ToolStripButton();
+            this.ps = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
             this.zf = new System.Windows.Forms.ToolStripButton();
             this.fzf = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-            this.sh = new System.Windows.Forms.ToolStripButton();
-            this.qsh = new System.Windows.Forms.ToolStripButton();
-            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
             this.tc = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
@@ -65,6 +59,9 @@
             this.timer2 = new System.Windows.Forms.Timer(this.components);
             this.grdMain = new System.Windows.Forms.DataGridView();
             this.grdPrint = new System.Windows.Forms.DataGridView();
+            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();
+            this.eXCELToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.cSVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.pPic.SuspendLayout();
             this.panel1.SuspendLayout();
             this.Tool.SuspendLayout();
@@ -132,24 +129,19 @@
             this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
             this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripDropDownButton1,
             this.dy,
-            this.dy2,
             this.yl,
-            this.yc,
             this.toolStripSeparator2,
             this.cx,
             this.sx,
             this.toolStripSeparator1,
-            this.xz,
-            this.dj,
             this.sc,
+            this.ps,
             this.toolStripSeparator5,
             this.zf,
             this.fzf,
             this.toolStripSeparator6,
-            this.sh,
-            this.qsh,
-            this.toolStripSeparator4,
             this.tc,
             this.toolStripSeparator3,
             this.toolStripSeparator9,
@@ -179,21 +171,6 @@
             this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
             this.dy.Click += new System.EventHandler(this.dy_Click);
             // 
-            // dy2
-            // 
-            this.dy2.AutoSize = false;
-            this.dy2.Image = ((System.Drawing.Image)(resources.GetObject("dy2.Image")));
-            this.dy2.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.dy2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.dy2.ImageTransparentColor = System.Drawing.Color.White;
-            this.dy2.Name = "dy2";
-            this.dy2.Size = new System.Drawing.Size(36, 47);
-            this.dy2.Text = "杩炴墦";
-            this.dy2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.dy2.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.dy2.Visible = false;
-            this.dy2.Click += new System.EventHandler(this.dy2_Click);
-            // 
             // yl
             // 
             this.yl.AutoSize = false;
@@ -207,20 +184,6 @@
             this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
             this.yl.Click += new System.EventHandler(this.yl_Click);
-            // 
-            // yc
-            // 
-            this.yc.AutoSize = false;
-            this.yc.Image = ((System.Drawing.Image)(resources.GetObject("yc.Image")));
-            this.yc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.yc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.yc.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.yc.Name = "yc";
-            this.yc.Size = new System.Drawing.Size(36, 47);
-            this.yc.Text = "寮曞嚭";
-            this.yc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.yc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.yc.Click += new System.EventHandler(this.yc_Click);
             // 
             // toolStripSeparator2
             // 
@@ -259,37 +222,6 @@
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
             this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
-            this.toolStripSeparator1.Visible = false;
-            // 
-            // xz
-            // 
-            this.xz.AutoSize = false;
-            this.xz.Image = ((System.Drawing.Image)(resources.GetObject("xz.Image")));
-            this.xz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.xz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.xz.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.xz.Name = "xz";
-            this.xz.Size = new System.Drawing.Size(36, 47);
-            this.xz.Text = "鏂板";
-            this.xz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.xz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.xz.Visible = false;
-            this.xz.Click += new System.EventHandler(this.xz_Click);
-            // 
-            // dj
-            // 
-            this.dj.AutoSize = false;
-            this.dj.Image = ((System.Drawing.Image)(resources.GetObject("dj.Image")));
-            this.dj.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.dj.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.dj.ImageTransparentColor = System.Drawing.Color.White;
-            this.dj.Name = "dj";
-            this.dj.Size = new System.Drawing.Size(36, 47);
-            this.dj.Text = "鍗曟嵁";
-            this.dj.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.dj.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.dj.Visible = false;
-            this.dj.Click += new System.EventHandler(this.dj_Click);
             // 
             // sc
             // 
@@ -304,6 +236,20 @@
             this.sc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.sc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
             this.sc.Click += new System.EventHandler(this.sc_Click);
+            // 
+            // ps
+            // 
+            this.ps.AutoSize = false;
+            this.ps.Image = ((System.Drawing.Image)(resources.GetObject("ps.Image")));
+            this.ps.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.ps.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.ps.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.ps.Name = "ps";
+            this.ps.Size = new System.Drawing.Size(36, 47);
+            this.ps.Text = "鎵瑰垹";
+            this.ps.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.ps.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.ps.Click += new System.EventHandler(this.ps_Click);
             // 
             // toolStripSeparator5
             // 
@@ -342,42 +288,6 @@
             // 
             this.toolStripSeparator6.Name = "toolStripSeparator6";
             this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
-            // 
-            // sh
-            // 
-            this.sh.AutoSize = false;
-            this.sh.Image = ((System.Drawing.Image)(resources.GetObject("sh.Image")));
-            this.sh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.sh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.sh.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.sh.Name = "sh";
-            this.sh.Size = new System.Drawing.Size(36, 47);
-            this.sh.Text = "瀹℃牳";
-            this.sh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.sh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.sh.Visible = false;
-            this.sh.Click += new System.EventHandler(this.sh_Click);
-            // 
-            // qsh
-            // 
-            this.qsh.AutoSize = false;
-            this.qsh.Image = ((System.Drawing.Image)(resources.GetObject("qsh.Image")));
-            this.qsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.qsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-            this.qsh.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.qsh.Name = "qsh";
-            this.qsh.Size = new System.Drawing.Size(36, 47);
-            this.qsh.Text = "鍙嶅";
-            this.qsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-            this.qsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
-            this.qsh.Visible = false;
-            this.qsh.Click += new System.EventHandler(this.qsh_Click);
-            // 
-            // toolStripSeparator4
-            // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
-            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
-            this.toolStripSeparator4.Visible = false;
             // 
             // tc
             // 
@@ -466,7 +376,6 @@
             this.grdMain.RowTemplate.Height = 23;
             this.grdMain.Size = new System.Drawing.Size(906, 428);
             this.grdMain.TabIndex = 19;
-            this.grdMain.DoubleClick += new System.EventHandler(this.grdMain_DblClick);
             this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
             // 
             // grdPrint
@@ -478,6 +387,34 @@
             this.grdPrint.Size = new System.Drawing.Size(25, 24);
             this.grdPrint.TabIndex = 8;
             this.grdPrint.Visible = false;
+            // 
+            // toolStripDropDownButton1
+            // 
+            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.eXCELToolStripMenuItem,
+            this.cSVToolStripMenuItem});
+            this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));
+            this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
+            this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 47);
+            this.toolStripDropDownButton1.Text = "寮曞嚭";
+            this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            // 
+            // eXCELToolStripMenuItem
+            // 
+            this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
+            this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.eXCELToolStripMenuItem.Text = "EXCEL";
+            this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
+            // 
+            // cSVToolStripMenuItem
+            // 
+            this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
+            this.cSVToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.cSVToolStripMenuItem.Text = "CSV";
+            this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
             // 
             // Gy_BarCodeBillList
             // 
@@ -517,10 +454,7 @@
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
         public System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.ToolStripButton sx;
-        private System.Windows.Forms.ToolStripButton dj;
-        private System.Windows.Forms.ToolStripButton xz;
         private System.Windows.Forms.ToolStripButton sc;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
         private System.Windows.Forms.Timer timer2;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
         private System.Windows.Forms.ToolStripButton mrlk;
@@ -528,18 +462,18 @@
         private System.Windows.Forms.ToolStripButton bclk;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
-        private System.Windows.Forms.ToolStripButton sh;
-        private System.Windows.Forms.ToolStripButton qsh;
         private System.Windows.Forms.DataGridView grdMain;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label lbljl;
         private System.Windows.Forms.Label lbldj;
         private System.Windows.Forms.DataGridView grdPrint;
         private System.Windows.Forms.ToolStripButton dy;
-        private System.Windows.Forms.ToolStripButton dy2;
-        private System.Windows.Forms.ToolStripButton yc;
         private System.Windows.Forms.ToolStripButton fzf;
         private System.Windows.Forms.ToolStripButton zf;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+        private System.Windows.Forms.ToolStripButton ps;
+        private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;
+        private System.Windows.Forms.ToolStripMenuItem eXCELToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem cSVToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
index c8c8bf7..b4b5f1e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBillList.resx"
@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         Qk22QAMAAAAAADYAAAAoAAAAFQMAAFoAAAABABgAAAAAAAAAAADDDgAAww4AAAAAAAAAAAAA////////
@@ -3675,7 +3675,7 @@
         //////////////////////////////////////////////////////////////////////8A
 </value>
   </data>
-  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3699,350 +3699,234 @@
         cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
         6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
         x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
-        H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/tCS5QaG90b3Nob3AgMy4wADhCSU0EJQAA
-        AAAAEAAAAAAAAAAAAAAAAAAAAAA4QklNA+0AAAAAABAASAAAAAEAAgBIAAAAAQACOEJJTQQmAAAAAAAO
-        AAAAAAAAAAAAAD+AAAA4QklNBA0AAAAAAAQAAAB4OEJJTQQZAAAAAAAEAAAAHjhCSU0D8wAAAAAACQAA
-        AAAAAAAAAQA4QklNBAoAAAAAAAEAADhCSU0nEAAAAAAACgABAAAAAAAAAAI4QklNA/UAAAAAAEgAL2Zm
-        AAEAbGZmAAYAAAAAAAEAL2ZmAAEAoZmaAAYAAAAAAAEAMgAAAAEAWgAAAAYAAAAAAAEANQAAAAEALQAA
-        AAYAAAAAAAE4QklNA/gAAAAAAHAAAP////////////////////////////8D6AAAAAD/////////////
-        ////////////////A+gAAAAA/////////////////////////////wPoAAAAAP//////////////////
-        //////////8D6AAAOEJJTQQAAAAAAAACAAE4QklNBAIAAAAAAAQAAAAAOEJJTQQIAAAAAAAQAAAAAQAA
-        AkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklNBBoAAAAAAz8AAAAGAAAAAAAAAAAAAABoAAAEAAAA
-        AAVnKmgHmJgALQAxAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAaAAAAAAAAAAA
-        AAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABAAAAABAAAAAAAAbnVsbAAAAAIAAAAGYm91bmRzT2Jq
-        YwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21s
-        b25nAAAAaAAAAABSZ2h0bG9uZwAABAAAAAAGc2xpY2VzVmxMcwAAAAFPYmpjAAAAAQAAAAAABXNsaWNl
-        AAAAEgAAAAdzbGljZUlEbG9uZwAAAAAAAAAHZ3JvdXBJRGxvbmcAAAAAAAAABm9yaWdpbmVudW0AAAAM
-        RVNsaWNlT3JpZ2luAAAADWF1dG9HZW5lcmF0ZWQAAAAAVHlwZWVudW0AAAAKRVNsaWNlVHlwZQAAAABJ
-        bWcgAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRs
-        b25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdodGxvbmcAAAQAAAAAA3VybFRFWFQAAAABAAAAAAAA
-        bnVsbFRFWFQAAAABAAAAAAAATXNnZVRFWFQAAAABAAAAAAAGYWx0VGFnVEVYVAAAAAEAAAAAAA5jZWxs
-        VGV4dElzSFRNTGJvb2wBAAAACGNlbGxUZXh0VEVYVAAAAAEAAAAAAAlob3J6QWxpZ25lbnVtAAAAD0VT
-        bGljZUhvcnpBbGlnbgAAAAdkZWZhdWx0AAAACXZlcnRBbGlnbmVudW0AAAAPRVNsaWNlVmVydEFsaWdu
-        AAAAB2RlZmF1bHQAAAALYmdDb2xvclR5cGVlbnVtAAAAEUVTbGljZUJHQ29sb3JUeXBlAAAAAE5vbmUA
-        AAAJdG9wT3V0c2V0bG9uZwAAAAAAAAAKbGVmdE91dHNldGxvbmcAAAAAAAAADGJvdHRvbU91dHNldGxv
-        bmcAAAAAAAAAC3JpZ2h0T3V0c2V0bG9uZwAAAAAAOEJJTQQRAAAAAAABAQA4QklNBBQAAAAAAAQAAAAC
-        OEJJTQQMAAAAAANsAAAAAQAAAIAAAAANAAABgAAAE4AAAANQABgAAf/Y/+AAEEpGSUYAAQIBAEgASAAA
-        /+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMV
-        ExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4O
-        FBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEB
-        AxEB/90ABAAI/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAAB
-        AAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0
-        coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZm
-        doaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRSh
-        sUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU
-        5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8A
-        mvg/uZn/AG7X/wCSW+kpeLN4/Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1
-        wP8Amvg/uZn/AG7X/wCSS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/bt
-        X/klvpJcWbx+xXDj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1
-        /wDkkv8Amvg/uZn/AG7X/wCSW+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx
-        +xXDj8PtcD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/ZOEJJTQQhAAAAAABV
-        AAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgA
-        bwB0AG8AcwBoAG8AcAAgADcALgAwAAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hEkhodHRwOi8vbnMu
-        YWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0n77u/JyBpZD0nVzVNME1wQ2VoaUh6cmVT
-        ek5UY3prYzlkJz8+DQo8P2Fkb2JlLXhhcC1maWx0ZXJzIGVzYz0iQ1IiPz4NCjx4OnhhcG1ldGEgeG1s
-        bnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eGFwdGs9IlhNUCB0b29sa2l0IDIuOC4yLTMzLCBmcmFtZXdv
-        cmsgMS41Ij4NCgk8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjIt
-        cmRmLXN5bnRheC1ucyMiIHhtbG5zOmlYPSJodHRwOi8vbnMuYWRvYmUuY29tL2lYLzEuMC8iPg0KCQk8
-        cmRmOkRlc2NyaXB0aW9uIGFib3V0PSIiIHhtbG5zOnhhcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hh
-        cC8xLjAvbW0vIj4NCgkJCTx4YXBNTTpEb2N1bWVudElEPmFkb2JlOmRvY2lkOnBob3Rvc2hvcDozOWZj
-        MWM4NC0xZGIyLTExZDktYTU2YS1lOGQ1YmIxNTEyYjU8L3hhcE1NOkRvY3VtZW50SUQ+DQoJCTwvcmRm
-        OkRlc2NyaXB0aW9uPg0KCTwvcmRmOlJERj4NCjwveDp4YXBtZXRhPg0KICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAog
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
-        ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8P3hwYWNrZXQgZW5kPSd3Jz8+/9sAQwACAQECAQEC
-        AgICAgICAgMFAwMDAwMGBAQDBQcGBwcHBgcHCAkLCQgICggHBwoNCgoLDAwMDAcJDg8NDA4LDAwM/9sA
-        QwECAgIDAwMGAwMGDAgHCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM
-        DAwMDAwM/8AAEQgAKgQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//E
-        ALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX
-        GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SV
-        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
+        H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+        BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+        BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+        AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+        BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+        OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+        srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+        AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+        gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+        aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+        1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+        P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+        peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+        puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+        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
-        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
-        /9k=
+        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
+</value>
+  </data>
+  <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+        7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
+        v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
+        QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
+        DbMv/a+ZfOp/edfB/0WNO/7nlm/4n5kPNACbF6aBDfiMMGDpTagBJ8EGFAMNyAMZULAcezQaG6cRhUFe
+        wGkAWBALnjx5MhiD2CAvUGRAVv5yYBgsgMiRZwBSIII0IyskDTP8BwA/9nl6zExBggAAAABJRU5ErkJg
+        gg==
 </value>
   </data>
   <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
-        jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
-        grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
-        FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
-        u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="dy2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
@@ -4063,20 +3947,6 @@
         NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
         BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
         AABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
-        ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
-        e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
-        4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
-        zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
-        RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
-        /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
-        uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
-        GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4105,31 +3975,21 @@
         GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGySURBVDhPhZLNKwRxGMefUlLc5D9wUE5eolyUo5PkomhJ
-        ybZE5D2ippYty7Ic1NgclOLiqhAlym44yF3JuzW7s2tedvcxzzO7jbWDT337PfN7nu935vdrYH51EwXf
-        BgpLor18Is75A+gP7CDYMetdx/9Y9l3wahsy7VnjZiqVshXh9Z7xSuSETLpXuJFIJm1FLC6e85ohK2Rc
-        WOJNTU/Yir5B3DjEptZObGnrxv2DY57PACOzC1woqm4rVdMxaaRIchzfwhLPhioL8bQYuIbBaQ8XcUX7
-        U5njFPWGMF5qmIOIl3UlCAOTbm5E4yrKv0jTLfPWrcw1hZyXAELfmMAbHzEFJRupxj0QBc4gm681xAr/
-        nRXgGp7hgffIJ4aj2VI005zvvMoyg2icvXqTe9AzOMXFq2RcUsSSYlwekee6+dVMQHf/BBfP4Ri+fFgi
-        Vhzwt5no6h3lh8e3KD69yyy6dYIC8KI5x3x0cmb9SB3OId68f5Hw/jXCItisPSCqVxzy/c3kSduNgB4z
-        4CeZgPY6YH2HPGk7QGOLA8trG7C8xhJRVlVvhqTZ3t0z+8YseUw3wBfmDAtHelBh/AAAAABJRU5ErkJg
-        gg==
-</value>
-  </data>
-  <data name="dj.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
-        BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
-        CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
-        tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
-        cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+        iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
+        wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
+        GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
+        gwcDBhOOzp0wW+zoGpmG0bxBE1U2tAX/ocWVjQRY27JDenzClUtC39g8Dk4dcFzf0RuXw+nC+uZOMKCg
+        vI4avgPupUfg4wPWaEb2yVeLOGN5JVX08B3ARcFt+SBbAfnVBMgprKDmUIBOJgeaIr4sgr6avxEgK7+U
+        mkOuIIsgxeEBVsJcGblF1PgTgMZODQuwMj5XenYBNa5a9+CWAZe3bvTo5uhO2Zn/xgmLOwWSKSbg8r4D
+        954XXNxIVNP4IszPVAtIwBrJKWmIjE1AlCoR0aokxMQnYWLGqEAoKIv3+mrGGPsEfOpdAqh7YNYAAAAA
+        SUVORK5CYII=
+</value>
+  </data>
+  <data name="ps.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
@@ -4167,32 +4027,6 @@
         gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
         SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
         8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
-        d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
-        hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
-        M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
-        cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
-        gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
-        SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
-        8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
-        C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
-        TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
-        4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
-        RjjfEubPT+xYiFFjlN6zugecWJq08TevKzWQkoPwiYMgbkzu2dzeO4ztwzNENPYgx3bJSI2IfwA9+QbK
-        GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
-        XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
-        PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -4235,13 +4069,13 @@
         AAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>102, 16</value>
   </metadata>
-  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>191, 16</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>37</value>
   </metadata>
 </root>
\ No newline at end of file
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 759a957..ab43982 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"
@@ -748,62 +748,6 @@
             }
         }
 
-        private void zf_Click(object sender, EventArgs e)
-        {
-            //Sub_AbandonCheck();
-            if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
-            {
-                return;
-            }
-            if (grdMain.CurrentRow == null)
-                return;
-            DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
-            if (MessageBox.Show("纭畾瑕佷綔搴熸墍閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
-            {
-                return;
-            }
-            for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
-            {
-                if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
-                {
-                    if (!oBar.Cancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value)))
-                    {
-                        MessageBox.Show("浣滃簾澶辫触锛�", "鎻愮ず");
-                        return;
-                    }
-                }
-            }
-            MessageBox.Show("浣滃簾鎴愬姛锛�", "鎻愮ず");
-        }
-
-        private void fzf_Click(object sender, EventArgs e)
-        {
-            //this.Sub_CheckBill();
-            if (!ClsPub.Security_Log(ModRightNameDelete, 1, true, DBUtility.ClsPub.CurUserName))
-            {
-                return;
-            }
-            if (grdMain.CurrentRow == null)
-                return;
-            DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
-            if (MessageBox.Show("纭畾瑕佸弽浣滃簾鎵�閫夋潯鐮侊紵", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
-            {
-                return;
-            }
-            for (int i = 0; i <= grdMain.SelectedRows.Count - 1; i++)
-            {
-                if (DBUtility.ClsPub.isLong(grdMain.SelectedRows[i].Cells[Fun_GetCol("HMaterID")].Value) != 0)
-                {
-                    if (!oBar.UnCancelltion(DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[i].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value)))
-                    {
-                        MessageBox.Show("鍙嶄綔搴熷け璐ワ紒", "鎻愮ず");
-                        return;
-                    }
-                }
-            }
-            MessageBox.Show("鍙嶄綔搴熸垚鍔燂紒", "鎻愮ず");
-        }
-
         private void cmdHSaveBill_Click(object sender, EventArgs e)
         {
 
diff --git a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
index 35833b8..7e406a4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BarCodeBillController.cs
@@ -27,10 +27,10 @@
         /// <returns></returns>
         [Route("Gy_BarCodeBillList/Sub_DeleteBill")]
         [HttpGet]
-        public object Sub_DeleteBill(long HInterID, string HBarCode, string CurUserName)
+        public object Sub_DeleteBill(long HInterID, string HBarCode)
         {
             DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
-            if (oBill.DeleteBill(HInterID, HBarCode, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
+            if (oBill.DeleteBill(HInterID, HBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
@@ -55,10 +55,10 @@
         /// <returns></returns>
         [Route("Gy_BarCodeBillList/Sub_MulDeleteBill")]
         [HttpGet]
-        public object Sub_MulDeleteBill(string sInterID, string sBarCode, string CurUserName)
+        public object Sub_MulDeleteBill(string sInterID, string sBarCode)
         {
             DAL.ClsGy_BarCodeBill_Ctl oBill = new DAL.ClsGy_BarCodeBill_Ctl();
-            if (oBill.MulDeleteBill(sInterID, sBarCode, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
+            if (oBill.MulDeleteBill(sInterID, sBarCode, ref DBUtility.ClsPub.sExeReturnInfo))
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;

--
Gitblit v1.9.1