反馈报表优化

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dao/mapper/ReportMapper.xml

@@ -5,14 +5,18 @@
     <select id="queryReport" resultType="org.nl.wms.sch.report.service.dto.ReportDto">
         SELECT
         DISTINCT p.point_code as pointCode,
+        p.point_name as pointName,
+        p.region_code as regionCode,
+        p.region_name as regionName,
+        p.vehicle_code2 as subTray,
+        p.vehicle_code as motherTray,
             m.productDescription,
             m.supplierName
         FROM
             sch_base_point p
                 LEFT JOIN sch_base_material m ON p.vehicle_code2 = m.PalletSN
         WHERE
-            region_code IN ( 'HW', 'HWK' )
-          AND vehicle_code2 IS NOT NULL
+            vehicle_code2 IS NOT NULL
           AND vehicle_code2 != ''
         <if test="query.supplierName  != null">
             and m.supplierName like CONCAT('%', #{query.supplierName}, '%')
@@ -23,6 +27,9 @@
         <if test="query.point_code  != null">
             and p.point_code like  CONCAT('%', #{query.point_code}, '%')
         </if>
+        <if test="query.region_code  != null">
+            and p.region_code = #{query.region_code}
+        </if>
         ORDER BY point_code ASC
     </select>
 

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportDto.java

@@ -8,6 +8,16 @@ import java.io.Serializable;
 public class ReportDto implements Serializable {
     /** 点位编码 */
     private String pointCode;
+    /** 点位名称 */
+    private String pointName;
+    /** 区域编码 */
+    private String regionCode;
+    /** 区域名称 */
+    private String regionName;
+    /** 子托号 */
+    private String subTray;
+    /** 母拖号 */
+    private String motherTray;
     /** 物料名称 */
     private String productDescription;
     /** 供应商名称 */

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/report/service/dto/ReportQuery.java

@@ -22,4 +22,6 @@ public class ReportQuery implements Serializable {
     private String group_bind_material_status;
     //点位编码
     private String point_code;
+
+    private String region_code;
 }