diff --git a/src/main/java/com/yem/rf/salescommission/ShipmentsChedulePlugin.java b/src/main/java/com/yem/rf/salescommission/ShipmentsChedulePlugin.java index 311cb511..b2c85077 100644 --- a/src/main/java/com/yem/rf/salescommission/ShipmentsChedulePlugin.java +++ b/src/main/java/com/yem/rf/salescommission/ShipmentsChedulePlugin.java @@ -83,6 +83,8 @@ public class ShipmentsChedulePlugin extends AbstractReportListDataPlugin { sb.append(" AND yem_shipment like '").append("%").append(yemShipping).append("%").append("'"); } DataSet where = selected.where(sb.toString()); + where = where.removeFields("delivernoticeid"); + where = where.distinct(); return where; } @@ -259,7 +261,7 @@ public class ShipmentsChedulePlugin extends AbstractReportListDataPlugin { QFilter qFilter = getBaseQFilter(); List selectfields = new ArrayList<>(); selectfields.add("id delivernoticeid"); - selectfields.add("yem_bizdate yem_annual");//发货日期 + selectfields.add("YEAR(yem_bizdate) yem_annuals");//发货日期 selectfields.add("yem_sourcebillid delivernoticeyem_sourcebillid"); DataSet yemShippingdetails = ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", selectfields), qFilter.toArray()); return yemShippingdetails;