Merge branch 'fix-report-zzs'

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

@@ -87,6 +87,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
         String forderno = filter.getString("yem_forderno");
         long fcustom = filter.getLong("yem_fcustom");
         long fresourceno = filter.getLong("yem_fresourceno");
+        long producttype = filter.getLong("yem_bd_producttype");
         QFilter qFilter = getBaseQFilter(new String[]{"B", "C"});
         qFilter.and("yem_signconfirmstatus", "=", "A");//回签确认状态
         if (YEM.isNotEmpty(forderno)) {
@@ -103,6 +104,9 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
             qFilter.and("yem_es_materialinfo.yem_resourcenog.id", "=", fresourceno);
         }
 
+        if (producttype > 0) {
+            qFilter.and("yem_bd_products.id", "=", producttype);
+        }
         ArrayList<String> selectfields = Lists.newArrayList();
         selectfields.add("yem_es_materialinfo.id main_detail_id");
         selectfields.add("id main_id");
@@ -110,6 +114,7 @@ public class CompleteShipDetailReportPlugin extends AbstractReportListDataPlugin
         selectfields.add("yem_customer yem_custom");
         selectfields.add("yem_currency yem_currency");
         selectfields.add("yem_es_materialinfo.yem_productmodel.yem_products.id yem_product");//产品机型
+        selectfields.add("yem_bd_products yem_products");//产品分类
         selectfields.add("yem_priceitem yem_priceitem");//价格条款-交货方式
         selectfields.add("yem_es_materialinfo.yem_sapricepriceclause yem_price");//销售单价（价格条款）-单价
         selectfields.add("yem_es_materialinfo.yem_qty yem_qty");//数量-台数

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

@@ -80,6 +80,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
         long fcustomer = filter.getLong("yem_fcustomer");//客户
         Date forderdateStart = filter.getDate("yem_forderdate_start");
         Date forderdateEnd = filter.getDate("yem_forderdate_end");
+        long producttype = filter.getLong("yem_bd_producttype");//产品分类
 
         StringBuilder sb = new StringBuilder();
         sb.append("yem_businesssort = 'Z' AND dn_status != 'C'");
@@ -101,6 +102,11 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
         if (YEM.isNotEmpty(forderdateEnd)) {
             sb.append(" AND forderdate <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(forderdateEnd)));
         }
+
+        if (producttype > 0) {
+            sb.append(" AND yem_products = ").append(producttype);
+        }
+
         resDataSet = resDataSet.addField("0.0", "yem_inventoryqty");
 
         DataSet where = resDataSet.where(sb.toString());
@@ -140,6 +146,8 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
         selectfields.add("yem_es_materialinfo.yem_businesssort yem_businesssort");
         selectfields.add("createtime");
         selectfields.add("yem_bd_products");//产品分类
+        selectfields.add("yem_bd_products yem_products");//产品分类
+        selectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_currentstate yem_currentstate");//当前状态
 
         return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray())
                 .orderBy(new String[]{"createtime DESC"});
@@ -160,7 +168,26 @@ 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");
 
