From ced314dd8a2ab29d0edefdce9ef618ba97999d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Sat, 28 Mar 2026 17:15:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PlateAroundController.java | 2 +- .../produce/mapper/PlateAroundMapper.java | 2 +- .../desk/produce/mapper/PlateAroundMapper.xml | 52 +++++++++++++------ .../produce/service/IPlateAroundService.java | 2 +- .../service/impl/PlateAroundServiceImpl.java | 12 ++--- 5 files changed, 46 insertions(+), 24 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java index b115dfa5..999c62e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PlateAroundController.java @@ -69,7 +69,7 @@ public class PlateAroundController extends BladeController { @GetMapping("/getBeforePlatOutCardNo") @ApiOperationSupport(order = 3) @Operation(summary = "扫描流程卡获取镀前出库数据", description = "传入cardNo") - public R getBeforePlatOutCardNo(String cardNo) { + public R getBeforePlatOutCardNo(String cardNo) { return R.data(plateAroundService.getBeforePlatOutCardNo(cardNo)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.java index 5799ec2f..3956780c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.java @@ -21,7 +21,7 @@ public interface PlateAroundMapper extends BaseMapper { BeforePlatInVO getBeforePlatInCardNo(Long id, List tsIds, Long userId); - PlateAround getBeforePlatOutCardNo(Long id, List tsIds, Long userId); + BeforePlatInVO getBeforePlatOutCardNo(Long id, List tsIds, Long userId); WorkPlan getAfterPlatInCardNo(Long id, List tsIds); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml index c56f13bd..2529c5f7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/PlateAroundMapper.xml @@ -95,22 +95,44 @@ and c.run_status = 3 - + SELECT + a.ID AS wpId, + c.WO_CODE AS woCode, + c.BATCH_NO AS batchNo, + c.CARD_NO AS cardNo, + d.TS_NAME AS teamCode, + a.MAKE_TEAM AS teamId, + e.NAME AS processName, + a.ORDERS AS processCode, + a.WORK_QTY AS inQuantity, + d2.TS_NAME as nextTeamCode, + b.ORDERS as nextProcessCode, + e2.NAME as nextProcessName, + b.MAKE_TEAM AS nextTeamId + FROM + MES_PLATE_AROUND pa + INNER JOIN MES_WORK_PLAN a ON pa.WP_ID = a.ID + INNER JOIN MES_WORK_PLAN b ON a.NEXT_WP_ID = b.ID + INNER JOIN MES_WORK_ORDER c ON a.WO_ID = c.ID + LEFT JOIN BS_TEAM_SET d ON a.MAKE_TEAM = d.id + LEFT JOIN BS_PROCESS_SET e ON a.pps_id = e.id + LEFT JOIN BS_TEAM_SET d2 ON b.MAKE_TEAM = d2.id + LEFT JOIN BS_PROCESS_SET e2 ON b.pps_id = e2.id - a.PA_TYPE = 1 AND a.CUR_STATUS = 1 AND (c.MAKE_TEAM in - - #{tsId} - - or c.SUBSIDIARY_TEAM in - - #{tsId} - - or (c.MAKE_TEAM is null and c.OC_ID is null and d.dispatcher is not null and d.dispatcher = #{userId})) - and d.ID = #{id} + pa.PA_TYPE = 1 AND pa.CUR_STATUS = 1 + + AND (c.MAKE_TEAM in + + #{tsId} + + or c.SUBSIDIARY_TEAM in + + #{tsId} + + or (c.MAKE_TEAM is null and c.OC_ID is null and d.dispatcher is not null and d.dispatcher = #{userId})) + + and c.ID = #{id}