From 4049012f95a4486d6726aa69266bf571f31e4cc8 Mon Sep 17 00:00:00 2001 From: ShiJiuZhou <15315423958@163.com> Date: Fri, 24 Apr 2026 18:15:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E5=A5=97=E4=BF=A1=E6=81=AF=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=96=B0=E5=8A=A0=E9=85=8D?= =?UTF-8?q?=E5=A5=97=E5=BC=80=E5=A7=8B=EF=BC=8C=E7=BB=93=E6=9D=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/AllocationMessPageDTO.java | 10 +++ .../controller/PlanTestController.java | 2 +- .../erpdata/mapper/ErpDataLogisticsMapper.xml | 61 ++++++++++++++++--- 3 files changed, 63 insertions(+), 10 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java index 51a454ca..d8ab8a75 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/dto/AllocationMessPageDTO.java +++ b/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; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index 8bff6dde..101252ca 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/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> queryAllocationMess(@RequestBody AllocationMessPageDTO allocationMessPageDTO) { return R.data(workOrderService.queryAllocationMess(allocationMessPageDTO)); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml index 7bba949d..f3ab3639 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/mapper/ErpDataLogisticsMapper.xml @@ -47,8 +47,11 @@ AND a.planner1 = #{dto.planner1} - - AND a.subpkdate = #{dto.subpkdate} + + AND a.subpkdate >= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD') + + + AND a.subpkdate < TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1 AND a.warctlr = #{dto.warctlr} @@ -117,8 +120,11 @@ AND a.planner1 = #{dto.planner1} - - AND a.subpkdate = #{dto.subpkdate} + + AND a.subpkdate >= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD') + + + AND a.subpkdate < TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1 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 @@ AND a.planner1 = #{dto.planner1} - - AND a.subpkdate = #{dto.subpkdate} + + AND a.subpkdate >= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD') + + + AND a.subpkdate < TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1 AND a.warctlr = #{dto.warctlr} @@ -206,7 +236,17 @@ 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 <= #{dto.current} * #{dto.size} ) @@ -258,8 +298,11 @@ AND a.planner1 = #{dto.planner1} - - AND a.subpkdate = #{dto.subpkdate} + + AND a.subpkdate >= TO_DATE(#{dto.subpkdateStart}, 'YYYY-MM-DD') + + + AND a.subpkdate < TO_DATE(#{dto.subpkdateEnd}, 'YYYY-MM-DD') + 1 AND a.warctlr = #{dto.warctlr}