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

yangle

2023-11-27 62c7287e0ca2c548e6ab8c2a2f4e676042ba8519

 WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs

@@ -49,12 +49,12 @@

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

@@ -489,6 +489,17 @@
                }
                if (IsAudit == 1) //反审核提交
                {
                    string sql = "exec h_p_YS_ReceiveBill_AbandonCheckCrediControl " + oBill.omodel.HInterID;
                    ds = oCN.RunProcReturn(sql, "h_p_YS_ReceiveBill_AbandonCheckCrediControl");
                    if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反审核失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    //反审核提交AbandonCheck
                    if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {