From f501994da6a75b3a4ad7cc0b4b3da7626ef87699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= <15984991+wwh2328692301@user.noreply.gitee.com> Date: Mon, 20 Apr 2026 19:14:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=A2=9E=E5=8A=A0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=92=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在规程主表的操作列中新增“版本与方案”按钮，点击后可跳转至版本管理页面。更新了操作列的宽度以适应新按钮。同时，在后端服务中添加了对规程版本存在性的校验，确保在删除规程时不会影响相关版本数据。 --- .../V11__wms_process_spec_version_plan.sql | 39 ++ klp-ui/src/api/wms/processPlan.js | 39 ++ klp-ui/src/api/wms/processSpecVersion.js | 46 +++ klp-ui/src/views/wms/processSpec/index.vue | 18 +- .../views/wms/processSpec/versionManage.vue | 374 ++++++++++++++++++ .../controller/WmsProcessPlanController.java | 75 ++++ .../WmsProcessSpecVersionController.java | 85 ++++ .../java/com/klp/domain/WmsProcessPlan.java | 59 +++ .../com/klp/domain/WmsProcessSpecVersion.java | 49 +++ .../com/klp/domain/bo/WmsProcessPlanBo.java | 42 ++ .../domain/bo/WmsProcessSpecVersionBo.java | 41 ++ .../com/klp/domain/vo/WmsProcessPlanVo.java | 50 +++ .../domain/vo/WmsProcessSpecVersionVo.java | 44 +++ .../com/klp/mapper/WmsProcessPlanMapper.java | 14 + .../mapper/WmsProcessSpecVersionMapper.java | 14 + .../klp/service/IWmsProcessPlanService.java | 29 ++ .../IWmsProcessSpecVersionService.java | 34 ++ .../impl/WmsProcessPlanServiceImpl.java | 107 +++++ .../impl/WmsProcessSpecServiceImpl.java | 11 +- .../WmsProcessSpecVersionServiceImpl.java | 149 +++++++ .../mapper/klp/WmsProcessPlanMapper.xml | 21 + .../klp/WmsProcessSpecVersionMapper.xml | 19 + 22 files changed, 1357 insertions(+), 2 deletions(-) create mode 100644 klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql create mode 100644 klp-ui/src/api/wms/processPlan.js create mode 100644 klp-ui/src/api/wms/processSpecVersion.js create mode 100644 klp-ui/src/views/wms/processSpec/versionManage.vue create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml diff --git a/klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql b/klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql new file mode 100644 index 00000000..0d30157a --- /dev/null +++ b/klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql @@ -0,0 +1,39 @@ +-- 规程版本表 +CREATE TABLE wms_process_spec_version ( + version_id BIGINT NOT NULL COMMENT '主键', + spec_id BIGINT NOT NULL COMMENT '规程主表ID', + version_code VARCHAR(64) NOT NULL COMMENT '版本号', + is_active TINYINT NOT NULL DEFAULT 0 COMMENT '是否当前生效(0否1是)', + status VARCHAR(32) NOT NULL DEFAULT 'DRAFT' COMMENT '状态(DRAFT草稿/PUBLISHED已发布/OBSOLETE作废等)', + create_by VARCHAR(64) NULL COMMENT '创建人', + create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) NULL COMMENT '更新人', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标志(0正常2删除)', + remark VARCHAR(500) NULL COMMENT '备注', + PRIMARY KEY (version_id), + UNIQUE KEY uk_spec_version_code (spec_id, version_code), + KEY idx_spec_version_spec (spec_id), + KEY idx_spec_version_active (spec_id, is_active) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规程版本表'; + +-- 方案点位表 +CREATE TABLE wms_process_plan ( + plan_id BIGINT NOT NULL COMMENT '主键', + version_id BIGINT NOT NULL COMMENT '规程版本ID', + segment_type VARCHAR(32) NOT NULL COMMENT '段类型(INLET/PROCESS/OUTLET)', + segment_name VARCHAR(100) NULL COMMENT '段名称', + point_name VARCHAR(200) NOT NULL COMMENT '点位名称', + point_code VARCHAR(64) NOT NULL COMMENT '点位编码', + sort_order INT NOT NULL DEFAULT 0 COMMENT '排序', + create_by VARCHAR(64) NULL COMMENT '创建人', + create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) NULL COMMENT '更新人', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标志(0正常2删除)', + remark VARCHAR(500) NULL COMMENT '备注', + PRIMARY KEY (plan_id), + UNIQUE KEY uk_plan_version_point_code (version_id, point_code), + KEY idx_plan_version (version_id), + KEY idx_plan_sort (version_id, sort_order) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='方案点位表'; diff --git a/klp-ui/src/api/wms/processPlan.js b/klp-ui/src/api/wms/processPlan.js new file mode 100644 index 00000000..ae7a25e8 --- /dev/null +++ b/klp-ui/src/api/wms/processPlan.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listProcessPlan(query) { + return request({ + url: '/wms/processPlan/list', + method: 'get', + params: query + }) +} + +export function getProcessPlan(planId) { + return request({ + url: '/wms/processPlan/' + planId, + method: 'get' + }) +} + +export function addProcessPlan(data) { + return request({ + url: '/wms/processPlan', + method: 'post', + data: data + }) +} + +export function updateProcessPlan(data) { + return request({ + url: '/wms/processPlan', + method: 'put', + data: data + }) +} + +export function delProcessPlan(planId) { + return request({ + url: '/wms/processPlan/' + planId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/processSpecVersion.js b/klp-ui/src/api/wms/processSpecVersion.js new file mode 100644 index 00000000..e77f68f5 --- /dev/null +++ b/klp-ui/src/api/wms/processSpecVersion.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +export function listProcessSpecVersion(query) { + return request({ + url: '/wms/processSpecVersion/list', + method: 'get', + params: query + }) +} + +export function getProcessSpecVersion(versionId) { + return request({ + url: '/wms/processSpecVersion/' + versionId, + method: 'get' + }) +} + +export function addProcessSpecVersion(data) { + return request({ + url: '/wms/processSpecVersion', + method: 'post', + data: data + }) +} + +export function updateProcessSpecVersion(data) { + return request({ + url: '/wms/processSpecVersion', + method: 'put', + data: data + }) +} + +export function activateProcessSpecVersion(versionId) { + return request({ + url: '/wms/processSpecVersion/activate/' + versionId, + method: 'put' + }) +} + +export function delProcessSpecVersion(versionId) { + return request({ + url: '/wms/processSpecVersion/' + versionId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/processSpec/index.vue b/klp-ui/src/views/wms/processSpec/index.vue index 68128c8e..8876d2b8 100644 --- a/klp-ui/src/views/wms/processSpec/index.vue +++ b/klp-ui/src/views/wms/processSpec/index.vue @@ -74,8 +74,9 @@ - + @@ -300,6 +301,21 @@ export default { this.download('wms/processSpec/export', { ...this.queryParams }, `processSpec_${new Date().getTime()}.xlsx`) + }, + goVersionManage(row) { + const specId = row.specId + if (specId == null || specId === '') { + this.$modal.msgWarning('无法获取规程ID，请刷新列表后重试') + return + } + // 固定落在「…/processSpec/version」，避免列表为 …/processSpec/list 时拼成 …/list/version 导致路由不匹配、query 丢失 + const pathCurrent = this.$route.path.replace(/\/$/, '') + const m = pathCurrent.match(/^(.*\/processSpec)(?:\/.*)?$/) + const base = m ? m[1] : pathCurrent + this.$router.push({ + path: `${base}/version`, + query: { specId: String(specId) } + }) } } } diff --git a/klp-ui/src/views/wms/processSpec/versionManage.vue b/klp-ui/src/views/wms/processSpec/versionManage.vue new file mode 100644 index 00000000..63734b86 --- /dev/null +++ b/klp-ui/src/views/wms/processSpec/versionManage.vue @@ -0,0 +1,374 @@ + + + diff --git a/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java b/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java new file mode 100644 index 00000000..5af67c19 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java @@ -0,0 +1,75 @@ +package com.klp.controller; + +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.bo.WmsProcessPlanBo; +import com.klp.domain.vo.WmsProcessPlanVo; +import com.klp.service.IWmsProcessPlanService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 方案点位 + * + * @author klp + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/processPlan") +public class WmsProcessPlanController extends BaseController { + + private final IWmsProcessPlanService wmsProcessPlanService; + + @GetMapping("/list") + public TableDataInfo list(WmsProcessPlanBo bo, PageQuery pageQuery) { + return wmsProcessPlanService.queryPageList(bo, pageQuery); + } + + @Log(title = "方案点位", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsProcessPlanBo bo, HttpServletResponse response) { + List list = wmsProcessPlanService.queryList(bo); + ExcelUtil.exportExcel(list, "方案点位", WmsProcessPlanVo.class, response); + } + + @GetMapping("/{planId}") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long planId) { + return R.ok(wmsProcessPlanService.queryById(planId)); + } + + @Log(title = "方案点位", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsProcessPlanBo bo) { + return toAjax(wmsProcessPlanService.insertByBo(bo)); + } + + @Log(title = "方案点位", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsProcessPlanBo bo) { + return toAjax(wmsProcessPlanService.updateByBo(bo)); + } + + @Log(title = "方案点位", businessType = BusinessType.DELETE) + @DeleteMapping("/{planIds}") + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] planIds) { + return toAjax(wmsProcessPlanService.deleteWithValidByIds(Arrays.asList(planIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java b/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java new file mode 100644 index 00000000..10555d45 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java @@ -0,0 +1,85 @@ +package com.klp.controller; + +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.bo.WmsProcessSpecVersionBo; +import com.klp.domain.vo.WmsProcessSpecVersionVo; +import com.klp.service.IWmsProcessSpecVersionService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 规程版本 + * + * @author klp + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/processSpecVersion") +public class WmsProcessSpecVersionController extends BaseController { + + private final IWmsProcessSpecVersionService wmsProcessSpecVersionService; + + @GetMapping("/list") + public TableDataInfo list(WmsProcessSpecVersionBo bo, PageQuery pageQuery) { + return wmsProcessSpecVersionService.queryPageList(bo, pageQuery); + } + + @Log(title = "规程版本", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsProcessSpecVersionBo bo, HttpServletResponse response) { + List list = wmsProcessSpecVersionService.queryList(bo); + ExcelUtil.exportExcel(list, "规程版本", WmsProcessSpecVersionVo.class, response); + } + + @GetMapping("/{versionId}") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long versionId) { + return R.ok(wmsProcessSpecVersionService.queryById(versionId)); + } + + @Log(title = "规程版本", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsProcessSpecVersionBo bo) { + return toAjax(wmsProcessSpecVersionService.insertByBo(bo)); + } + + @Log(title = "规程版本", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsProcessSpecVersionBo bo) { + return toAjax(wmsProcessSpecVersionService.updateByBo(bo)); + } + + /** + * 设为当前生效版本（同规程下仅一条生效） + */ + @Log(title = "规程版本生效", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/activate/{versionId}") + public R activate(@NotNull(message = "主键不能为空") @PathVariable Long versionId) { + return toAjax(wmsProcessSpecVersionService.activateVersion(versionId)); + } + + @Log(title = "规程版本", businessType = BusinessType.DELETE) + @DeleteMapping("/{versionIds}") + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] versionIds) { + return toAjax(wmsProcessSpecVersionService.deleteWithValidByIds(Arrays.asList(versionIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java b/klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java new file mode 100644 index 00000000..05cb2169 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java @@ -0,0 +1,59 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 方案点位对象 wms_process_plan + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_process_plan") +public class WmsProcessPlan extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId(value = "plan_id") + private Long planId; + + /** + * 规程版本ID + */ + private Long versionId; + + /** + * 段类型（INLET/PROCESS/OUTLET） + */ + private String segmentType; + + /** + * 段名称 + */ + private String segmentName; + + /** + * 点位名称 + */ + private String pointName; + + /** + * 点位编码 + */ + private String pointCode; + + /** + * 排序 + */ + private Integer sortOrder; + + @TableLogic + private Integer delFlag; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java b/klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java new file mode 100644 index 00000000..f088ec17 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java @@ -0,0 +1,49 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 规程版本对象 wms_process_spec_version + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_process_spec_version") +public class WmsProcessSpecVersion extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId(value = "version_id") + private Long versionId; + + /** + * 规程主表ID + */ + private Long specId; + + /** + * 版本号 + */ + private String versionCode; + + /** + * 是否当前生效（0=否，1=是） + */ + private Integer isActive; + + /** + * 状态 + */ + private String status; + + @TableLogic + private Integer delFlag; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java new file mode 100644 index 00000000..2c38acad --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java @@ -0,0 +1,42 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 方案点位业务对象 wms_process_plan + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsProcessPlanBo extends BaseEntity { + + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long planId; + + @NotNull(message = "版本不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long versionId; + + @NotBlank(message = "段类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private String segmentType; + + private String segmentName; + + @NotBlank(message = "点位名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String pointName; + + @NotBlank(message = "点位编码不能为空", groups = {AddGroup.class, EditGroup.class}) + private String pointCode; + + @NotNull(message = "排序不能为空", groups = {AddGroup.class, EditGroup.class}) + private Integer sortOrder; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java new file mode 100644 index 00000000..b016f3b6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java @@ -0,0 +1,41 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 规程版本业务对象 wms_process_spec_version + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsProcessSpecVersionBo extends BaseEntity { + + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long versionId; + + @NotNull(message = "规程不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long specId; + + @NotBlank(message = "版本号不能为空", groups = {AddGroup.class, EditGroup.class}) + private String versionCode; + + /** + * 是否当前生效（0=否，1=是） + */ + private Integer isActive; + + /** + * 状态 + */ + private String status; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java new file mode 100644 index 00000000..a21cc52b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java @@ -0,0 +1,50 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 方案点位视图对象 wms_process_plan + * + * @author klp + */ +@Data +@ExcelIgnoreUnannotated +public class WmsProcessPlanVo { + + @ExcelProperty(value = "方案点位ID") + private Long planId; + + @ExcelProperty(value = "版本ID") + private Long versionId; + + @ExcelProperty(value = "段类型") + private String segmentType; + + @ExcelProperty(value = "段名称") + private String segmentName; + + @ExcelProperty(value = "点位名称") + private String pointName; + + @ExcelProperty(value = "点位编码") + private String pointCode; + + @ExcelProperty(value = "排序") + private Integer sortOrder; + + @ExcelProperty(value = "备注") + private String remark; + + @ExcelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ExcelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java new file mode 100644 index 00000000..dd3e7224 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java @@ -0,0 +1,44 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 规程版本视图对象 wms_process_spec_version + * + * @author klp + */ +@Data +@ExcelIgnoreUnannotated +public class WmsProcessSpecVersionVo { + + @ExcelProperty(value = "版本ID") + private Long versionId; + + @ExcelProperty(value = "规程ID") + private Long specId; + + @ExcelProperty(value = "版本号") + private String versionCode; + + @ExcelProperty(value = "是否生效") + private Integer isActive; + + @ExcelProperty(value = "状态") + private String status; + + @ExcelProperty(value = "备注") + private String remark; + + @ExcelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ExcelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java new file mode 100644 index 00000000..7b3288b3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java @@ -0,0 +1,14 @@ +package com.klp.mapper; + +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.domain.WmsProcessPlan; +import com.klp.domain.vo.WmsProcessPlanVo; + +/** + * 方案点位Mapper + * + * @author klp + */ +public interface WmsProcessPlanMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java new file mode 100644 index 00000000..6089533f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java @@ -0,0 +1,14 @@ +package com.klp.mapper; + +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.domain.WmsProcessSpecVersion; +import com.klp.domain.vo.WmsProcessSpecVersionVo; + +/** + * 规程版本Mapper + * + * @author klp + */ +public interface WmsProcessSpecVersionMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java b/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java new file mode 100644 index 00000000..8d6b7dd9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java @@ -0,0 +1,29 @@ +package com.klp.service; + +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.domain.bo.WmsProcessPlanBo; +import com.klp.domain.vo.WmsProcessPlanVo; + +import java.util.Collection; +import java.util.List; + +/** + * 方案点位Service + * + * @author klp + */ +public interface IWmsProcessPlanService { + + WmsProcessPlanVo queryById(Long planId); + + TableDataInfo queryPageList(WmsProcessPlanBo bo, PageQuery pageQuery); + + List queryList(WmsProcessPlanBo bo); + + Boolean insertByBo(WmsProcessPlanBo bo); + + Boolean updateByBo(WmsProcessPlanBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java b/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java new file mode 100644 index 00000000..b19ac48d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java @@ -0,0 +1,34 @@ +package com.klp.service; + +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.domain.bo.WmsProcessSpecVersionBo; +import com.klp.domain.vo.WmsProcessSpecVersionVo; + +import java.util.Collection; +import java.util.List; + +/** + * 规程版本Service + * + * @author klp + */ +public interface IWmsProcessSpecVersionService { + + WmsProcessSpecVersionVo queryById(Long versionId); + + TableDataInfo queryPageList(WmsProcessSpecVersionBo bo, PageQuery pageQuery); + + List queryList(WmsProcessSpecVersionBo bo); + + Boolean insertByBo(WmsProcessSpecVersionBo bo); + + Boolean updateByBo(WmsProcessSpecVersionBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 将指定版本设为当前规程下唯一生效版本 + */ + Boolean activateVersion(Long versionId); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java new file mode 100644 index 00000000..cf72ec47 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java @@ -0,0 +1,107 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsProcessPlan; +import com.klp.domain.WmsProcessSpecVersion; +import com.klp.domain.bo.WmsProcessPlanBo; +import com.klp.domain.vo.WmsProcessPlanVo; +import com.klp.mapper.WmsProcessPlanMapper; +import com.klp.mapper.WmsProcessSpecVersionMapper; +import com.klp.service.IWmsProcessPlanService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 方案点位Service实现 + * + * @author klp + */ +@RequiredArgsConstructor +@Service +public class WmsProcessPlanServiceImpl implements IWmsProcessPlanService { + + private final WmsProcessPlanMapper baseMapper; + private final WmsProcessSpecVersionMapper wmsProcessSpecVersionMapper; + + @Override + public WmsProcessPlanVo queryById(Long planId) { + return baseMapper.selectVoById(planId); + } + + @Override + public TableDataInfo queryPageList(WmsProcessPlanBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(WmsProcessPlanBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsProcessPlanBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getVersionId() != null, WmsProcessPlan::getVersionId, bo.getVersionId()); + lqw.eq(StringUtils.isNotBlank(bo.getSegmentType()), WmsProcessPlan::getSegmentType, bo.getSegmentType()); + lqw.like(StringUtils.isNotBlank(bo.getPointName()), WmsProcessPlan::getPointName, bo.getPointName()); + lqw.eq(StringUtils.isNotBlank(bo.getPointCode()), WmsProcessPlan::getPointCode, bo.getPointCode()); + lqw.orderByAsc(WmsProcessPlan::getSortOrder).orderByAsc(WmsProcessPlan::getPlanId); + return lqw; + } + + @Override + public Boolean insertByBo(WmsProcessPlanBo bo) { + WmsProcessSpecVersion ver = wmsProcessSpecVersionMapper.selectById(bo.getVersionId()); + if (ver == null) { + throw new ServiceException("规程版本不存在"); + } + WmsProcessPlan add = BeanUtil.toBean(bo, WmsProcessPlan.class); + if (add.getSortOrder() == null) { + add.setSortOrder(0); + } + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPlanId(add.getPlanId()); + } + return flag; + } + + @Override + public Boolean updateByBo(WmsProcessPlanBo bo) { + WmsProcessPlan update = BeanUtil.toBean(bo, WmsProcessPlan.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + private void validEntityBeforeSave(WmsProcessPlan entity) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsProcessPlan::getVersionId, entity.getVersionId()); + lqw.eq(WmsProcessPlan::getPointCode, entity.getPointCode()); + if (entity.getPlanId() != null) { + lqw.ne(WmsProcessPlan::getPlanId, entity.getPlanId()); + } + if (baseMapper.selectCount(lqw) > 0) { + throw new ServiceException("同一版本下点位编码已存在"); + } + } + + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (Boolean.TRUE.equals(isValid)) { + // 可扩展业务校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java index 6c5b080a..895bc459 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java @@ -9,9 +9,11 @@ import com.klp.common.core.page.TableDataInfo; import com.klp.common.exception.ServiceException; import com.klp.common.utils.StringUtils; import com.klp.domain.WmsProcessSpec; +import com.klp.domain.WmsProcessSpecVersion; import com.klp.domain.bo.WmsProcessSpecBo; import com.klp.domain.vo.WmsProcessSpecVo; import com.klp.mapper.WmsProcessSpecMapper; +import com.klp.mapper.WmsProcessSpecVersionMapper; import com.klp.service.IWmsProcessSpecService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -29,6 +31,7 @@ import java.util.List; public class WmsProcessSpecServiceImpl implements IWmsProcessSpecService { private final WmsProcessSpecMapper baseMapper; + private final WmsProcessSpecVersionMapper wmsProcessSpecVersionMapper; @Override public WmsProcessSpecVo queryById(Long specId) { @@ -94,7 +97,13 @@ public class WmsProcessSpecServiceImpl implements IWmsProcessSpecService { @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (Boolean.TRUE.equals(isValid)) { - // 任务3 可在此校验版本等从表数据 + for (Long specId : ids) { + LambdaQueryWrapper vq = Wrappers.lambdaQuery(); + vq.eq(WmsProcessSpecVersion::getSpecId, specId); + if (wmsProcessSpecVersionMapper.selectCount(vq) > 0) { + throw new ServiceException("规程下存在版本数据，请先删除版本及方案"); + } + } } return baseMapper.deleteBatchIds(ids) > 0; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java new file mode 100644 index 00000000..af128778 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java @@ -0,0 +1,149 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsProcessSpec; +import com.klp.domain.WmsProcessPlan; +import com.klp.domain.WmsProcessSpecVersion; +import com.klp.domain.bo.WmsProcessSpecVersionBo; +import com.klp.domain.vo.WmsProcessSpecVersionVo; +import com.klp.mapper.WmsProcessPlanMapper; +import com.klp.mapper.WmsProcessSpecMapper; +import com.klp.mapper.WmsProcessSpecVersionMapper; +import com.klp.service.IWmsProcessSpecVersionService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +/** + * 规程版本Service实现 + * + * @author klp + */ +@RequiredArgsConstructor +@Service +public class WmsProcessSpecVersionServiceImpl implements IWmsProcessSpecVersionService { + + private final WmsProcessSpecVersionMapper baseMapper; + private final WmsProcessSpecMapper wmsProcessSpecMapper; + private final WmsProcessPlanMapper wmsProcessPlanMapper; + + @Override + public WmsProcessSpecVersionVo queryById(Long versionId) { + return baseMapper.selectVoById(versionId); + } + + @Override + public TableDataInfo queryPageList(WmsProcessSpecVersionBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(WmsProcessSpecVersionBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsProcessSpecVersionBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getSpecId() != null, WmsProcessSpecVersion::getSpecId, bo.getSpecId()); + lqw.eq(StringUtils.isNotBlank(bo.getVersionCode()), WmsProcessSpecVersion::getVersionCode, bo.getVersionCode()); + lqw.eq(bo.getIsActive() != null, WmsProcessSpecVersion::getIsActive, bo.getIsActive()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WmsProcessSpecVersion::getStatus, bo.getStatus()); + lqw.orderByDesc(WmsProcessSpecVersion::getCreateTime); + return lqw; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(WmsProcessSpecVersionBo bo) { + WmsProcessSpec spec = wmsProcessSpecMapper.selectById(bo.getSpecId()); + if (spec == null) { + throw new ServiceException("规程不存在"); + } + WmsProcessSpecVersion add = BeanUtil.toBean(bo, WmsProcessSpecVersion.class); + if (add.getIsActive() == null) { + add.setIsActive(0); + } + if (StringUtils.isBlank(add.getStatus())) { + add.setStatus("DRAFT"); + } + validEntityBeforeSave(add); + boolean ok = baseMapper.insert(add) > 0; + if (ok) { + bo.setVersionId(add.getVersionId()); + if (Integer.valueOf(1).equals(add.getIsActive())) { + activateVersion(add.getVersionId()); + } + } + return ok; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(WmsProcessSpecVersionBo bo) { + WmsProcessSpecVersion exist = baseMapper.selectById(bo.getVersionId()); + if (exist == null) { + throw new ServiceException("版本不存在"); + } + WmsProcessSpecVersion update = BeanUtil.toBean(bo, WmsProcessSpecVersion.class); + validEntityBeforeSave(update); + boolean ok = baseMapper.updateById(update) > 0; + if (ok && Integer.valueOf(1).equals(update.getIsActive())) { + activateVersion(update.getVersionId()); + } + return ok; + } + + private void validEntityBeforeSave(WmsProcessSpecVersion entity) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsProcessSpecVersion::getSpecId, entity.getSpecId()); + lqw.eq(WmsProcessSpecVersion::getVersionCode, entity.getVersionCode()); + if (entity.getVersionId() != null) { + lqw.ne(WmsProcessSpecVersion::getVersionId, entity.getVersionId()); + } + if (baseMapper.selectCount(lqw) > 0) { + throw new ServiceException("同一规程下版本号已存在"); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean activateVersion(Long versionId) { + WmsProcessSpecVersion v = baseMapper.selectById(versionId); + if (v == null) { + throw new ServiceException("版本不存在"); + } + LambdaUpdateWrapper clear = Wrappers.lambdaUpdate(); + clear.eq(WmsProcessSpecVersion::getSpecId, v.getSpecId()); + clear.set(WmsProcessSpecVersion::getIsActive, 0); + baseMapper.update(null, clear); + + WmsProcessSpecVersion one = new WmsProcessSpecVersion(); + one.setVersionId(versionId); + one.setIsActive(1); + return baseMapper.updateById(one) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + for (Long versionId : ids) { + LambdaQueryWrapper pq = Wrappers.lambdaQuery(); + pq.eq(WmsProcessPlan::getVersionId, versionId); + wmsProcessPlanMapper.delete(pq); + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml new file mode 100644 index 00000000..b4e971fe --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml new file mode 100644 index 00000000..72b8a5b2 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + +