Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2023-12-29 d0d12fb5d0df58a0b9b3887f737551d17d5aeac8

 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;