diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java index 848abfd..90ca723 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/controller/MesPlanRecordController.java @@ -5,8 +5,10 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; + import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; + import cn.dev33.satoken.annotation.SaCheckPermission; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; @@ -67,10 +69,15 @@ public class MesPlanRecordController extends BaseController { @SaCheckPermission("mts:planRecord:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { return R.ok(iMesPlanRecordService.queryById(id)); } + @GetMapping("/queryByBo") + public R queryByBo(MesPlanRecordBo bo) { + return R.ok(iMesPlanRecordService.queryByBo(bo)); + } + /** * 新增生产计划明细日期记录 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java index 25bc8a0..80e2352 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/MesPlanRecord.java @@ -9,6 +9,16 @@ import lombok.EqualsAndHashCode; import java.util.Date; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + + /** * 生产计划明细日期记录对象 mes_plan_record * @@ -31,14 +41,14 @@ public class MesPlanRecord extends BaseEntity { * 任务id */ private Long detailId; - /** - * 备注 - */ - private String remark; /** * 记录日期 */ private Date recordDate; + /** + * 备注 + */ + private String remark; /** * oss_id */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java index cd1cd7d..a404e47 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/bo/MesPlanRecordBo.java @@ -6,10 +6,21 @@ import com.ruoyi.common.core.validate.EditGroup; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + + import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; + + /** * 生产计划明细日期记录业务对象 mes_plan_record * @@ -24,33 +35,31 @@ public class MesPlanRecordBo extends BaseEntity { /** * 主键 */ - @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long id; /** * 任务id */ - @NotNull(message = "任务id不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "任务id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long detailId; + /** + * 记录日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date recordDate; + /** * 备注 */ - @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) private String remark; - /** - * 开始时间 - */ - @NotNull(message = "记录日期不能为空", groups = { AddGroup.class, EditGroup.class }) - private Date recordDate; - private String flag; /** * oss_id */ - @NotNull(message = "oss_id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long ossId; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java index 3b28c00..d54c01c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanRecordVo.java @@ -1,12 +1,14 @@ package com.ruoyi.mts.domain.vo; import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; + import java.util.Date; import java.io.Serializable; @@ -35,6 +37,11 @@ public class MesPlanRecordVo implements Serializable { @ExcelProperty(value = "任务id") private Long detailId; + /** + * 记录日期 + */ + private Date recordDate; + /** * 备注 */ @@ -58,6 +65,4 @@ public class MesPlanRecordVo implements Serializable { */ @ExcelProperty(value = "oss_id") private Long ossId; - - } diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java index 1afe01d..297c320 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/IMesPlanRecordService.java @@ -22,6 +22,8 @@ public interface IMesPlanRecordService { */ MesPlanRecordVo queryById(Long id); + MesPlanRecordVo queryByBo(MesPlanRecordBo bo); + /** * 查询生产计划明细日期记录列表 */ diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java index c412bea..5458501 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/service/impl/MesPlanRecordServiceImpl.java @@ -38,6 +38,14 @@ public class MesPlanRecordServiceImpl implements IMesPlanRecordService { return baseMapper.selectVoById(id); } + @Override + public MesPlanRecordVo queryByBo(MesPlanRecordBo bo) { + return baseMapper.selectVoOne(Wrappers.lambdaQuery(MesPlanRecord.class) + .eq(MesPlanRecord::getDetailId, bo.getDetailId()) + .eq(MesPlanRecord::getRecordDate, bo.getRecordDate()) + .last("limit 1")); + } + /** * 查询生产计划明细日期记录列表 */ diff --git a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml index a82887c..89432cc 100644 --- a/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml +++ b/ruoyi-demo/src/main/resources/mapper/mts/MesPlanRecordMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-ui-vue3/src/api/mts/planRecord.js b/ruoyi-ui-vue3/src/api/mts/planRecord.js new file mode 100644 index 0000000..e6ac07e --- /dev/null +++ b/ruoyi-ui-vue3/src/api/mts/planRecord.js @@ -0,0 +1,52 @@ +import request from "@/utils/request"; + +// 查询生产计划明细日期记录列表 +export function listPlanRecord(query) { + return request({ + url: "/mts/planRecord/list", + method: "get", + params: query, + }); +} + +// 查询生产计划明细日期记录详细 +export function getPlanRecord(id) { + return request({ + url: "/mts/planRecord/" + id, + method: "get", + }); +} + +export function queryByBo(query) { + return request({ + url: "/mts/planRecord/queryByBo", + method: "get", + params: query, + }); +} + +// 新增生产计划明细日期记录 +export function addPlanRecord(data) { + return request({ + url: "/mts/planRecord", + method: "post", + data: data, + }); +} + +// 修改生产计划明细日期记录 +export function updatePlanRecord(data) { + return request({ + url: "/mts/planRecord", + method: "put", + data: data, + }); +} + +// 删除生产计划明细日期记录 +export function delPlanRecord(id) { + return request({ + url: "/mts/planRecord/" + id, + method: "delete", + }); +} diff --git a/ruoyi-ui-vue3/src/components/FileUpload/index.vue b/ruoyi-ui-vue3/src/components/FileUpload/index.vue index a5c2734..fe21d0a 100644 --- a/ruoyi-ui-vue3/src/components/FileUpload/index.vue +++ b/ruoyi-ui-vue3/src/components/FileUpload/index.vue @@ -1,19 +1,8 @@