From ba7f7b1de1a9d8386b88c4bd4666252d0c99abf9 Mon Sep 17 00:00:00 2001 From: zxy Date: Tue, 14 Apr 2026 14:46:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(example):=20=E5=AE=8C=E5=96=84=E5=B7=A5?= =?UTF-8?q?=E8=89=BA=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/service/impl/ProLineServiceImpl.java | 17 ++-- .../jnpf/service/impl/ProcServiceImpl.java | 18 ++-- .../service/impl/TechProcServiceImpl.java | 2 +- .../jnpf/controller/MachineController.java | 24 +---- .../java/jnpf/controller/ProcController.java | 30 +++++++ .../main/java/jnpf/model/proc/ProcEntity.java | 3 + .../jnpf/model/techproc/TechProcEntity.java | 3 + .../jnpf/model/techproc/TechProcForm.java | 3 + .../src/views/example/customer/options.js | 4 +- .../src/views/example/equipment/form.vue | 2 +- .../src/views/example/machine/index.vue | 2 +- .../src/views/example/techproc/form.vue | 87 ++++++++++++++++--- .../src/views/example/techproc/index.vue | 32 ++++++- 13 files changed, 177 insertions(+), 50 deletions(-) diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java index 61d9558..e19e2f9 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/ProLineServiceImpl.java @@ -120,12 +120,19 @@ public class ProLineServiceImpl extends ServiceImpl impleme @Override @Transactional public void saveOrUpdate(ProcForm procForm, String id, boolean isSave) throws Exception { - ProcEntity entity = getInfo(id); - if (entity == null) { - entity = new ProcEntity(); + if (isSave) { + ProcEntity entity = new ProcEntity(); + BeanUtils.copyProperties(procForm, entity); + entity.setId(null); + this.save(entity); + } else { + ProcEntity entity = getInfo(id); + if (entity == null) { + throw new Exception("数据不存在"); + } else { + BeanUtils.copyProperties(procForm, entity); + this.updateById(entity); + } } - BeanUtils.copyProperties(procForm, entity); - this.saveOrUpdate(entity); } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/TechProcServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/TechProcServiceImpl.java index 4ada8da..424acfd 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/TechProcServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/TechProcServiceImpl.java @@ -99,7 +99,7 @@ public class TechProcServiceImpl extends ServiceImpl 0) { - countRecover += "工艺流程已存在，请重新输入！"; + countRecover += "工艺流程已存在，请重新选择！"; } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineController.java index 6222c68..16361ad 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineController.java @@ -7,13 +7,13 @@ import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; import jnpf.model.machine.MachineEntity; -import jnpf.model.proc.ProcEntity; -import jnpf.model.proline.ProLineEntity; import jnpf.model.machine.MachineForm; import jnpf.model.machine.MachinePagination; +import jnpf.model.proline.ProLineEntity; +import jnpf.permission.service.UserService; import jnpf.service.MachineService; -import jnpf.service.ProcService; import jnpf.service.ProLineService; +import jnpf.service.ProcService; import jnpf.util.JsonUtil; import jnpf.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; @@ -39,8 +39,6 @@ public class MachineController { @Autowired private ProLineService proLineService; - @Autowired - private ProcService procService; /** * 列表 @@ -141,20 +139,6 @@ public class MachineController { return ActionResult.success(realList); } - /** - * 获取工序列表 - * @return 工序列表 - */ - @Operation(summary = "获取工序列表") - @GetMapping("/getProcList") - public ActionResult getProcList() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProcEntity::getEnabledStatus, 1); - List list = procService.list(wrapper); - List> realList = list.stream() - .map(JsonUtil::entityToMap) - .collect(Collectors.toList()); - return ActionResult.success(realList); - } + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcController.java index d950c24..a69b3d7 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcController.java @@ -1,5 +1,6 @@ package jnpf.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; @@ -8,6 +9,8 @@ import jnpf.base.vo.PaginationVO; import jnpf.model.proc.ProcEntity; import jnpf.model.proc.ProcForm; import jnpf.model.proc.ProcPagination; +import jnpf.permission.entity.UserEntity; +import jnpf.permission.service.UserService; import jnpf.service.ProcService; import jnpf.util.JsonUtil; import jnpf.util.StringUtil; @@ -31,6 +34,9 @@ public class ProcController { @Autowired private ProcService procService; + @Autowired + private UserService userService; + /** * 列表 * @param procPagination 分页查询对象 @@ -114,4 +120,28 @@ public class ProcController { } } + /** + * 获取工序列表 + * @return 工序列表 + */ + @Operation(summary = "获取工序列表") + @GetMapping("/getProcList") + public ActionResult getProcList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcEntity::getEnabledStatus, 1); + wrapper.orderByAsc(ProcEntity::getProcCd); + List list = procService.list(wrapper); + // 查询创建人 + list.forEach(item -> { + UserEntity userEntity = userService.getById(item.getCreatorUserId()); + if (userEntity != null) { + item.setCreateUserName(userEntity.getRealName()); + } + }); + List> realList = list.stream() + .map(JsonUtil::entityToMap) + .collect(Collectors.toList()); + return ActionResult.success(realList); + } + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java index a5464f7..3ffc10d 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/proc/ProcEntity.java @@ -41,4 +41,7 @@ public class ProcEntity { @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) private String remark; + @TableField(exist = false) + private String createUserName; + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcEntity.java index 81acb9f..d3ba325 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcEntity.java @@ -46,6 +46,9 @@ public class TechProcEntity { @TableField("tech_proc") private String techProc; + @TableField(exist = false) + private String techProcName; + @TableField(value = "enabled_status", updateStrategy = FieldStrategy.IGNORED) private Integer enabledStatus; diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcForm.java index d44a7c1..cf7e53f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/techproc/TechProcForm.java @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.List; /** * 工艺流程主数据 Form @@ -29,4 +30,6 @@ public class TechProcForm { @Schema(description = "流程任务ID") private String flowTaskId; + + private List procList; } diff --git a/jnpf-java-boot/jnpf-web/src/views/example/customer/options.js b/jnpf-java-boot/jnpf-web/src/views/example/customer/options.js index 0b8ed96..518df83 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/customer/options.js +++ b/jnpf-java-boot/jnpf-web/src/views/example/customer/options.js @@ -9,14 +9,14 @@ export const customerMaps = { enabledStatus: { '1': '启用', '2': '未启用' }, - storeType: { '1': '原料库', '2': '在制品库', '3': '成品库' }, + storeType: { 1: '原料库', 2: '在制品库', 3: '成品库' }, } // 根据映射自动生成下拉选项 export const customerOptions = {} for (const key in customerMaps) { const map = customerMaps[key] - customerOptions[key] = Object.entries(map).map(([id, fullName]) => ({ id, fullName })) + customerOptions[key] = Object.entries(map).map(([id, fullName]) => ({ id: Number(id), fullName })) } // 获取显示名称 diff --git a/jnpf-java-boot/jnpf-web/src/views/example/equipment/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/equipment/form.vue index 302a95d..e8af8af 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/equipment/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/equipment/form.vue @@ -347,7 +347,7 @@ export default { handleClose() { this.dialogVisible = false; - this.$emit('refresh', false) + this.$emit('refresh', true) }, } } diff --git a/jnpf-java-boot/jnpf-web/src/views/example/machine/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/machine/index.vue index 8db82a6..fa35450 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/machine/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/machine/index.vue @@ -190,7 +190,7 @@ export default { // 获取工序列表 getProcList() { request({ - url: `/api/example/machine/getProcList`, + url: `/api/example/proc/getProcList`, method: 'get' }).then(res => { this.procList = res.data || []; diff --git a/jnpf-java-boot/jnpf-web/src/views/example/techproc/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/techproc/form.vue index cb7c669..ee9fd76 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/techproc/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/techproc/form.vue @@ -1,18 +1,18 @@ -NEW_FILE_CODE