|
|
@@ -2698,15 +2698,13 @@ public class Order extends Controller {
|
|
|
}
|
|
|
if (agentrows.isNotEmpty()) {
|
|
|
if (agentrows.get(0).getBoolean("submitautocheck") && !type.equals("配件订单")) {
|
|
|
- Rows orderRows = dbConnect.runSqlQuery("select * from sa_order where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
|
|
|
- Rows orderdetailsRows = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
|
|
|
+// Rows orderRows = dbConnect.runSqlQuery("select * from sa_order where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
|
|
|
+// Rows orderdetailsRows = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
|
|
|
if(amount.compareTo(BigDecimal.ZERO)>0){
|
|
|
- if(orderRows.isEmpty() && orderdetailsRows.isEmpty()){
|
|
|
- if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
|
|
|
- String result = check();
|
|
|
- if(result.contains("成功")){
|
|
|
- dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid="+sa_orderid);
|
|
|
- }
|
|
|
+ if (Accountbalance.judgeBalance(this, pay_enterpriseid, sa_accountclassid, amount)) {
|
|
|
+ String result = check();
|
|
|
+ if(result.contains("成功")){
|
|
|
+ dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid="+sa_orderid);
|
|
|
}
|
|
|
}
|
|
|
}
|