Просмотр исходного кода

配件订单一键出库报错修复

hu 5 месяцев назад
Родитель
Сommit
308928acd1
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      src/custom/restcontroller/webmanage/sale/order/Order.java

+ 4 - 4
src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1796,9 +1796,9 @@ public class Order extends Controller {
         if(accountbalancerows.isNotEmpty()){
             if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO)>0){
                 if(accountbalancerows.get(0).getBigDecimal("discountamount").compareTo(payamount)>0){
-                    dbConnect.runSqlUpdate("update st_stockbill set payamount=0,discountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                    dbConnect.runSqlUpdate("update st_stockbill set payamount=0,paydiscountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
                 }else{
-                    dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount.subtract(accountbalancerows.get(0).getBigDecimal("discountamount"))+",discountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                    dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount.subtract(accountbalancerows.get(0).getBigDecimal("discountamount"))+",paydiscountamount="+accountbalancerows.get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
                 }
             }else{
                 dbConnect.runSqlUpdate("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);
@@ -2039,9 +2039,9 @@ public class Order extends Controller {
                     if(accountbalancerowsMap.containsKey(sys_enterpriseid)){
                         if(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(BigDecimal.ZERO)>0){
                             if(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount").compareTo(payamount)>0){
-                                sqlList.add("update st_stockbill set payamount=0,discountamount="+accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                                sqlList.add("update st_stockbill set payamount=0,paydiscountamount="+accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
                             }else{
-                                sqlList.add("update st_stockbill set payamount="+payamount.subtract(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount"))+",discountamount="+accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
+                                sqlList.add("update st_stockbill set payamount="+payamount.subtract(accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount"))+",paydiscountamount="+accountbalancerowsMap.get(sys_enterpriseid).get(0).getBigDecimal("discountamount")+" where st_stockbillid="+st_stockbillid);
                             }
                         }else{
                             sqlList.add("update st_stockbill set payamount="+payamount+" where st_stockbillid="+st_stockbillid);