diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorPlanDataVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorPlanDataVO.java index 3e99fc04..3532d7c3 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorPlanDataVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/ProduceMonitorPlanDataVO.java @@ -2,6 +2,7 @@ package org.springblade.desk.produce.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springblade.desk.produce.pojo.entity.MesQcProduceRunEntity; import org.springblade.desk.quality.pojo.entity.PlanTest; import java.util.List; @@ -27,6 +28,9 @@ public class ProduceMonitorPlanDataVO { @Schema(description = "报废数量") private Double scrapQty; + @Schema(description = "打印标记类型:1、生产过程") + private Short printType; + @Schema(description = "加工记录") private List mrList; @@ -48,4 +52,7 @@ public class ProduceMonitorPlanDataVO { @Schema(description = "检验项目") private List itemList; + @Schema(name = "生产过程") + private List prList; + } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java index 420a2581..69f154bc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -126,6 +127,11 @@ public class PlanTest extends BaseEntity { */ @Schema(description = "试转[用户]id") private Long testUserId; + + @Schema(description = "试转[用户]姓名") + @TableField(exist = false) + private String testUserName; + /** * 试验员[用户]id */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesQcProduceRunMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesQcProduceRunMapper.java index 6d753935..37843fc0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesQcProduceRunMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MesQcProduceRunMapper.java @@ -28,4 +28,6 @@ public interface MesQcProduceRunMapper extends BaseMapper List listPrByWpIdIndex(Long id, int i, int i1); + + List listPrByWpId(Long wpId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/QcProduceRunMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/QcProduceRunMapper.xml index a36c8fde..76bc9481 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/QcProduceRunMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/QcProduceRunMapper.xml @@ -58,6 +58,9 @@ ORDER BY mtn_code, id + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesQcProduceRunService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesQcProduceRunService.java index 806deb44..41971a5c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesQcProduceRunService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/IMesQcProduceRunService.java @@ -35,4 +35,6 @@ public interface IMesQcProduceRunService extends BaseService listPrByWpIdIndexAndMtnCode(List list, String mtnCode); List listPrByWpIdIndex(Long id, int i, Boolean aTrue); + + List listPrByWpId(Long id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java index 49b72e09..01b49829 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/MesQcProduceRunServiceImpl.java @@ -45,4 +45,9 @@ public class MesQcProduceRunServiceImpl extends BaseServiceImpl listPrByWpId(Long id) { + return baseMapper.listPrByWpId(id); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index 8841c78e..48457647 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -1311,6 +1311,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl planTests = planTestService.list(Wrappers.lambdaQuery(PlanTest.class).eq(PlanTest::getWpId, wpId)); if (CollectionUtils.isNotEmpty(planTests)) { + for (PlanTest planTest : planTests) { + planTest.setTestUserName(UserCache.getUser(planTest.getTestUserId()) != null ? UserCache.getUser(planTest.getTestUserId()).getRealName() : ""); + } planDataVO.setTrialItemList(planTests); } @@ -1333,6 +1336,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl qcProduceRunsList; if (WorkPlan.PRINT_TYPE_PROCESS.equals(workPlan.getPrintType())) { + // 生产过程 + planDataVO.setPrList(qcProduceRunService.listPrByWpId(workPlan.getId())); // 同槽信息 planDataVO.setSlotList(macToolUseService.listSlotInfo(workPlan)); // 过程质量记录