|
|
@@ -174,7 +174,7 @@ public class Paybill extends Controller {
|
|
|
public String check() throws YosException {
|
|
|
ArrayList<String> sqlList = new ArrayList<>();
|
|
|
Long sa_paybillid = content.getLong("sa_paybillid");
|
|
|
- Rows rows = dbConnect.runSqlQuery("select sys_enterpriseid,status,billno,remarks from sa_paybill where siteid='" + siteid + "' and sa_paybillid=" + sa_paybillid);
|
|
|
+ Rows rows = dbConnect.runSqlQuery("select sys_enterpriseid,status,billno,remarks,payer from sa_paybill where siteid='" + siteid + "' and sa_paybillid=" + sa_paybillid);
|
|
|
Rows accountclassRows = dbConnect.runSqlQuery("select sa_accountclassid,amount from sa_paybilldetail where siteid='" + siteid + "' and amount>0 and sa_paybillid=" + sa_paybillid);
|
|
|
if (rows.isEmpty()) {
|
|
|
return getErrReturnObject().setErrMsg("未选择打款凭证").toString();
|
|
|
@@ -195,7 +195,7 @@ public class Paybill extends Controller {
|
|
|
sqlList.add(DataContrlLog.createLog(this, "sa_paybill", sa_paybillid, "审核", "打款凭证审核").getSQL());
|
|
|
long sys_enterpriseid = rows.get(0).getLong("sys_enterpriseid");
|
|
|
String billno = rows.get(0).getString("billno");
|
|
|
- String remarks = rows.get(0).getString("remarks");
|
|
|
+ String remarks = rows.get(0).getString("remarks")+";付款人:"+rows.get(0).getString("payer");
|
|
|
for (Row row : accountclassRows) {
|
|
|
BigDecimal amount = row.getBigDecimal("amount");
|
|
|
CashbillEntity cashbillEntity = new CashbillEntity(amount, remarks, "打款凭证", billno, "sa_paybill", sa_paybillid,"货款","");
|