From 029f917a5ee9376ee0d14334a67ebd3f89970323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= Date: Fri, 15 May 2026 14:33:26 +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 --- .../quality/pojo/entity/WorkPlanItem.java | 87 ++----------------- .../pojo/entity/WorkPlanItemDetail.java | 59 ------------- .../impl/HandoverRecordServiceImpl.java | 28 +++--- .../service/impl/WorkOrderServiceImpl.java | 1 + 4 files changed, 24 insertions(+), 151 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java index f8736057c..ac1bffd03 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java @@ -1,6 +1,3 @@ -/** - * Author: Tom Shuo - */ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableName; @@ -9,8 +6,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import java.io.Serial; import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; /** * [工序检验项] 实体类 @@ -23,82 +21,13 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) @Schema(description = "WorkPlanItem Entity对象") public class WorkPlanItem extends BaseEntity { + public static Map checkResultMap = new HashMap<>(3); - @Serial - private static final long serialVersionUID = 1L; - - /** - * [作业计划]id - */ - public static final String COL_WP_ID = "WP_ID"; - /** - * 检验数 - */ - public static final String COL_CHECK_QTY = "CHECK_QTY"; - /** - * 试验数量 - */ - public static final String COL_TEST_QTY = "TEST_QTY"; - /** - * 消耗数量 - */ - public static final String COL_LOSS_QTY = "LOSS_QTY"; - /** - * [检验项目]编码 - */ - public static final String COL_ITEM_CODE = "ITEM_CODE"; - /** - * [检验项目]名称 - */ - public static final String COL_ITEM_NAME = "ITEM_NAME"; - /** - * [质量标准]名称 - */ - public static final String COL_STANDARD_NAME = "STANDARD_NAME"; - /** - * 检验员[用户]id - */ - public static final String COL_CHECK_USER_ID = "CHECK_USER_ID"; - /** - * 检验值 - */ - public static final String COL_CHECK_VALUE = "CHECK_VALUE"; - /** - * 检验日期 - */ - public static final String COL_CHECK_DATE = "CHECK_DATE"; - /** - * 检验结果-[0]:未检验;[1]:合格;[2]:不合格;[-1]:NA - */ - public static final String COL_CHECK_RESULT = "CHECK_RESULT"; - /** - * 工时定额 - */ - public static final String COL_HOUR_QUOTA = "HOUR_QUOTA"; - /** - * 准备工时 - */ - public static final String COL_HOUR_PREPARE = "HOUR_PREPARE"; - /** - * [检验任务]id - */ - public static final String COL_TASK_ID = "TASK_ID"; - /** - * [检验项目]id - */ - public static final String COL_ITEM_ID = "ITEM_ID"; - /** - * [质量标准]id - */ - public static final String COL_STANDARD_ID = "STANDARD_ID"; - /** - * [检验模板]id - */ - public static final String COL_TEMPLATE_ID = "TEMPLATE_ID"; - /** - * 特殊类型-[0]:普通;[1]:测厚;[2]:测硬;[3]:尺寸; - */ - public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE"; + static { + checkResultMap.put(1, "合格"); + checkResultMap.put(2, "不合格"); + checkResultMap.put(-1, "NA"); + } /** * [作业计划]id diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java index cc8c8cf38..4913278c0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java @@ -1,6 +1,3 @@ -/** - * Author: Tom Shuo - */ package org.springblade.desk.quality.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; @@ -25,62 +22,6 @@ import java.io.Serial; @EqualsAndHashCode(callSuper = true) public class WorkPlanItemDetail extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; - - /** - * [工序检验项]id - */ - public static final String COL_WORK_PLAN_ITEM_ID = "WORK_PLAN_ITEM_ID"; - /** - * 测量类型-[1]镀前;[2]:镀后; - */ - public static final String COL_TEST_TYPE = "TEST_TYPE"; - /** - * 尺寸 - */ - public static final String COL_RULE_SIZE = "RULE_SIZE"; - /** - * 量具 - */ - public static final String COL_TOOLS = "TOOLS"; - /** - * 测量值1 - */ - public static final String COL_GAUGE_VALUE1 = "GAUGE_VALUE1"; - /** - * 测量值2 - */ - public static final String COL_GAUGE_VALUE2 = "GAUGE_VALUE2"; - /** - * 测量值3 - */ - public static final String COL_GAUGE_VALUE3 = "GAUGE_VALUE3"; - /** - * 测量值4 - */ - public static final String COL_GAUGE_VALUE4 = "GAUGE_VALUE4"; - /** - * 测量值5 - */ - public static final String COL_GAUGE_VALUE5 = "GAUGE_VALUE5"; - /** - * 测量值6 - */ - public static final String COL_GAUGE_VALUE6 = "GAUGE_VALUE6"; - /** - * 测量值7 - */ - public static final String COL_GAUGE_VALUE7 = "GAUGE_VALUE7"; - /** - * 测量值8 - */ - public static final String COL_GAUGE_VALUE8 = "GAUGE_VALUE8"; - /** - * [量具]id - */ - public static final String COL_MT_ID = "MT_ID"; - /** * [工序检验项]id */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java index 909c73e79..3c7591f40 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/HandoverRecordServiceImpl.java @@ -63,17 +63,19 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl list = new ArrayList<>(); - HandoverRecord hr; PrintWarehousingVO printWarehousing; YieldOrder yo; Double totalWeight; Date date = new Date(); - for (Long i : longList) { - hr = this.getById(i); - // 保存打印时间、更新打印标记 - hr.setPrintTime(date); - hr.setPrintFlag(1); - + List updateList = new ArrayList<>(); + List handoverRecords = baseMapper.selectByIds(longList); + for (HandoverRecord hr : handoverRecords) { + if (hr.getPrintTime() == null && hr.getPrintFlag() == 0) { + // 保存打印时间、更新打印标记 + hr.setPrintTime(date); + hr.setPrintFlag(1); + updateList.add(hr); + } printWarehousing = new PrintWarehousingVO(); printWarehousing.setHrCode(hr.getHrCode()); printWarehousing.setHrType(hr.getHrType()); @@ -112,12 +114,11 @@ public class HandoverRecordServiceImpl extends BaseServiceImpl itemDetail.getWorkPlanItemId().equals(workPlanItem.getId())).toList()); + itemVO.setCheckResult(WorkPlanItem.checkResultMap.get(workPlanItem.getCheckResult())); itemVos.add(itemVO); } planDataVO.setItemList(itemVos);