返利计算相关

code/wnq/nckd-wnq01-wnq-scm/src/main/java/nckd/wnq01/wnq/scm/plugin/form/DiscountBillFormPlugin.java

@@ -73,7 +73,9 @@ public class DiscountBillFormPlugin extends AbstractFormPlugin implements Plugin
         JoinDataSet joinDataSet = planDataSet.join(comDataSet, JoinType.INNER).on("customer", "customer").select(new String[]{"customer", "planQty"}, new String[]{"qty"});
         DataSet qtyDataSet = joinDataSet.finish();
         //客户，实际销量，任务量，完成率
-        DataSet qtyDataSet1 = qtyDataSet.select("customer,qty as actualqty,planqty,case when round(qty / planqty, 2) >= "+completeRate+" then round(qty / planqty, 2) else 0 end as completerate");
+        //DataSet qtyDataSet1 = qtyDataSet.select("customer, qty as actualqty, planqty, case when round(qty / planqty, 2) >= "+completeRate+" then round(qty / planqty, 2) else 0 end as completerate");
+        //Tyx 2025-04-22 完成率大于100%显示100% 其余情况按实际显示
+        DataSet qtyDataSet1 = qtyDataSet.select("customer, qty as actualqty, planqty, case when round(qty / planqty, 2) >= 1 then 1 else round(qty / planqty, 2) end as completerate");
         //取销售单价，返利政策
         //返利政策dataSet
         DataSet policyDataSet_nofilter = util.getPolicyDataSet();