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

yusijie

2023-11-15 33cfe29fcdd731c3c759dcae74bdcfaeecd309ea

 WebAPI/Controllers/XSGL/Xs_ExceptiveCheckRequestBillController.cs

@@ -48,12 +48,12 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Xs_ExceptiveCheckRequestBillList_Query order by 单据号 ", "h_v_Xs_ExceptiveCheckRequestBillList_Query");
                    ds = oCN.RunProcReturn("select * from h_v_Xs_ExceptiveCheckRequestBillList_Query order by 单据号 desc", "h_v_Xs_ExceptiveCheckRequestBillList_Query");
                }
                else
                {
                    string sql1 = "select * from h_v_Xs_ExceptiveCheckRequestBillList_Query where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 单据号 ";
                    string sql = sql1 + sWhere + " order by 单据号 desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Xs_ExceptiveCheckRequestBillList_Query");
                }

@@ -311,6 +311,8 @@
        {
            try
            {
                string s = "";

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Xs_ExceptiveCheckRequestBill_Drop", 1, false, user))
                {
@@ -327,6 +329,24 @@
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据有误！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //判断是否可编辑
                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据已经被审核，不允许删除！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }

@@ -449,8 +469,15 @@
                if (IsAudit == 0) //审核提交
                {
                    //审核提交
                    //oBill.oCn.BeginTran();
                    if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        //审核源单
                        oCN.BeginTran();
                        string sql = "exec h_p_Xs_ExceptiveCheckRequestBill_ReWriteSourceStatus " + oBill.omodel.HMainSourceInterID + ",'" + oBill.omodel.HMainSourceBillType + "','" + CurUserName + "'";
                        oCN.RunProc(sql);
                        oCN.Commit();
                       
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核成功";
@@ -459,6 +486,7 @@
                    }
                    else
                    {
                        //oBill.oCn = new SQLHelper.ClsCN();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;