MES-WEB-API.git

			@@ -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)
			{
			@@ -802,7 +813,7 @@
			}
			#endregion

			#region 收款单根据客户获取币别、汇率、结算方式、银行、银行账户
			#region 收款单根据客户获取币别、汇率、结算方式、银行、银行账户、客户信用额度
			[Route("YS_ReceiveBill/getCustomerByCusID")]
			[HttpGet]
			public object getCustomerByCusID(long HCusID)
			@@ -822,10 +833,12 @@
			,ISNULL(b.HItemID,0) HBankID
			,b.HName HBankName
			,c.HBankAccount
			,ISNULL(cre.HCreditRating_Now,0) HCreditRating_Now
			from Gy_Customer as c
			left join Gy_SettleStyle as s on c.HSSID = s.HItemID
			left join Gy_Currency as cur on c.HCurID = cur.HItemID
			left join Gy_Bank as b on c.HBank = b.HName
			left join Gy_Customer_Credit as cre on c.HItemID = cre.HCusID
			where c.HItemID = " + HCusID;
			ds = oCN.RunProcReturn(sql, "Gy_Customer");