From 9691f304bc9e9a5af4424f36e7aaf17257bb9aeb Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Thu, 20 Mar 2025 14:18:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=201.=E5=8F=91=E8=BF=90=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E8=A1=A8=EF=BC=88=E5=8D=95=E8=AF=81=EF=BC=89=09?=
 =?UTF-8?q?=E4=B8=80=E6=A8=A1=E4=B8=80=E6=A0=B7=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=B8=A4=E6=9D=A1=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yem/rf/salescommission/ShipmentsChedulePlugin.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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<String> 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;