feat(wms): 添加生产任务和产品规范相关功能
- 新增生产任务管理功能,包括查询、新增、修改、删除等操作- 新增产品规范组管理功能,包括查询、新增、修改、删除等操作 - 新增产品规范(键值对模式)管理功能,包括查询、新增、修改、删除等操作 - 添加相关实体类、业务对象、视图对象、Mapper接口和XML文件
This commit is contained in:
@@ -0,0 +1,99 @@
|
||||
package com.klp.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
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.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.vo.WmsProductSpecVo;
|
||||
import com.klp.domain.bo.WmsProductSpecBo;
|
||||
import com.klp.service.IWmsProductSpecService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 产品规范(键值对模式)
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/klp/productSpec")
|
||||
public class WmsProductSpecController extends BaseController {
|
||||
|
||||
private final IWmsProductSpecService iWmsProductSpecService;
|
||||
|
||||
/**
|
||||
* 查询产品规范(键值对模式)列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsProductSpecVo> list(WmsProductSpecBo bo, PageQuery pageQuery) {
|
||||
return iWmsProductSpecService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出产品规范(键值对模式)列表
|
||||
*/
|
||||
@Log(title = "产品规范(键值对模式)", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsProductSpecBo bo, HttpServletResponse response) {
|
||||
List<WmsProductSpecVo> list = iWmsProductSpecService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "产品规范(键值对模式)", WmsProductSpecVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取产品规范(键值对模式)详细信息
|
||||
*
|
||||
* @param specId 主键
|
||||
*/
|
||||
@GetMapping("/{specId}")
|
||||
public R<WmsProductSpecVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long specId) {
|
||||
return R.ok(iWmsProductSpecService.queryById(specId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增产品规范(键值对模式)
|
||||
*/
|
||||
@Log(title = "产品规范(键值对模式)", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsProductSpecBo bo) {
|
||||
return toAjax(iWmsProductSpecService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改产品规范(键值对模式)
|
||||
*/
|
||||
@Log(title = "产品规范(键值对模式)", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsProductSpecBo bo) {
|
||||
return toAjax(iWmsProductSpecService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除产品规范(键值对模式)
|
||||
*
|
||||
* @param specIds 主键串
|
||||
*/
|
||||
@Log(title = "产品规范(键值对模式)", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{specIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] specIds) {
|
||||
return toAjax(iWmsProductSpecService.deleteWithValidByIds(Arrays.asList(specIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
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.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.vo.WmsProductSpecGroupVo;
|
||||
import com.klp.domain.bo.WmsProductSpecGroupBo;
|
||||
import com.klp.service.IWmsProductSpecGroupService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 产品规范组
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/klp/productSpecGroup")
|
||||
public class WmsProductSpecGroupController extends BaseController {
|
||||
|
||||
private final IWmsProductSpecGroupService iWmsProductSpecGroupService;
|
||||
|
||||
/**
|
||||
* 查询产品规范组列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsProductSpecGroupVo> list(WmsProductSpecGroupBo bo, PageQuery pageQuery) {
|
||||
return iWmsProductSpecGroupService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出产品规范组列表
|
||||
*/
|
||||
@Log(title = "产品规范组", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsProductSpecGroupBo bo, HttpServletResponse response) {
|
||||
List<WmsProductSpecGroupVo> list = iWmsProductSpecGroupService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "产品规范组", WmsProductSpecGroupVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取产品规范组详细信息
|
||||
*
|
||||
* @param groupId 主键
|
||||
*/
|
||||
@GetMapping("/{groupId}")
|
||||
public R<WmsProductSpecGroupVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long groupId) {
|
||||
return R.ok(iWmsProductSpecGroupService.queryById(groupId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增产品规范组
|
||||
*/
|
||||
@Log(title = "产品规范组", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsProductSpecGroupBo bo) {
|
||||
return toAjax(iWmsProductSpecGroupService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改产品规范组
|
||||
*/
|
||||
@Log(title = "产品规范组", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsProductSpecGroupBo bo) {
|
||||
return toAjax(iWmsProductSpecGroupService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除产品规范组
|
||||
*
|
||||
* @param groupIds 主键串
|
||||
*/
|
||||
@Log(title = "产品规范组", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{groupIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] groupIds) {
|
||||
return toAjax(iWmsProductSpecGroupService.deleteWithValidByIds(Arrays.asList(groupIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.klp.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
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.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.vo.WmsProductionTaskVo;
|
||||
import com.klp.domain.bo.WmsProductionTaskBo;
|
||||
import com.klp.service.IWmsProductionTaskService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 生产任务
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/klp/productionTask")
|
||||
public class WmsProductionTaskController extends BaseController {
|
||||
|
||||
private final IWmsProductionTaskService iWmsProductionTaskService;
|
||||
|
||||
/**
|
||||
* 查询生产任务列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsProductionTaskVo> list(WmsProductionTaskBo bo, PageQuery pageQuery) {
|
||||
return iWmsProductionTaskService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出生产任务列表
|
||||
*/
|
||||
@Log(title = "生产任务", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsProductionTaskBo bo, HttpServletResponse response) {
|
||||
List<WmsProductionTaskVo> list = iWmsProductionTaskService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "生产任务", WmsProductionTaskVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取生产任务详细信息
|
||||
*
|
||||
* @param taskId 主键
|
||||
*/
|
||||
@GetMapping("/{taskId}")
|
||||
public R<WmsProductionTaskVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long taskId) {
|
||||
return R.ok(iWmsProductionTaskService.queryById(taskId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产任务
|
||||
*/
|
||||
@Log(title = "生产任务", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsProductionTaskBo bo) {
|
||||
return toAjax(iWmsProductionTaskService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产任务
|
||||
*/
|
||||
@Log(title = "生产任务", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsProductionTaskBo bo) {
|
||||
return toAjax(iWmsProductionTaskService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除生产任务
|
||||
*
|
||||
* @param taskIds 主键串
|
||||
*/
|
||||
@Log(title = "生产任务", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{taskIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] taskIds) {
|
||||
return toAjax(iWmsProductionTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true));
|
||||
}
|
||||
}
|
||||
49
klp-wms/src/main/java/com/klp/domain/WmsProductSpec.java
Normal file
49
klp-wms/src/main/java/com/klp/domain/WmsProductSpec.java
Normal file
@@ -0,0 +1,49 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
/**
|
||||
* 产品规范(键值对模式)对象 wms_product_spec
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_product_spec")
|
||||
public class WmsProductSpec extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(value = "spec_id")
|
||||
private Long specId;
|
||||
/**
|
||||
* 所属产品规范组ID
|
||||
*/
|
||||
private Long groupId;
|
||||
/**
|
||||
* 规范键
|
||||
*/
|
||||
private String specKey;
|
||||
/**
|
||||
* 规范值
|
||||
*/
|
||||
private String specValue;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标志(0=正常,1=删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
/**
|
||||
* 产品规范组对象 wms_product_spec_group
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_product_spec_group")
|
||||
public class WmsProductSpecGroup extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(value = "group_id")
|
||||
private Long groupId;
|
||||
/**
|
||||
* 产品规范组编码
|
||||
*/
|
||||
private String groupCode;
|
||||
/**
|
||||
* 绑定的产品ID
|
||||
*/
|
||||
private Long productId;
|
||||
/**
|
||||
* 产品规范组名称
|
||||
*/
|
||||
private String groupName;
|
||||
/**
|
||||
* 状态(字典:1=启用,2=停用)
|
||||
*/
|
||||
private Long status;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标志(0=正常,1=删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
65
klp-wms/src/main/java/com/klp/domain/WmsProductionTask.java
Normal file
65
klp-wms/src/main/java/com/klp/domain/WmsProductionTask.java
Normal file
@@ -0,0 +1,65 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
/**
|
||||
* 生产任务对象 wms_production_task
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_production_task")
|
||||
public class WmsProductionTask extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(value = "task_id")
|
||||
private Long taskId;
|
||||
/**
|
||||
* 产品规范组ID
|
||||
*/
|
||||
private Long productSpecGroupId;
|
||||
/**
|
||||
* 制造规范ID
|
||||
*/
|
||||
private Long manufacturingSpecId;
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
private Long orderId;
|
||||
/**
|
||||
* 订单明细ID
|
||||
*/
|
||||
private Long orderItemId;
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
private String planName;
|
||||
/**
|
||||
* 计划编号
|
||||
*/
|
||||
private String planCode;
|
||||
/**
|
||||
* 状态(字典:0=未开始,1=进行中,2=完成,3=暂停,4=取消)
|
||||
*/
|
||||
private Long status;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标志(0=正常,1=删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
||||
/**
|
||||
* 产品规范(键值对模式)业务对象 wms_product_spec
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsProductSpecBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
private Long specId;
|
||||
|
||||
/**
|
||||
* 所属产品规范组ID
|
||||
*/
|
||||
private Long groupId;
|
||||
|
||||
/**
|
||||
* 规范键
|
||||
*/
|
||||
private String specKey;
|
||||
|
||||
/**
|
||||
* 规范值
|
||||
*/
|
||||
private String specValue;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
||||
/**
|
||||
* 产品规范组业务对象 wms_product_spec_group
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsProductSpecGroupBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
private Long groupId;
|
||||
|
||||
/**
|
||||
* 产品规范组编码
|
||||
*/
|
||||
private String groupCode;
|
||||
|
||||
/**
|
||||
* 绑定的产品ID
|
||||
*/
|
||||
private Long productId;
|
||||
|
||||
/**
|
||||
* 产品规范组名称
|
||||
*/
|
||||
private String groupName;
|
||||
|
||||
/**
|
||||
* 状态(字典:1=启用,2=停用)
|
||||
*/
|
||||
private Long status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
||||
/**
|
||||
* 生产任务业务对象 wms_production_task
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsProductionTaskBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 产品规范组ID
|
||||
*/
|
||||
private Long productSpecGroupId;
|
||||
|
||||
/**
|
||||
* 制造规范ID
|
||||
*/
|
||||
private Long manufacturingSpecId;
|
||||
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 订单明细ID
|
||||
*/
|
||||
private Long orderItemId;
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 计划编号
|
||||
*/
|
||||
private String planCode;
|
||||
|
||||
/**
|
||||
* 状态(字典:0=未开始,1=进行中,2=完成,3=暂停,4=取消)
|
||||
*/
|
||||
private Long status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 产品规范组视图对象 wms_product_spec_group
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsProductSpecGroupVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ExcelProperty(value = "主键")
|
||||
private Long groupId;
|
||||
|
||||
/**
|
||||
* 产品规范组编码
|
||||
*/
|
||||
@ExcelProperty(value = "产品规范组编码")
|
||||
private String groupCode;
|
||||
|
||||
/**
|
||||
* 绑定的产品ID
|
||||
*/
|
||||
@ExcelProperty(value = "绑定的产品ID")
|
||||
private Long productId;
|
||||
|
||||
/**
|
||||
* 产品规范组名称
|
||||
*/
|
||||
@ExcelProperty(value = "产品规范组名称")
|
||||
private String groupName;
|
||||
|
||||
/**
|
||||
* 状态(字典:1=启用,2=停用)
|
||||
*/
|
||||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "字=典:1=启用,2=停用")
|
||||
private Long status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 产品规范(键值对模式)视图对象 wms_product_spec
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsProductSpecVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ExcelProperty(value = "主键")
|
||||
private Long specId;
|
||||
|
||||
/**
|
||||
* 所属产品规范组ID
|
||||
*/
|
||||
@ExcelProperty(value = "所属产品规范组ID")
|
||||
private Long groupId;
|
||||
|
||||
/**
|
||||
* 规范键
|
||||
*/
|
||||
@ExcelProperty(value = "规范键")
|
||||
private String specKey;
|
||||
|
||||
/**
|
||||
* 规范值
|
||||
*/
|
||||
@ExcelProperty(value = "规范值")
|
||||
private String specValue;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,78 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 生产任务视图对象 wms_production_task
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsProductionTaskVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ExcelProperty(value = "主键")
|
||||
private Long taskId;
|
||||
|
||||
/**
|
||||
* 产品规范组ID
|
||||
*/
|
||||
@ExcelProperty(value = "产品规范组ID")
|
||||
private Long productSpecGroupId;
|
||||
|
||||
/**
|
||||
* 制造规范ID
|
||||
*/
|
||||
@ExcelProperty(value = "制造规范ID")
|
||||
private Long manufacturingSpecId;
|
||||
|
||||
/**
|
||||
* 订单ID
|
||||
*/
|
||||
@ExcelProperty(value = "订单ID")
|
||||
private Long orderId;
|
||||
|
||||
/**
|
||||
* 订单明细ID
|
||||
*/
|
||||
@ExcelProperty(value = "订单明细ID")
|
||||
private Long orderItemId;
|
||||
|
||||
/**
|
||||
* 计划名称
|
||||
*/
|
||||
@ExcelProperty(value = "计划名称")
|
||||
private String planName;
|
||||
|
||||
/**
|
||||
* 计划编号
|
||||
*/
|
||||
@ExcelProperty(value = "计划编号")
|
||||
private String planCode;
|
||||
|
||||
/**
|
||||
* 状态(字典:0=未开始,1=进行中,2=完成,3=暂停,4=取消)
|
||||
*/
|
||||
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "字=典:0=未开始,1=进行中,2=完成,3=暂停,4=取消")
|
||||
private Long status;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.klp.domain.WmsProductSpecGroup;
|
||||
import com.klp.domain.vo.WmsProductSpecGroupVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 产品规范组Mapper接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
public interface WmsProductSpecGroupMapper extends BaseMapperPlus<WmsProductSpecGroupMapper, WmsProductSpecGroup, WmsProductSpecGroupVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.klp.domain.WmsProductSpec;
|
||||
import com.klp.domain.vo.WmsProductSpecVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 产品规范(键值对模式)Mapper接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
public interface WmsProductSpecMapper extends BaseMapperPlus<WmsProductSpecMapper, WmsProductSpec, WmsProductSpecVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.klp.domain.WmsProductionTask;
|
||||
import com.klp.domain.vo.WmsProductionTaskVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 生产任务Mapper接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
public interface WmsProductionTaskMapper extends BaseMapperPlus<WmsProductionTaskMapper, WmsProductionTask, WmsProductionTaskVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsProductSpecGroup;
|
||||
import com.klp.domain.vo.WmsProductSpecGroupVo;
|
||||
import com.klp.domain.bo.WmsProductSpecGroupBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 产品规范组Service接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
public interface IWmsProductSpecGroupService {
|
||||
|
||||
/**
|
||||
* 查询产品规范组
|
||||
*/
|
||||
WmsProductSpecGroupVo queryById(Long groupId);
|
||||
|
||||
/**
|
||||
* 查询产品规范组列表
|
||||
*/
|
||||
TableDataInfo<WmsProductSpecGroupVo> queryPageList(WmsProductSpecGroupBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询产品规范组列表
|
||||
*/
|
||||
List<WmsProductSpecGroupVo> queryList(WmsProductSpecGroupBo bo);
|
||||
|
||||
/**
|
||||
* 新增产品规范组
|
||||
*/
|
||||
Boolean insertByBo(WmsProductSpecGroupBo bo);
|
||||
|
||||
/**
|
||||
* 修改产品规范组
|
||||
*/
|
||||
Boolean updateByBo(WmsProductSpecGroupBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除产品规范组信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsProductSpec;
|
||||
import com.klp.domain.vo.WmsProductSpecVo;
|
||||
import com.klp.domain.bo.WmsProductSpecBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 产品规范(键值对模式)Service接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
public interface IWmsProductSpecService {
|
||||
|
||||
/**
|
||||
* 查询产品规范(键值对模式)
|
||||
*/
|
||||
WmsProductSpecVo queryById(Long specId);
|
||||
|
||||
/**
|
||||
* 查询产品规范(键值对模式)列表
|
||||
*/
|
||||
TableDataInfo<WmsProductSpecVo> queryPageList(WmsProductSpecBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询产品规范(键值对模式)列表
|
||||
*/
|
||||
List<WmsProductSpecVo> queryList(WmsProductSpecBo bo);
|
||||
|
||||
/**
|
||||
* 新增产品规范(键值对模式)
|
||||
*/
|
||||
Boolean insertByBo(WmsProductSpecBo bo);
|
||||
|
||||
/**
|
||||
* 修改产品规范(键值对模式)
|
||||
*/
|
||||
Boolean updateByBo(WmsProductSpecBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除产品规范(键值对模式)信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsProductionTask;
|
||||
import com.klp.domain.vo.WmsProductionTaskVo;
|
||||
import com.klp.domain.bo.WmsProductionTaskBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 生产任务Service接口
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
public interface IWmsProductionTaskService {
|
||||
|
||||
/**
|
||||
* 查询生产任务
|
||||
*/
|
||||
WmsProductionTaskVo queryById(Long taskId);
|
||||
|
||||
/**
|
||||
* 查询生产任务列表
|
||||
*/
|
||||
TableDataInfo<WmsProductionTaskVo> queryPageList(WmsProductionTaskBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询生产任务列表
|
||||
*/
|
||||
List<WmsProductionTaskVo> queryList(WmsProductionTaskBo bo);
|
||||
|
||||
/**
|
||||
* 新增生产任务
|
||||
*/
|
||||
Boolean insertByBo(WmsProductionTaskBo bo);
|
||||
|
||||
/**
|
||||
* 修改生产任务
|
||||
*/
|
||||
Boolean updateByBo(WmsProductionTaskBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除生产任务信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsProductSpecGroupBo;
|
||||
import com.klp.domain.vo.WmsProductSpecGroupVo;
|
||||
import com.klp.domain.WmsProductSpecGroup;
|
||||
import com.klp.mapper.WmsProductSpecGroupMapper;
|
||||
import com.klp.service.IWmsProductSpecGroupService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 产品规范组Service业务层处理
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsProductSpecGroupServiceImpl implements IWmsProductSpecGroupService {
|
||||
|
||||
private final WmsProductSpecGroupMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询产品规范组
|
||||
*/
|
||||
@Override
|
||||
public WmsProductSpecGroupVo queryById(Long groupId){
|
||||
return baseMapper.selectVoById(groupId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询产品规范组列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsProductSpecGroupVo> queryPageList(WmsProductSpecGroupBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsProductSpecGroup> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsProductSpecGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询产品规范组列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsProductSpecGroupVo> queryList(WmsProductSpecGroupBo bo) {
|
||||
LambdaQueryWrapper<WmsProductSpecGroup> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsProductSpecGroup> buildQueryWrapper(WmsProductSpecGroupBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsProductSpecGroup> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getGroupCode()), WmsProductSpecGroup::getGroupCode, bo.getGroupCode());
|
||||
lqw.eq(bo.getProductId() != null, WmsProductSpecGroup::getProductId, bo.getProductId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getGroupName()), WmsProductSpecGroup::getGroupName, bo.getGroupName());
|
||||
lqw.eq(bo.getStatus() != null, WmsProductSpecGroup::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增产品规范组
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsProductSpecGroupBo bo) {
|
||||
WmsProductSpecGroup add = BeanUtil.toBean(bo, WmsProductSpecGroup.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setGroupId(add.getGroupId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改产品规范组
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsProductSpecGroupBo bo) {
|
||||
WmsProductSpecGroup update = BeanUtil.toBean(bo, WmsProductSpecGroup.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsProductSpecGroup entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除产品规范组
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsProductSpecBo;
|
||||
import com.klp.domain.vo.WmsProductSpecVo;
|
||||
import com.klp.domain.WmsProductSpec;
|
||||
import com.klp.mapper.WmsProductSpecMapper;
|
||||
import com.klp.service.IWmsProductSpecService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 产品规范(键值对模式)Service业务层处理
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsProductSpecServiceImpl implements IWmsProductSpecService {
|
||||
|
||||
private final WmsProductSpecMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询产品规范(键值对模式)
|
||||
*/
|
||||
@Override
|
||||
public WmsProductSpecVo queryById(Long specId){
|
||||
return baseMapper.selectVoById(specId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询产品规范(键值对模式)列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsProductSpecVo> queryPageList(WmsProductSpecBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsProductSpec> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsProductSpecVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询产品规范(键值对模式)列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsProductSpecVo> queryList(WmsProductSpecBo bo) {
|
||||
LambdaQueryWrapper<WmsProductSpec> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsProductSpec> buildQueryWrapper(WmsProductSpecBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsProductSpec> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getGroupId() != null, WmsProductSpec::getGroupId, bo.getGroupId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecKey()), WmsProductSpec::getSpecKey, bo.getSpecKey());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecValue()), WmsProductSpec::getSpecValue, bo.getSpecValue());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增产品规范(键值对模式)
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsProductSpecBo bo) {
|
||||
WmsProductSpec add = BeanUtil.toBean(bo, WmsProductSpec.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setSpecId(add.getSpecId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改产品规范(键值对模式)
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsProductSpecBo bo) {
|
||||
WmsProductSpec update = BeanUtil.toBean(bo, WmsProductSpec.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsProductSpec entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除产品规范(键值对模式)
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,115 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsProductionTaskBo;
|
||||
import com.klp.domain.vo.WmsProductionTaskVo;
|
||||
import com.klp.domain.WmsProductionTask;
|
||||
import com.klp.mapper.WmsProductionTaskMapper;
|
||||
import com.klp.service.IWmsProductionTaskService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 生产任务Service业务层处理
|
||||
*
|
||||
* @author Joshi
|
||||
* @date 2025-08-26
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsProductionTaskServiceImpl implements IWmsProductionTaskService {
|
||||
|
||||
private final WmsProductionTaskMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询生产任务
|
||||
*/
|
||||
@Override
|
||||
public WmsProductionTaskVo queryById(Long taskId){
|
||||
return baseMapper.selectVoById(taskId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产任务列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsProductionTaskVo> queryPageList(WmsProductionTaskBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsProductionTask> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsProductionTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询生产任务列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsProductionTaskVo> queryList(WmsProductionTaskBo bo) {
|
||||
LambdaQueryWrapper<WmsProductionTask> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsProductionTask> buildQueryWrapper(WmsProductionTaskBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsProductionTask> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getProductSpecGroupId() != null, WmsProductionTask::getProductSpecGroupId, bo.getProductSpecGroupId());
|
||||
lqw.eq(bo.getManufacturingSpecId() != null, WmsProductionTask::getManufacturingSpecId, bo.getManufacturingSpecId());
|
||||
lqw.eq(bo.getOrderId() != null, WmsProductionTask::getOrderId, bo.getOrderId());
|
||||
lqw.eq(bo.getOrderItemId() != null, WmsProductionTask::getOrderItemId, bo.getOrderItemId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), WmsProductionTask::getPlanName, bo.getPlanName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getPlanCode()), WmsProductionTask::getPlanCode, bo.getPlanCode());
|
||||
lqw.eq(bo.getStatus() != null, WmsProductionTask::getStatus, bo.getStatus());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增生产任务
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsProductionTaskBo bo) {
|
||||
WmsProductionTask add = BeanUtil.toBean(bo, WmsProductionTask.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setTaskId(add.getTaskId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改生产任务
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsProductionTaskBo bo) {
|
||||
WmsProductionTask update = BeanUtil.toBean(bo, WmsProductionTask.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsProductionTask entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除生产任务
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.mapper.WmsProductSpecGroupMapper">
|
||||
|
||||
<resultMap type="com.klp.domain.WmsProductSpecGroup" id="WmsProductSpecGroupResult">
|
||||
<result property="groupId" column="group_id"/>
|
||||
<result property="groupCode" column="group_code"/>
|
||||
<result property="productId" column="product_id"/>
|
||||
<result property="groupName" column="group_name"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,21 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.mapper.WmsProductSpecMapper">
|
||||
|
||||
<resultMap type="com.klp.domain.WmsProductSpec" id="WmsProductSpecResult">
|
||||
<result property="specId" column="spec_id"/>
|
||||
<result property="groupId" column="group_id"/>
|
||||
<result property="specKey" column="spec_key"/>
|
||||
<result property="specValue" column="spec_value"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.mapper.WmsProductionTaskMapper">
|
||||
|
||||
<resultMap type="com.klp.domain.WmsProductionTask" id="WmsProductionTaskResult">
|
||||
<result property="taskId" column="task_id"/>
|
||||
<result property="productSpecGroupId" column="product_spec_group_id"/>
|
||||
<result property="manufacturingSpecId" column="manufacturing_spec_id"/>
|
||||
<result property="orderId" column="order_id"/>
|
||||
<result property="orderItemId" column="order_item_id"/>
|
||||
<result property="planName" column="plan_name"/>
|
||||
<result property="planCode" column="plan_code"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user