From 5676cabb58885fcbe9140f9dd9484476f34722e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Sat, 28 Mar 2026 18:04: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 --- .../desk/produce/pojo/vo/AfterPlateInVO.java | 59 ++++++++++++++++--- .../produce/mapper/PlateAroundMapper.java | 3 +- .../desk/produce/mapper/PlateAroundMapper.xml | 32 ++++++++-- .../service/impl/PlateAroundServiceImpl.java | 18 ++---- 4 files changed, 87 insertions(+), 25 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AfterPlateInVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AfterPlateInVO.java index 0cc992c7..f5ebdb13 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AfterPlateInVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/AfterPlateInVO.java @@ -2,21 +2,66 @@ package org.springblade.desk.produce.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.springblade.desk.produce.pojo.entity.WorkPlan; - -import java.util.Date; /** * 镀前镀后 视图实体类 * * @author litao */ -@EqualsAndHashCode(callSuper = true) @Data -public class AfterPlateInVO extends WorkPlan { +public class AfterPlateInVO { - @Schema(description = "0-转工 1-入库") + @Schema(description = "移交类型：0-转工 1-入库") private Integer hrTypeBool; + @Schema(description = "转交部门") + private String useDept; + + @Schema(description = "下级B号") + private String roamNoNext; + + @Schema(description = "流转编号") + private String roamNo; + + @Schema(description = "作业计划id") + private Long wpId; + + @Schema(description = "车间订单ID") + private Long woId; + + @Schema(description = "车间订单号") + private String woCode; + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "流程卡号") + private String cardNo; + + @Schema(description = "入库班组/供应商id") + private Long teamId; + + @Schema(description = "入库班组/供应商") + private String teamCode; + + @Schema(description = "入库工序号") + private String processCode; + + @Schema(description = "入库工序名称") + private String processName; + + @Schema(description = "上序号") + private String nextProcessCode; + + @Schema(description = "上序名称") + private String nextProcessName; + + @Schema(description = "上序班组/供应商id") + private String nextTeamCode; + + @Schema(description = "上序班组/供应商") + private Long nextTeamId; + + @Schema(description = "入库数量") + private String inQuantity; } 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 3956780c..604fc97c 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.produce.pojo.dto.PlateAroundDto; import org.springblade.desk.produce.pojo.entity.PlateAround; import org.springblade.desk.produce.pojo.entity.WorkPlan; +import org.springblade.desk.produce.pojo.vo.AfterPlateInVO; import org.springblade.desk.produce.pojo.vo.BeforePlatInVO; import org.springblade.desk.produce.pojo.vo.PlateAroundVO; @@ -23,7 +24,7 @@ public interface PlateAroundMapper extends BaseMapper { BeforePlatInVO getBeforePlatOutCardNo(Long id, List tsIds, Long userId); - WorkPlan getAfterPlatInCardNo(Long id, List tsIds); + AfterPlateInVO getAfterPlatInCardNo(Long id, List tsIds); List listByWoCardNo(String cardNo); } 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 a54c7821..1ae8e974 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 @@ -135,13 +135,37 @@ and c.ID = #{id} - + SELECT + yo.USE_DEPT AS useDept, + yo.ROAM_NO AS roamNo, + yo.ROAM_NO_NEXT AS roamNoNext, + a.id AS wpId, + c.id AS woId, + c.wo_code AS woCode, + c.BATCH_NO AS batchNo, + c.CARD_NO AS cardNo, + c.MAKE_QTY AS inQuantity, + a.MAKE_TEAM AS teamId, + ts.TS_NAME AS teamCode, + a.ORDERS AS processCode, + ps.NAME AS processName, + b.MAKE_TEAM AS nextTeamId, + ts2.TS_NAME AS nextTeamCode, + b.ORDERS AS nextProcessCode, + ps2.NAME AS nextProcessName + FROM + MES_WORK_PLAN a + INNER JOIN MES_WORK_PLAN b ON a.FRONT_WP_ID = b.ID INNER JOIN MES_WORK_ORDER c ON a.WO_ID = c.ID + INNER JOIN MES_YIELD_ORDER yo ON c.YO_ID = yo.ID LEFT JOIN MES_PLATE_AROUND d ON a.ID = d.WP_ID + LEFT JOIN BS_TEAM_SET ts ON a.MAKE_TEAM = ts.id + LEFT JOIN BS_PROCESS_SET ps ON a.pps_id = ps.id + LEFT JOIN BS_TEAM_SET ts2 ON b.MAKE_TEAM = ts2.id + LEFT JOIN BS_PROCESS_SET ps2 ON b.pps_id = ps2.id - where a.STATUS = 2 and c.ID = #{id} and a.next_wp_id is null and a.make_team in + a.STATUS = 2 and c.ID = #{id} and a.next_wp_id is null and a.make_team in #{tsId} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java index 84558bb8..7d47e97e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java @@ -122,15 +122,13 @@ public class PlateAroundServiceImpl extends BaseServiceImpl 0) { throw new ServiceException("此订单已存在镀后入库记录！"); } @@ -275,7 +267,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl