hu 6 месяцев назад
Родитель
Сommit
894e607afa
1 измененных файлов с 9 добавлено и 6 удалено
  1. 9 6
      src/custom/restcontroller/webmanage/sale/stockbill/stockbill.java

+ 9 - 6
src/custom/restcontroller/webmanage/sale/stockbill/stockbill.java

@@ -154,18 +154,21 @@ public class stockbill extends Controller {
                     updateSQL.setValue("invoice_taxno", content.getStringValue("invoice_taxno"));
                     updateSQL.setValue("tracknumber", tracknumber);
                     updateSQL.setValue("isconfirm", isconfirm);
-                    updateSQL.setValue("payamount", content.getBigDecimal("payamount"));
-                    updateSQL.setValue("paydiscountamount", content.getBigDecimal("paydiscountamount"));
+                    if(type.equals("销售出库")){
+                        updateSQL.setValue("payamount", content.getBigDecimal("payamount"));
+                        updateSQL.setValue("paydiscountamount", content.getBigDecimal("paydiscountamount"));
+                        if(content.getBigDecimal("payamount").compareTo(rows.get(0).getBigDecimal("payamount"))!=0
+                                || content.getBigDecimal("paydiscountamount").compareTo(rows.get(0).getBigDecimal("paydiscountamount"))!=0){
+                            sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "金额更新变更", "销售出库单更支付金额:"+content.getBigDecimal("payamount")+",优惠金额:"+content.getBigDecimal("paydiscountamount")).getSQL());
+                        }
+                    }
+
                     updateSQL.setValue("period", content.getStringValue("period"));
 
                     updateSQL.setValue("changeby", username);
                     updateSQL.setDateValue("changedate");
                     sqlList.add(updateSQL.getSQL());
 
-                    if(content.getBigDecimal("payamount").compareTo(rows.get(0).getBigDecimal("payamount"))!=0
-                            || content.getBigDecimal("paydiscountamount").compareTo(rows.get(0).getBigDecimal("paydiscountamount"))!=0){
-                        sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "金额更新变更", "销售出库单更支付金额:"+content.getBigDecimal("payamount")+",优惠金额:"+content.getBigDecimal("paydiscountamount")).getSQL());
-                    }
 
                     sqlList.add(DataContrlLog.createLog(this, "st_stockbill", st_stockbillid, "更新", "销售出库单更新成功").getSQL());
                 } else {