|
|
@@ -172,7 +172,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 from sa_paybill where siteid='" + siteid + "' and sa_paybillid=" + sa_paybillid);
|
|
|
+ Rows rows = dbConnect.runSqlQuery("select sys_enterpriseid,status,billno,remarks 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();
|
|
|
@@ -198,7 +198,7 @@ public class Paybill extends Controller {
|
|
|
cashbillEntity.setOwnertable("sa_paybill");
|
|
|
cashbillEntity.setSource("打款凭证");
|
|
|
cashbillEntity.setSourcenote(billno);
|
|
|
- cashbillEntity.setRemarks("");
|
|
|
+ cashbillEntity.setRemarks(rows.get(0).getString("remarks"));
|
|
|
for (Row row : accountclassRows) {
|
|
|
cashbillEntity.setAmount(row.getBigDecimal("amount"));
|
|
|
sqlList.addAll(Accountbalance.createCashbillIncome(this, sys_enterpriseid, row.getLong("sa_accountclassid"), cashbillEntity, false));
|