Browse Source

价格系数管理,默认系数错误及订单提交增加自动审核判断

hu 6 tháng trước cách đây
mục cha
commit
ff9b34a8be

+ 2 - 2
src/custom/restcontroller/webmanage/sale/item/quarterpricenum.java

@@ -156,7 +156,7 @@ public class quarterpricenum extends Controller {
                         updateSQL.setUniqueid(row.getLong("sa_quarterpricenumid")).setSiteid(siteid);
                         updateSQL.setUniqueid(row.getLong("sa_quarterpricenumid")).setSiteid(siteid);
                         updateSQL.setValue("ischeck", true);
                         updateSQL.setValue("ischeck", true);
                         updateSQL.setValue("isright", false);
                         updateSQL.setValue("isright", false);
-                        updateSQL.setValue("result", "原有系数:" +  agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate")+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
+                        updateSQL.setValue("result", "原有系数:" +  (agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO)==0?1:agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate"))+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
                         updateSQL.setValue("status", "已检验");
                         updateSQL.setValue("status", "已检验");
                         updateSQL.setDateValue("changedate");
                         updateSQL.setDateValue("changedate");
                         updateSQL.setDateValue("operatedate");
                         updateSQL.setDateValue("operatedate");
@@ -167,7 +167,7 @@ public class quarterpricenum extends Controller {
                         updateSQL.setUniqueid(row.getLong("sa_quarterpricenumid")).setSiteid(siteid);
                         updateSQL.setUniqueid(row.getLong("sa_quarterpricenumid")).setSiteid(siteid);
                         updateSQL.setValue("ischeck", true);
                         updateSQL.setValue("ischeck", true);
                         updateSQL.setValue("isright", true);
                         updateSQL.setValue("isright", true);
-                        updateSQL.setValue("result", "原有系数:" +  agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate")+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
+                        updateSQL.setValue("result", "原有系数:" +  (agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO)==0?1:agentRowsMap.get(row.getString("sa_agentsid")).get(0).getBigDecimal("pricerate"))+ " , 待导入系数:" + row.getBigDecimal("pricerate"));
                         updateSQL.setValue("status", "已检验");
                         updateSQL.setValue("status", "已检验");
                         updateSQL.setDateValue("changedate");
                         updateSQL.setDateValue("changedate");
                         updateSQL.setDateValue("operatedate");
                         updateSQL.setDateValue("operatedate");

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

@@ -1912,6 +1912,13 @@ public class Order extends Controller {
         for (Long sa_cashbillid : sa_cashbillidList) {
         for (Long sa_cashbillid : sa_cashbillidList) {
             Accountbalance.remindSend(this, pay_enterpriseid, sa_cashbillid);
             Accountbalance.remindSend(this, pay_enterpriseid, sa_cashbillid);
         }
         }
+        Rows agentrows = dbConnect.runSqlQuery("select submitautocheck fom sa_agents where sys_enterpriseid="+sys_enterpriseid);
+        if(agentrows.isNotEmpty()){
+            if(agentrows.get(0).getBoolean("submitautocheck")){
+                check();
+            }
+        }
+
         return getSucReturnObject().toString();
         return getSucReturnObject().toString();
     }
     }