发运明细 报表

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java

@@ -32,6 +32,7 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         StringBuilder dataQueryHql = new StringBuilder();
         StringBuilder countQueryHql = new StringBuilder();
         StringBuilder commonQueryHql = new StringBuilder();
+        StringBuilder orderByHql = new StringBuilder();
 
         dataQueryHql.append("select new ").append(ShippingReportModel.class.getName()).append(" ( ");
 
@@ -117,6 +118,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustCode())) {
             commonQueryHql.append("AND ms.custCode like :custCode ");
         }
+        if (!StringUtils.isEmpty(model.getCustOrganizeCode())) {
+            commonQueryHql.append("AND ms.custOrganizeCode = :custOrganizeCode ");
+        }
         if (!StringUtils.isEmpty(model.getStartScanTimeStart()) && !StringUtils.isEmpty(model.getStartScanTimeEnd())) {
             commonQueryHql.append("AND ms.startScanTime between :startScanTimeStart and :startScanTimeEnd ");
         }
@@ -127,7 +131,10 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
             commonQueryHql.append("AND ms.publishTime between :publishTimeStart and :publishTimeEnd ");
         }
 
-        Query dataQuery = entityManager.createQuery(dataQueryHql.append(commonQueryHql).toString(), ShippingReportModel.class);
+        //按照结束扫描时间倒叙
+        orderByHql.append(" ORDER BY endScanTime DESC ");
+
+        Query dataQuery = entityManager.createQuery(dataQueryHql.append(commonQueryHql).append(orderByHql).toString(), ShippingReportModel.class);
         setQueryParams(dataQuery, model);
         Query countQuery = entityManager.createQuery(countQueryHql.append(commonQueryHql).toString());
         setQueryParams(countQuery, model);
@@ -160,6 +167,9 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
         if (!StringUtils.isEmpty(model.getCustCode())) {
             dataQuery.setParameter("custCode", model.getCustCode() + "%");
         }
+        if (!StringUtils.isEmpty(model.getCustOrganizeCode())) {
+            dataQuery.setParameter("custOrganizeCode", model.getCustOrganizeCode());
+        }
         if (!StringUtils.isEmpty(model.getStartScanTimeStart()) && !StringUtils.isEmpty(model.getStartScanTimeEnd())) {
             dataQuery.setParameter("startScanTimeStart", model.getStartScanTimeStart());
             dataQuery.setParameter("startScanTimeEnd", model.getStartScanTimeEnd());