From f3dc60d8bd95a3b9a78286590d6b2df3e38bd4a2 Mon Sep 17 00:00:00 2001 From: zxy Date: Tue, 21 Apr 2026 16:21:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(example):=20=E9=87=8D=E6=9E=84=E6=9C=BA?= =?UTF-8?q?=E5=8F=B0=E5=8F=82=E6=95=B0=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8F=82=E6=95=B0=E6=98=8E=E7=BB=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jnpf/mapper/MachineParamDetailMapper.java | 9 + .../service/MachineParamDetailService.java | 28 +++ .../MachineParamDetailServiceImpl.java | 128 ++++++++++ .../java/jnpf/service/MachineService.java | 1 + .../java/jnpf/service/MaterialService.java | 2 + .../service/impl/MachineParamServiceImpl.java | 29 ++- .../jnpf/service/impl/MachineServiceImpl.java | 9 + .../service/impl/MaterialServiceImpl.java | 11 + .../jnpf/controller/MachineController.java | 17 ++ .../controller/MachineParamController.java | 7 + .../jnpf/controller/MaterialController.java | 18 ++ .../jnpf/controller/ProcParamController.java | 2 +- .../machine/MachineParamDetailEntity.java | 74 ++++++ .../model/machine/MachineParamDetailForm.java | 74 ++++++ .../machine/MachineParamDetailPagination.java | 37 +++ .../model/machine/MachineParamEntity.java | 4 + .../jnpf/model/machine/MachineParamForm.java | 4 + .../src/views/example/machineparam/form.vue | 231 ++++++++++++++---- .../src/views/example/machineparam/index.vue | 13 +- .../src/views/example/procparam/form.vue | 2 +- .../src/views/example/tsoorder/index.vue | 27 +- 21 files changed, 655 insertions(+), 72 deletions(-) create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/MachineParamDetailMapper.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailService.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailServiceImpl.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailEntity.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailForm.java create mode 100644 jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailPagination.java diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/MachineParamDetailMapper.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/MachineParamDetailMapper.java new file mode 100644 index 0000000..22f0d7a --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/MachineParamDetailMapper.java @@ -0,0 +1,9 @@ +package jnpf.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.model.machine.MachineParamDetailEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MachineParamDetailMapper extends BaseMapper { +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailService.java new file mode 100644 index 0000000..af05e96 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailService.java @@ -0,0 +1,28 @@ +package jnpf.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.model.machine.MachineParamDetailEntity; +import jnpf.model.machine.MachineParamDetailForm; +import jnpf.model.machine.MachineParamDetailPagination; + +import java.util.List; + +public interface MachineParamDetailService extends IService { + List getList(MachineParamDetailPagination pagination); + + MachineParamDetailEntity getInfo(String id); + + void create(MachineParamDetailEntity entity); + + boolean update(String id, MachineParamDetailEntity entity); + + void delete(MachineParamDetailEntity entity); + + String checkForm(MachineParamDetailForm form, int i); + + void saveOrUpdate(MachineParamDetailForm form, String id, boolean isSave) throws Exception; + + List getListByMachineParamId(Integer machineParamId); + + void deleteByMachineParamId(Integer machineParamId); +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailServiceImpl.java new file mode 100644 index 0000000..17551fe --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineParamDetailServiceImpl.java @@ -0,0 +1,128 @@ +package jnpf.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.mapper.MachineParamDetailMapper; +import jnpf.model.machine.MachineParamDetailEntity; +import jnpf.model.machine.MachineParamDetailForm; +import jnpf.model.machine.MachineParamDetailPagination; +import jnpf.service.MachineParamDetailService; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class MachineParamDetailServiceImpl extends ServiceImpl implements MachineParamDetailService { + + @Override + public List getList(MachineParamDetailPagination pagination) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + if (ObjectUtil.isNotEmpty(pagination.getEnabledStatus())) { + wrapper.eq(MachineParamDetailEntity::getEnabledStatus, pagination.getEnabledStatus()); + } + if (ObjectUtil.isNotEmpty(pagination.getProcParamName())) { + wrapper.like(MachineParamDetailEntity::getProcParamName, pagination.getProcParamName()); + } + if (ObjectUtil.isNotEmpty(pagination.getProcParamUnit())) { + wrapper.eq(MachineParamDetailEntity::getProcParamUnit, pagination.getProcParamUnit()); + } + if (ObjectUtil.isNotEmpty(pagination.getProcParamId())) { + wrapper.eq(MachineParamDetailEntity::getProcParamId, pagination.getProcParamId()); + } + if (ObjectUtil.isNotEmpty(pagination.getIsAlert())) { + wrapper.eq(MachineParamDetailEntity::getIsAlert, pagination.getIsAlert()); + } + if (ObjectUtil.isNotEmpty(pagination.getMachineParamId())) { + wrapper.eq(MachineParamDetailEntity::getMachineParamId, pagination.getMachineParamId()); + } + + wrapper.eq(MachineParamDetailEntity::getDeleteMark, 0); + wrapper.orderByDesc(MachineParamDetailEntity::getId); + + if ("0".equals(pagination.getDataType())) { + Page page = new Page<>(pagination.getCurrentPage(), pagination.getPageSize()); + IPage result = this.page(page, wrapper); + return pagination.setData(result.getRecords(), result.getTotal()); + } else { + return this.list(wrapper); + } + } + + @Override + public MachineParamDetailEntity getInfo(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(MachineParamDetailEntity::getId, id); + return this.getOne(queryWrapper); + } + + @Override + public void create(MachineParamDetailEntity entity) { + this.save(entity); + } + + @Override + public boolean update(String id, MachineParamDetailEntity entity) { + return this.updateById(entity); + } + + @Override + public void delete(MachineParamDetailEntity entity) { + if (entity != null) { + this.removeById(entity.getId()); + } + } + + @Override + public String checkForm(MachineParamDetailForm form, int i) { + if (ObjectUtil.isEmpty(form.getMachineParamId())) { + return "主表ID不能为空"; + } + if (ObjectUtil.isEmpty(form.getProcParamName())) { + return "参数名称不能为空"; + } + return ""; + } + + @Override + @Transactional + public void saveOrUpdate(MachineParamDetailForm form, String id, boolean isSave) throws Exception { + MachineParamDetailEntity entity; + if (isSave) { + entity = new MachineParamDetailEntity(); + BeanUtils.copyProperties(form, entity); + entity.setId(null); + this.save(entity); + } else { + entity = getInfo(id); + if (entity == null) { + throw new Exception("数据不存在"); + } + BeanUtils.copyProperties(form, entity); + this.updateById(entity); + } + } + + @Override + public List getListByMachineParamId(Integer machineParamId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MachineParamDetailEntity::getMachineParamId, machineParamId); + wrapper.eq(MachineParamDetailEntity::getDeleteMark, 0); + wrapper.orderByAsc(MachineParamDetailEntity::getId); + return this.list(wrapper); + } + + @Override + @Transactional + public void deleteByMachineParamId(Integer machineParamId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MachineParamDetailEntity::getMachineParamId, machineParamId); + this.remove(wrapper); + } +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineService.java index 5bddb40..dec1ec1 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MachineService.java @@ -29,4 +29,5 @@ public interface MachineService extends IService { String checkForm(MachineForm form, int i); void saveOrUpdate(MachineForm machineForm, String id, boolean isSave) throws Exception; + List getMachineList(String keyWord); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MaterialService.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MaterialService.java index 0ba5478..97adb2a 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MaterialService.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/MaterialService.java @@ -29,4 +29,6 @@ public interface MaterialService extends IService { String checkForm(MaterialForm form, int i); void saveOrUpdate(MaterialForm materialForm, String id, boolean isSave) throws Exception; + List getSelector(String keyWord); + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java index cfcbf53..e3c5e20 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineParamServiceImpl.java @@ -7,27 +7,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jnpf.mapper.MachineParamMapper; -import jnpf.model.machine.MachineParamEntity; -import jnpf.model.machine.MachineParamForm; -import jnpf.model.machine.MachineParamPagination; +import jnpf.model.machine.*; +import jnpf.service.MachineParamDetailService; import jnpf.service.MachineParamService; import jnpf.util.StringUtil; import jnpf.util.UserProvider; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.List; @Service +@RequiredArgsConstructor public class MachineParamServiceImpl extends ServiceImpl implements MachineParamService { - @Resource - private UserProvider userProvider; + private final UserProvider userProvider; + + private final MachineParamDetailService machineParamDetailService; - @Resource - private MachineParamService self; @Override public List getList(MachineParamPagination machineParamPagination) { @@ -126,6 +125,7 @@ public class MachineParamServiceImpl extends ServiceImpl detailList = machineParamForm.getDetailList(); + for (MachineParamDetailForm detailForm : detailList) { + MachineParamDetailEntity detailEntity = new MachineParamDetailEntity(); + BeanUtils.copyProperties(detailForm, detailEntity); + detailEntity.setMachineParamId(entity.getId()); + detailEntity.setEnabledStatus(1); + machineParamDetailService.save(detailEntity); + } + } + @Override public List getSelectList(String selectKey) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java index 14546b9..50125a8 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MachineServiceImpl.java @@ -171,4 +171,13 @@ public class MachineServiceImpl extends ServiceImpl getMachineList(String keyWord) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MachineEntity::getEnabledStatus, "1"); + wrapper.eq(MachineEntity::getDeleteMark, 0); + wrapper.like(MachineEntity::getMachineName, keyWord); + wrapper.orderByDesc(MachineEntity::getId); + return this.list(wrapper); + } } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MaterialServiceImpl.java b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MaterialServiceImpl.java index 09e34d6..ee97480 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MaterialServiceImpl.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/MaterialServiceImpl.java @@ -154,4 +154,15 @@ public class MaterialServiceImpl extends ServiceImpl getSelector(String keyWord) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MaterialEntity::getEnabledStatus, 1); + wrapper.eq(MaterialEntity::getDeleteMark, 0); + if (StringUtil.isNotEmpty(keyWord)) { + wrapper.like(MaterialEntity::getMatName, keyWord); + } + wrapper.orderByDesc(MaterialEntity::getId); + return this.list(wrapper); + } } 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 4a8191e..3507f52 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 @@ -153,5 +153,22 @@ public class MachineController { return ActionResult.success(realList); } + //获取机台下拉列表 + @Operation(summary = "获取机台下拉列表") + @GetMapping("/getMachineList") + public ActionResult getMachineList(@RequestParam(required = false, defaultValue = "", value = "keyWord") String keyWord) { + List list = machineService.getMachineList(keyWord); + List> result = list.stream() + .map(entity -> { + Map map = JsonUtil.entityToMap(entity); + map.put("id", entity.getId()); + map.put("name", entity.getMachineName()); + map.put("code", entity.getMachineCd()); + return map; + }) + .collect(Collectors.toList()); + return ActionResult.success(result); + } + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineParamController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineParamController.java index 92dd329..006ef9f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineParamController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MachineParamController.java @@ -5,11 +5,13 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; import jnpf.base.vo.PageListVO; import jnpf.base.vo.PaginationVO; +import jnpf.model.machine.MachineParamDetailEntity; import jnpf.model.machine.MachineParamEntity; import jnpf.model.machine.MachineParamForm; import jnpf.model.machine.MachineParamPagination; import jnpf.permission.entity.UserEntity; import jnpf.permission.service.UserService; +import jnpf.service.MachineParamDetailService; import jnpf.service.MachineParamService; import jnpf.util.JsonUtil; import jnpf.util.StringUtil; @@ -30,6 +32,9 @@ public class MachineParamController { @Autowired private MachineParamService machineParamService; + @Autowired + private MachineParamDetailService machineParamDetailService; + @Autowired private UserService userService; @@ -58,6 +63,8 @@ public class MachineParamController { @GetMapping("/{id}") public ActionResult info(@PathVariable("id") String id) { MachineParamEntity entity = machineParamService.getInfo(id); + List listByMachineParamId = machineParamDetailService.getListByMachineParamId(entity.getId()); + entity.setDetailList(listByMachineParamId); if (entity != null) { return ActionResult.success(JsonUtil.entityToMap(entity)); } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MaterialController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MaterialController.java index 3fbb127..f2fb01f 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MaterialController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/MaterialController.java @@ -142,4 +142,22 @@ public class MaterialController { return ActionResult.fail("删除失败，数据不存在"); } + // 获取物料下拉框 + @Operation(summary = "获取物料下拉框") + @GetMapping("/getMaterialList") + public ActionResult getSelector(@RequestParam(value = "keyWord", required = false, defaultValue = "") String keyWord) { + List list = materialService.getSelector(keyWord); + List> result = list.stream() + .map(entity -> { + Map map = JsonUtil.entityToMap(entity); + map.put("id", entity.getId()); + map.put("name", entity.getMatName()); + map.put("spec", entity.getSpec()); + map.put("code", entity.getMatCode()); + return map; + }) + .collect(Collectors.toList()); + return ActionResult.success(result); + } + } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcParamController.java b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcParamController.java index a7c28b2..a51ace9 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcParamController.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/ProcParamController.java @@ -121,7 +121,7 @@ public class ProcParamController { Map map = new HashMap<>(3); map.put("id", entity.getId()); map.put("code", entity.getProcParamName()); - map.put("name", entity.getProcParamName()); + map.put("name", entity.getProcCd()); return map; }) .collect(Collectors.toList()); diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailEntity.java new file mode 100644 index 0000000..2f7fb94 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailEntity.java @@ -0,0 +1,74 @@ +package jnpf.model.machine; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@TableName("tba_machine_param_detail") +public class MachineParamDetailEntity { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT) + private String creatorUserId; + + @TableField(value = "f_creator_time", fill = FieldFill.INSERT) + private Date creatorTime; + + @TableField(value = "f_last_modify_user_id", fill = FieldFill.INSERT_UPDATE) + private String lastModifyUserId; + + @TableField(value = "f_last_modify_time", fill = FieldFill.INSERT_UPDATE) + private Date lastModifyTime; + + @TableField(value = "f_delete_user_id", fill = FieldFill.UPDATE) + private String deleteUserId; + + @TableField(value = "f_delete_time", fill = FieldFill.UPDATE) + private Date deleteTime; + + @TableField(value = "f_delete_mark", updateStrategy = FieldStrategy.IGNORED) + private Integer deleteMark; + + @TableField(value = "f_flow_id") + private String flowId; + + @TableField(value = "f_flow_task_id") + private String flowTaskId; + + @TableField("enabled_status") + private Integer enabledStatus; + + @TableField(value = "remark", updateStrategy = FieldStrategy.IGNORED) + private String remark; + + @TableField("proc_param_name") + private String procParamName; + + @TableField("proc_param_unit") + private String procParamUnit; + + @TableField("proc_param_id") + private Integer procParamId; + + @TableField("standard_value") + private BigDecimal standardValue; + + @TableField("upper_limit") + private BigDecimal upperLimit; + + @TableField("lower_limit") + private BigDecimal lowerLimit; + + @TableField("dev") + private String dev; + + @TableField("is_alert") + private String isAlert; + + @TableField("machine_param_id") + private Integer machineParamId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailForm.java new file mode 100644 index 0000000..bd0d238 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailForm.java @@ -0,0 +1,74 @@ +package jnpf.model.machine; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +public class MachineParamDetailForm { + + @Schema(description = "主键") + private Integer id; + + @Schema(description = "状态(1启用 2 未启用)") + private Integer enabledStatus; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "参数名称") + private String procParamName; + + @Schema(description = "参数单位") + private String procParamUnit; + + @Schema(description = "参数id") + private Integer procParamId; + + @Schema(description = "标准值") + private BigDecimal standardValue; + + @Schema(description = "上限值") + private BigDecimal upperLimit; + + @Schema(description = "下限值") + private BigDecimal lowerLimit; + + @Schema(description = "偏差") + private String dev; + + @Schema(description = "是否预警(0 是 1否)") + private String isAlert; + + @Schema(description = "主表id") + private Integer machineParamId; + + @Schema(description = "创建时间") + private Date creatorTime; + + @Schema(description = "创建用户ID") + private String creatorUserId; + + @Schema(description = "最后修改时间") + private Date lastModifyTime; + + @Schema(description = "最后修改用户ID") + private String lastModifyUserId; + + @Schema(description = "删除时间") + private Date deleteTime; + + @Schema(description = "删除用户ID") + private String deleteUserId; + + @Schema(description = "删除标记") + private Integer deleteMark; + + @Schema(description = "流程ID") + private String flowId; + + @Schema(description = "流程任务ID") + private String flowTaskId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailPagination.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailPagination.java new file mode 100644 index 0000000..7aa8139 --- /dev/null +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamDetailPagination.java @@ -0,0 +1,37 @@ +package jnpf.model.machine; + +import io.swagger.v3.oas.annotations.media.Schema; +import jnpf.base.Pagination; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class MachineParamDetailPagination extends Pagination { + + + private String selectKey; + + private String dataType; + + @Schema(description = "状态(1启用 2 未启用)") + private Integer enabledStatus; + + @Schema(description = "参数名称") + private String procParamName; + + @Schema(description = "参数单位") + private String procParamUnit; + + @Schema(description = "参数id") + private Integer procParamId; + + @Schema(description = "标准值") + private BigDecimal standardValue; + + @Schema(description = "是否预警(0 是 1否)") + private String isAlert; + + @Schema(description = "主表id") + private Integer machineParamId; +} diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamEntity.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamEntity.java index 018e490..8e19de1 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamEntity.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamEntity.java @@ -3,6 +3,7 @@ package jnpf.model.machine; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.util.Date; +import java.util.List; @Data @TableName("tba_machine_param") @@ -76,4 +77,7 @@ public class MachineParamEntity { @TableField(exist = false) private String createUserName; + + @TableField(exist = false) + private List detailList; } diff --git a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamForm.java b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamForm.java index f0efb96..41abc8b 100644 --- a/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamForm.java +++ b/jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/machine/MachineParamForm.java @@ -2,7 +2,9 @@ package jnpf.model.machine; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; + import javax.validation.constraints.NotBlank; +import java.util.List; @Data public class MachineParamForm { @@ -54,4 +56,6 @@ public class MachineParamForm { @Schema(description = "流程任务ID") private String flowTaskId; + + List detailList; } diff --git a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue index 280b638..6afdc9e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/machineparam/form.vue @@ -2,36 +2,112 @@
@@ -44,6 +120,7 @@ diff --git a/jnpf-java-boot/jnpf-web/src/views/example/procparam/form.vue b/jnpf-java-boot/jnpf-web/src/views/example/procparam/form.vue index 7cf8004..7e0df9b 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/procparam/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/procparam/form.vue @@ -16,7 +16,7 @@ NEW_FILE_CODE diff --git a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue index ea25e72..d79408b 100644 --- a/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/example/tsoorder/index.vue @@ -43,7 +43,7 @@ - +
- + @@ -258,6 +258,16 @@ export default { search() { this.listQuery.currentPage = 1; + // 清空表格选中状态 + this.selectedRows = []; + this.hasSelected = false; + const table = this.$refs.table; + if (table) { + const elTable = table.$refs.JNPFTable || table.$refs.table; + if (elTable && elTable.clearSelection) { + elTable.clearSelection(); + } + } this.initData(); }, @@ -394,19 +404,6 @@ export default { ::v-deep .el-form-item__label { text-align: left !important; } -.JNPF-common-layout-main { - display: flex; - flex-direction: column; - min-height: calc(100vh - 220px); -} -.tableContainer { - flex: 1; - height: auto; - min-height: 300px; -} -.button-row { - padding-top: 8px; -} .button-col { display: flex; align-items: center;