-        return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
+        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;
+    }
+
+    private DataSet queryOrderProReqBill(ReportQueryParam param) {
+        QFilter qFilter = getBaseQFilter();
+        List<String> selectfields = new ArrayList<>();
+        selectfields.add("TO_CHAR(yem_es_materialinfo.yem_yieldetacdate, 'yyyy-MM-dd') yem_prodfeedbackdate");//预计完成时间
+        selectfields.add("yem_es_materialinfo.yem_sourceentryid order_req_main_detail_fk");
+
+
+        return ORM.create().queryDataSet(algoKey, "yem_orderproreqbill", String.join(",", selectfields), qFilter.toArray());
     }
 
     /**
@@ -212,7 +239,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
         List<String> selectfields = new ArrayList<>();
         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_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);
     }
@@ -344,8 +371,7 @@ public class ITCOrderDetailsReportPlugin extends AbstractReportListDataPlugin {
         for (DynamicObject dynamicObject : collection) {
             String vehicleno = dynamicObject.getString("yem_vehicleno");
             if (YEM.isNotEmpty(vehicleno)) {
-                BigDecimal inventoryqty = dynamicObject.getBigDecimal("yem_inventoryqty");
+                dynamicObject.set("yem_reqqty", new BigDecimal("1"));
-                dynamicObject.set("yem_reqqty", inventoryqty);
             }
         }
 

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

@@ -75,6 +75,12 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
         long resourceno = filter.getLong("yem_resourceno");//资源号
         Date start = filter.getDate("yem_ladingdate_start");//提单日期-开始
         Date end = filter.getDate("yem_ladingdate_end");//提单日期-结束
+
+        Date fshipdate_start = filter.getDate("yem_fshipdate_start");
+        Date fshipdate_end = filter.getDate("yem_fshipdate_end");
+
+        long foperator = filter.getLong("yem_foperator");//
+
         where.append("salesorder_billtype IN ('yem_es_salesorder_nmzj', 'yem_es_salesorder_ZJ') AND salesorder_commissiontype IN ('Z', 'ZP')");
         if (YEM.isNotEmpty(salesorderno)) {
             where.append(" AND yem_contractno LIKE '%").append(salesorderno).append("%'");
@@ -97,6 +103,19 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
         if (YEM.isNotEmpty(end)) {
             where.append(" AND TO_DATE(yem_ladingdatetext,'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(end)));
         }
+
+        if (YEM.isNotEmpty(fshipdate_start)) {
+            where.append(" AND TO_DATE(yem_shipdate,'yyyy-MM-dd') >= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fshipdate_start)));
+        }
+
+        if (YEM.isNotEmpty(fshipdate_end)) {
+            where.append(" AND TO_DATE(yem_shipdate,'yyyy-MM-dd') <= ").append(String.format("TO_DATE('%s','yyyy-MM-dd')", formatDate(fshipdate_end)));
+        }
+
+        if (foperator > 0) {
+            where.append(" AND yem_salesman = ").append(foperator);
+        }
+
         resDataSet = resDataSet.where(where.toString());
 
         return resDataSet;
@@ -131,13 +150,15 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
         selectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_vehicleno yem_vehicleno");//整机编号
         selectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_resourcescode yem_resourcescode");//资源号
         selectfields.add("yem_es_materialinfo.yem_es_salesorder_z.yem_milltype yem_productmodel");//资源号
-        selectfields.add("yem_es_materialinfo.yem_qty yem_qty");//数量
+//        selectfields.add("yem_es_materialinfo.yem_qty yem_qty");//数量
         selectfields.add("yem_currency yem_currency");//结算币别
         selectfields.add("yem_exrate yem_exrate");//汇率
         selectfields.add("createtime");
-
+        selectfields.add("TO_CHAR(yem_bizdate, 'yyyy-MM-dd') yem_shipdate");//业务日期-发货日期
-        return ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", selectfields), qFilter.toArray())
+        DataSet dataSet = ORM.create().queryDataSet(algoKey, "yem_es_delivernotice", String.join(",", selectfields), qFilter.toArray())
                 .orderBy(new String[]{"createtime DESC"});
+        dataSet = dataSet.addField("1.0", "yem_qty");
+        return dataSet;
     }
 
     /**
@@ -168,13 +189,14 @@ public class SalesCommissionReportPlugin extends AbstractReportListDataPlugin {
         selectfields.add("id salesorderid");
         selectfields.add("yem_es_materialinfo.id salesorderenid");
         selectfields.add("yem_reccondition yem_reccondition");//收款条件
-        selectfields.add("yem_es_materialinfo.yem_saamtpriceclause yem_safobamount");//销售金额（价格条款）  整机合计价格
+        selectfields.add("yem_es_materialinfo.yem_safobprice yem_safobamount");//销售FOB单价  整机合计价格
         selectfields.add("yem_es_materialinfo.yem_singlepartgiftmat yem_singlepartgiftmat");//单台配件赠送金额 赠送配件金额
         selectfields.add("yem_es_materialinfo.yem_fobamount yem_companystandamt");//公司标准价
         selectfields.add("CASE WHEN yem_issinosurecon = '1' THEN 'A' ELSE 'B' END yem_iscredit");//是否信保合同
         selectfields.add("yem_billtype.number salesorder_billtype");//单据类型
         selectfields.add("yem_es_materialinfo.yem_commissiontype salesorder_commissiontype");//业务分类
         selectfields.add("yem_offeramount");
+        selectfields.add("yem_operator yem_salesman");//销售员
 
         return ORM.create().queryDataSet(algoKey, "yem_es_salesorder", String.join(",", selectfields), qFilter.toArray());
     }