From f44bbf24f04183d66c104ba4efa3049eb715df64 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 10 Aug 2026 14:30:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B4=E7=9A=AE=E6=8E=92=E5=8D=95=20?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E7=BB=84id=E5=92=8C=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=90=BD=E5=BA=93=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/veneer/vo/VeneerPlanCreateReqVO.java | 10 ++++++++++ .../executor/service/veneer/VeneerPlanServiceImpl.java | 2 ++ .../main/resources/message_errorcode_cht.properties | 2 ++ .../src/main/resources/message_errorcode_en.properties | 2 ++ .../src/main/resources/message_errorcode_zh.properties | 2 ++ 5 files changed, 18 insertions(+) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanCreateReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanCreateReqVO.java index 5b8f14648..be9edca52 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanCreateReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanCreateReqVO.java @@ -3,6 +3,8 @@ package com.cf.imes.module.executor.controller.admin.veneer.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.List; /** @@ -11,6 +13,14 @@ import java.util.List; @Data public class VeneerPlanCreateReqVO { + @Schema(description = "加工方案组名称", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{veneer.plan.process.name.required}") + private String processName; + + @Schema(description = "当前加工方案组ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{veneer.plan.process.id.required}") + private Long processId; + @Schema(description = "按贴皮商品编号整理的排单分组列表；每个分组生成一个贴皮排单", requiredMode = Schema.RequiredMode.REQUIRED) private List groups; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/veneer/VeneerPlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/veneer/VeneerPlanServiceImpl.java index 88eec5585..fffbf8563 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/veneer/VeneerPlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/veneer/VeneerPlanServiceImpl.java @@ -208,6 +208,8 @@ public class VeneerPlanServiceImpl implements VeneerPlanService { .isScheduled(false) .sort(++sort) .planTime(planTime) + .processId(req.getProcessId()) + .processName(StrUtil.trim(req.getProcessName())) .sourceVeneerId(sourceVeneerId) .orderNos(buildOrderNos(group)) .veneerNum(group.size()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties index 174af251c..5fe1cd206 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_cht.properties @@ -116,6 +116,8 @@ veneer.plan.sort.status.changed=貼皮排單不存在或狀態發生變化，請 veneer.plan.not.exist=貼皮排單{0}不存在或已刪除，請重新整理後再試 veneer.plan.id.required=貼皮排單ID不能為空 veneer.plan.process.required=請選擇貼皮排單的加工方案 +veneer.plan.process.id.required=貼皮排單加工方案組ID不能為空 +veneer.plan.process.name.required=貼皮排單加工方案組名稱不能為空 veneer.plan.operation.status.changed=貼皮排單{0}的狀態發生變化，目前操作無法執行，請重新整理後再試 veneer.plan.plate.record.required=請選擇需要新增或移除的貼皮記錄 veneer.plan.plate.source.mismatch=貼皮記錄{0}與目標排單的貼皮商品不一致，無法加入排單 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties index b567ea29b..3594c8f05 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_en.properties @@ -116,6 +116,8 @@ veneer.plan.sort.status.changed=The veneer plan does not exist or its status has veneer.plan.not.exist=Veneer plan {0} does not exist or has been deleted. Please refresh and retry veneer.plan.id.required=Veneer plan ID is required veneer.plan.process.required=Please select a process scheme for the veneer plan +veneer.plan.process.id.required=The process scheme ID of the veneer plan is required +veneer.plan.process.name.required=The process scheme name of the veneer plan is required veneer.plan.operation.status.changed=The status of veneer plan {0} has changed, so the operation cannot be performed. Please refresh and retry veneer.plan.plate.record.required=Please select veneer records to add or remove veneer.plan.plate.source.mismatch=Veneer record {0} does not match the veneer product of the target plan diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties index 8bf7eb4ee..be6ad2ad8 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_errorcode_zh.properties @@ -116,6 +116,8 @@ veneer.plan.sort.status.changed=贴皮排单不存在或状态发生变化，请 veneer.plan.not.exist=贴皮排单{0}不存在或已删除，请刷新后重试 veneer.plan.id.required=贴皮排单ID不能为空 veneer.plan.process.required=请选择贴皮排单的加工方案 +veneer.plan.process.id.required=贴皮排单加工方案组ID不能为空 +veneer.plan.process.name.required=贴皮排单加工方案组名称不能为空 veneer.plan.operation.status.changed=贴皮排单{0}的状态发生变化，当前操作无法执行，请刷新后重试 veneer.plan.plate.record.required=请选择需要新增或移除的贴皮记录 veneer.plan.plate.source.mismatch=贴皮记录{0}与目标排单的贴皮商品不一致，无法加入排单