Merge branch 'refs/heads/fix-report-zzs' into test

src/main/java/com/yem/rf/salescommission/ITCOrderDetailsReportPlugin.java

@@ -171,16 +171,8 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
         selectfields.add("yem_shippingplan_entry.yem_plandetail_entry.id order_plan_detail_id");//跟单任务明细子分录ID
         selectfields.add("yem_shippingplan_entry.yem_plandetail_entry.yem_srcentryid order_detail_id_plan_fk");
 
-        DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
 
-        DataSet proReqBill = queryOrderProReqBill(param);
-
-        dataSet = dataSet.leftJoin(proReqBill)
-                .on("order_plan_id", "order_req_main_detail_fk")
-                .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(proReqBill))
-                .finish();
-
-        return dataSet;
+        return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
     }
 
     private DataSet queryOrderProReqBill(ReportQueryParam param) {
@@ -240,11 +232,22 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
     private DataSet queryTrackTaskConsoleProcEntry(ReportQueryParam param) {
 
         List<String> selectfields = new ArrayList<>();
+        selectfields.add("yem_es_salesorder_r.id task_order_plan_id");
         selectfields.add("yem_es_salesorder_r.yem_entrtyid plan_proc_detail_fk");
         selectfields.add("yem_es_salesorder_r.yem_stockway yem_ifreform");
 //        selectfields.add("TO_CHAR(yem_es_salesorder_r.yem_yieldetacdate, 'yyyy-MM-dd') yem_prodfeedbackdate");//预计完成时间
         selectfields.add("TO_CHAR(yem_es_salesorder_r.yem_yieldfactacdate, 'yyyy-MM-dd') yem_plancompdate");//实际完成时间
-        return ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null);
+
+        DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_tracktaskconsole", String.join(",", selectfields), null);
+
+        DataSet proReqBill = queryOrderProReqBill(param);
+
+        dataSet = dataSet.leftJoin(proReqBill)
+                .on("task_order_plan_id", "order_req_main_detail_fk")
+                .select(RptUtil.getDataSetFiledAlias(dataSet), RptUtil.getDataSetFiledAlias(proReqBill))
+                .finish();
+
+        return dataSet;
     }
 
     /**

src/main/java/com/yem/rf/salescommission/SparepartsNotShippedPlugin.java

@@ -40,6 +40,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
         DataSet selected = resDataSet.select(String.join(",", RptUtil.getDataSetFiledAlias(resDataSet)) +
                 ",(yem_offeramounts-yem_theamountpaid) yem_theamountowed" +
                 ",CASE WHEN  (yem_contractamount = yem_salcontractclaamt)  THEN  paymenttime ELSE null END yem_bizdate");
+        selected =  selected.removeFields("paymenttime");
         FilterInfo filter = reportQueryParam.getFilter();
         String yemContract = filter.getString("yem_billnos");
         DynamicObject yemClient = filter.getDynamicObject("yem_clientname");
@@ -119,11 +120,13 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
     private static DataSet getYemShippingdetails(QFilter qFilter, DataSet yemShippingdetails) {
         List<String> selectfield = new ArrayList<>();
         selectfield.add("yem_receiptdetail.yem_claimdetail.yem_salcontractno.id yem_salcontractnoid");//收款单的合同号id
-        selectfield.add("TO_CHAR(yem_bizdate, 'yyyy-MM-dd') paymenttime");//
+        selectfield.add("yem_bizdate paymenttimes");//
         DataSet yemShippingdetail = ORM.create().queryDataSet(algoKey, "yem_gathering", String.join(",", selectfield), qFilter.toArray());
-        yemShippingdetails = yemShippingdetails.leftJoin(yemShippingdetail)
-                .on("yem_titleid", "yem_salcontractnoid")
-                .select(RptUtil.getDataSetFiledAlias(yemShippingdetails), RptUtil.getDataSetFiledAlias(yemShippingdetail))
+        yemShippingdetail = yemShippingdetail.groupBy(new String[]{"yem_salcontractnoid"}).max("paymenttimes").finish();
+        yemShippingdetail = yemShippingdetail.addField("TO_CHAR(paymenttimes, 'yyyy-MM-dd') paymenttime","paymenttime");
+        yemShippingdetails = yemShippingdetail.leftJoin(yemShippingdetails)
+                .on("yem_salcontractnoid", "yem_titleid")
+                .select(RptUtil.getDataSetFiledAlias(yemShippingdetail), RptUtil.getDataSetFiledAlias(yemShippingdetails))
                 .finish();
         DataSet claimedAmt = queryGathering_ClaimedAmt();
         yemShippingdetails = yemShippingdetails.leftJoin(claimedAmt).on("yem_salcontractnoid","salesorderid")
@@ -214,6 +217,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
         selectfields.add("yem_companyname yem_companyname");
         selectfields.add("yem_bd_products.name yem_bd_products");
         DataSet yemEsSalesorder = ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
+        yemEsSalesorder = yemEsSalesorder.distinct();
         yemEsSalesorder = yemEsSalesorder.select(String.join(",", RptUtil.getDataSetFiledAlias(yemEsSalesorder)) +
                 ",yem_seafreight+yem_landcarrycost+yem_airliftcost+yem_expresscost yem_freight");
         DataSet rightDataSet = yemEsSalesorders();
@@ -227,6 +231,7 @@ public class SparepartsNotShippedPlugin extends AbstractReportListDataPlugin {
                 .select(RptUtil.getDataSetFiledAlias(yemEsSalesorder), RptUtil.getDataSetFiledAlias(yemEsDelivernotice)).finish();
         yemEsSalesorder = yemEsSalesorder.where("billstatus = 'B' OR billstatus = 'C'");
         yemEsSalesorder = yemEsSalesorder.where("delivernoticebillstatus  != 'C'");
+        yemEsSalesorder = yemEsSalesorder.distinct();
         return yemEsSalesorder;
     }