配套信息统计数据，新加配套开始，结束时间

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java

@@ -16,4 +16,14 @@ public class AllocationMessPageDTO extends AllocationMessVO {
     private Integer current;
 
     private Integer size;
+
+    /**
+     * 配套开始时间
+     */
+    private String subpkdateStart;
+
+    /**
+     * 配套结束时间
+     */
+    private String subpkdateEnd;
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java

@@ -312,7 +312,7 @@ public class PlanTestController extends BladeController {
 
 	@PostMapping(value = "/queryAllocationMess")
 	@ApiOperationSupport(order = 1)
-	@Operation(summary = "加载配套信息", description = "filterContext 查询参数")
+	@Operation(summary = "加载配套信息详情", description = "filterContext 查询参数")
 	public R<Map<String,Object>> queryAllocationMess(@RequestBody AllocationMessPageDTO allocationMessPageDTO) {
 		return R.data(workOrderService.queryAllocationMess(allocationMessPageDTO));
 	}

blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml

@@ -47,8 +47,11 @@
             <if test="dto.planner1 != null and dto.planner1 != ''">
                 AND a.planner1 = #{dto.planner1}
             </if>
-            <if test="dto.subpkdate != null and dto.subpkdate != ''">
-                AND a.subpkdate = #{dto.subpkdate}
+            <if test="dto.subpkdateStart != null and dto.subpkdateStart != ''">
+                AND a.subpkdate &gt;= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD')
+            </if>
+            <if test="dto.subpkdateEnd != null and dto.subpkdateEnd != ''">
+                AND a.subpkdate &lt; TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1
             </if>
             <if test="dto.warctlr != null and dto.warctlr != ''">
                 AND a.warctlr = #{dto.warctlr}
@@ -117,8 +120,11 @@
             <if test="dto.planner1 != null and dto.planner1 != ''">
                 AND a.planner1 = #{dto.planner1}
             </if>
-            <if test="dto.subpkdate != null and dto.subpkdate != ''">
-                AND a.subpkdate = #{dto.subpkdate}
+            <if test="dto.subpkdateStart != null and dto.subpkdateStart != ''">
+                AND a.subpkdate &gt;= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD')
+            </if>
+            <if test="dto.subpkdateEnd != null and dto.subpkdateEnd != ''">
+                AND a.subpkdate &lt; TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1
             </if>
             <if test="dto.warctlr != null and dto.warctlr != ''">
                 AND a.warctlr = #{dto.warctlr}
@@ -142,6 +148,27 @@
         SELECT * FROM (
         SELECT t.*, ROWNUM no FROM (
         SELECT
+        d.pkno,
+        d.prntno,
+        d.mtltmrk,
+        d.prtlotno,
+        d.pkreqdat,
+        d.fj_splcode,
+        s.fjpkavqty,
+        d.serialno,
+        d.prtmdept,
+        d.plnsign,
+        d.mono,
+        d.schemer,
+        d.planner1,
+        d.subpkdate,
+        d.warctlr,
+        d.barcodeno,
+        d.plandept,
+        d.remark,
+        d.prtclass
+        FROM (
+        SELECT
         a.prtmdept,
         a.subpkdate,
         SUM(NVL(a.fj_pkavqty, 0)) AS fjpkavqty
@@ -186,8 +213,11 @@
             <if test="dto.planner1 != null and dto.planner1 != ''">
                 AND a.planner1 = #{dto.planner1}
             </if>
-            <if test="dto.subpkdate != null and dto.subpkdate != ''">
-                AND a.subpkdate = #{dto.subpkdate}
+            <if test="dto.subpkdateStart != null and dto.subpkdateStart != ''">
+                AND a.subpkdate &gt;= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD')
+            </if>
+            <if test="dto.subpkdateEnd != null and dto.subpkdateEnd != ''">
+                AND a.subpkdate &lt; TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1
             </if>
             <if test="dto.warctlr != null and dto.warctlr != ''">
                 AND a.warctlr = #{dto.warctlr}
@@ -206,7 +236,17 @@
             </if>
         </where>
         GROUP BY a.prtmdept, a.subpkdate
-        ORDER BY a.subpkdate DESC, a.prtmdept DESC
+        ) s
+        LEFT JOIN dba_mgr.v_mes_rb_pkpqry d
+        ON d.prtmdept = s.prtmdept
+        AND d.subpkdate = s.subpkdate
+        AND d.rowid = (
+        SELECT MIN(x.rowid)
+        FROM dba_mgr.v_mes_rb_pkpqry x
+        WHERE x.prtmdept = s.prtmdept
+        AND x.subpkdate = s.subpkdate
+        )
+        ORDER BY s.subpkdate DESC, s.prtmdept DESC
         ) t
         WHERE ROWNUM &lt;= #{dto.current} * #{dto.size}
         )
@@ -258,8 +298,11 @@
             <if test="dto.planner1 != null and dto.planner1 != ''">
                 AND a.planner1 = #{dto.planner1}
             </if>
-            <if test="dto.subpkdate != null and dto.subpkdate != ''">
-                AND a.subpkdate = #{dto.subpkdate}
+            <if test="dto.subpkdateStart != null and dto.subpkdateStart != ''">
+                AND a.subpkdate &gt;= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD')
+            </if>
+            <if test="dto.subpkdateEnd != null and dto.subpkdateEnd != ''">
+                AND a.subpkdate &lt; TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1
             </if>
             <if test="dto.warctlr != null and dto.warctlr != ''">
                 AND a.warctlr = #{dto.warctlr}