diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmInLoadController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmInLoadController.java new file mode 100644 index 0000000..96d6670 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmInLoadController.java @@ -0,0 +1,117 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsPsmInLoadBo; +import org.dromara.wms.domain.vo.WmsPsmInLoadVo; +import org.dromara.wms.service.IWmsPsmInLoadService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 装车架子信息 + * 前端访问路由地址为:/system/psmInLoad + * + * @author LionLi + * @date 2025-01-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/psmInLoad") +public class WmsPsmInLoadController extends BaseController { + + private final IWmsPsmInLoadService wmsPsmInLoadService; + + /** + * 查询装车架子信息列表 + */ + @SaCheckPermission("system:psmInLoad:list") + @GetMapping("/list") + public TableDataInfo list(WmsPsmInLoadBo bo, PageQuery pageQuery) { + return wmsPsmInLoadService.queryPageList(bo, pageQuery); + } + + /** + * 导出装车架子信息列表 + */ + @SaCheckPermission("system:psmInLoad:export") + @Log(title = "装车架子信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsPsmInLoadBo bo, HttpServletResponse response) { + List list = wmsPsmInLoadService.queryList(bo); + ExcelUtil.exportExcel(list, "装车架子信息", WmsPsmInLoadVo.class, response); + } + + /** + * 获取装车架子信息详细信息 + * + * @param inLoadId 主键 + */ + @SaCheckPermission("system:psmInLoad:query") + @GetMapping("/{inLoadId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long inLoadId) { + return R.ok(wmsPsmInLoadService.queryById(inLoadId)); + } + + /** + * 新增装车架子信息 + */ + @SaCheckPermission("system:psmInLoad:add") + @Log(title = "装车架子信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsPsmInLoadBo bo) { + return toAjax(wmsPsmInLoadService.insertByBo(bo)); + } + + /** + * 修改装车架子信息 + */ + @SaCheckPermission("system:psmInLoad:edit") + @Log(title = "装车架子信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsPsmInLoadBo bo) { + return toAjax(wmsPsmInLoadService.updateByBo(bo)); + } + + /** + * 删除装车架子信息 + * + * @param inLoadIds 主键串 + */ + @SaCheckPermission("system:psmInLoad:remove") + @Log(title = "装车架子信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{inLoadIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] inLoadIds) { + return toAjax(wmsPsmInLoadService.deleteWithValidByIds(List.of(inLoadIds), true)); + } + + + /** + * 下拉框查询装车架子信息列表 + */ + + @GetMapping("getWmsPsmInLoadList") + public R> getWmsPsmInLoadlist(WmsPsmInLoadBo bo) { + List list = wmsPsmInLoadService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmInLoadDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmInLoadDetailController.java new file mode 100644 index 0000000..d1c14ea --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmInLoadDetailController.java @@ -0,0 +1,117 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsPsmInLoadDetailBo; +import org.dromara.wms.domain.vo.WmsPsmInLoadDetailVo; +import org.dromara.wms.service.IWmsPsmInLoadDetailService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 装车架子详细信息 + * 前端访问路由地址为:/system/psmInLoadDetail + * + * @author LionLi + * @date 2025-01-15 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/psmInLoadDetail") +public class WmsPsmInLoadDetailController extends BaseController { + + private final IWmsPsmInLoadDetailService wmsPsmInLoadDetailService; + + /** + * 查询装车架子详细信息列表 + */ + @SaCheckPermission("system:psmInLoadDetail:list") + @GetMapping("/list") + public TableDataInfo list(WmsPsmInLoadDetailBo bo, PageQuery pageQuery) { + return wmsPsmInLoadDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出装车架子详细信息列表 + */ + @SaCheckPermission("system:psmInLoadDetail:export") + @Log(title = "装车架子详细信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsPsmInLoadDetailBo bo, HttpServletResponse response) { + List list = wmsPsmInLoadDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "装车架子详细信息", WmsPsmInLoadDetailVo.class, response); + } + + /** + * 获取装车架子详细信息详细信息 + * + * @param objid 主键 + */ + @SaCheckPermission("system:psmInLoadDetail:query") + @GetMapping("/{objid}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long objid) { + return R.ok(wmsPsmInLoadDetailService.queryById(objid)); + } + + /** + * 新增装车架子详细信息 + */ + @SaCheckPermission("system:psmInLoadDetail:add") + @Log(title = "装车架子详细信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsPsmInLoadDetailBo bo) { + return toAjax(wmsPsmInLoadDetailService.insertByBo(bo)); + } + + /** + * 修改装车架子详细信息 + */ + @SaCheckPermission("system:psmInLoadDetail:edit") + @Log(title = "装车架子详细信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsPsmInLoadDetailBo bo) { + return toAjax(wmsPsmInLoadDetailService.updateByBo(bo)); + } + + /** + * 删除装车架子详细信息 + * + * @param objids 主键串 + */ + @SaCheckPermission("system:psmInLoadDetail:remove") + @Log(title = "装车架子详细信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{objids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] objids) { + return toAjax(wmsPsmInLoadDetailService.deleteWithValidByIds(List.of(objids), true)); + } + + + /** + * 下拉框查询装车架子详细信息列表 + */ + + @GetMapping("getWmsPsmInLoadDetailList") + public R> getWmsPsmInLoadDetaillist(WmsPsmInLoadDetailBo bo) { + List list = wmsPsmInLoadDetailService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoad.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoad.java new file mode 100644 index 0000000..242375c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoad.java @@ -0,0 +1,100 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 装车架子信息对象 wms_psm_in_load + * + * @author LionLi + * @date 2025-01-15 + */ +@Data +@TableName("wms_psm_in_load") +public class WmsPsmInLoad { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + private Long inLoadId; + + /** + * 装车班次 + */ + private Long loadShift; + + /** + * 装车班组 + */ + private Long loadClass; + + /** + * 工装条码 + */ + private String toolingBarcode; + + /** + * 仓库名称 + */ + private String storeName; + + /** + * 库位条码 + */ + private String storePlaceCode; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 轮胎规格 + */ + private String materialSpe; + + /** + * 品级编号 + */ + private String checkGradeCode; + + /** + * 装载数量 + */ + private Long loadAmount; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + private String materialCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoadDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoadDetail.java new file mode 100644 index 0000000..5ea0764 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmInLoadDetail.java @@ -0,0 +1,80 @@ +package org.dromara.wms.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 装车架子详细信息对象 wms_psm_in_load_detail + * + * @author LionLi + * @date 2025-01-15 + */ +@Data +@TableName("wms_psm_in_load_detail") +public class WmsPsmInLoadDetail{ + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + @TableId(type = IdType.AUTO) + private Long objid; + + /** + * 外键 + */ + private Long inLoadId; + + /** + * 物料ID + */ + private Long materialId; + + /** + * 轮胎规格 + */ + private String materialSpe; + + /** + * 硫化条码 + */ + private String tyreNo; + + /** + * 品级编号 + */ + private String checkGradeCode; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadBo.java new file mode 100644 index 0000000..69283c6 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadBo.java @@ -0,0 +1,86 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsPsmInLoad; + +/** + * 装车架子信息业务对象 wms_psm_in_load + * + * @author LionLi + * @date 2025-01-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsPsmInLoad.class, reverseConvertGenerate = false) +public class WmsPsmInLoadBo extends BaseEntity { + + /** + * 表主键 + */ + @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long inLoadId; + + /** + * 装车班次 + */ + @NotNull(message = "装车班次不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long loadShift; + + /** + * 装车班组 + */ + @NotNull(message = "装车班组不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long loadClass; + + /** + * 工装条码 + */ + @NotBlank(message = "工装条码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String toolingBarcode; + + /** + * 仓库名称 + */ + @NotBlank(message = "仓库名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storeName; + + /** + * 库位条码 + */ + @NotBlank(message = "库位条码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String storePlaceCode; + + /** + * 物料ID + */ + @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 轮胎规格 + */ + @NotBlank(message = "轮胎规格不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialSpe; + + /** + * 品级编号 + */ + @NotBlank(message = "品级编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String checkGradeCode; + + /** + * 装载数量 + */ + @NotNull(message = "装载数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long loadAmount; + private String materialCode; + private String tenantId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadDetailBo.java new file mode 100644 index 0000000..ab86139 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmInLoadDetailBo.java @@ -0,0 +1,61 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsPsmInLoadDetail; + +/** + * 装车架子详细信息业务对象 wms_psm_in_load_detail + * + * @author LionLi + * @date 2025-01-15 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsPsmInLoadDetail.class, reverseConvertGenerate = false) +public class WmsPsmInLoadDetailBo extends BaseEntity { + + /** + * 表主键 + */ + @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long objid; + + /** + * 外键 + */ + @NotNull(message = "外键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long inLoadId; + + /** + * 物料ID + */ + @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 轮胎规格 + */ + @NotBlank(message = "轮胎规格不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialSpe; + + /** + * 硫化条码 + */ + @NotBlank(message = "硫化条码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String tyreNo; + + /** + * 品级编号 + */ + @NotBlank(message = "品级编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String checkGradeCode; + private String tenantId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmInLoadDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmInLoadDetailVo.java new file mode 100644 index 0000000..2ffef91 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmInLoadDetailVo.java @@ -0,0 +1,93 @@ +package org.dromara.wms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsPsmInLoadDetail; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 装车架子详细信息视图对象 wms_psm_in_load_detail + * + * @author LionLi + * @date 2025-01-15 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsPsmInLoadDetail.class) +public class WmsPsmInLoadDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + @ExcelProperty(value = "表主键") + private Long objid; + + /** + * 外键 + */ + @ExcelProperty(value = "外键") + private Long inLoadId; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 轮胎规格 + */ + @ExcelProperty(value = "轮胎规格") + private String materialSpe; + + /** + * 硫化条码 + */ + @ExcelProperty(value = "硫化条码") + private String tyreNo; + + /** + * 品级编号 + */ + @ExcelProperty(value = "品级编号") + private String checkGradeCode; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmInLoadVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmInLoadVo.java new file mode 100644 index 0000000..0b9c5d9 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmInLoadVo.java @@ -0,0 +1,117 @@ +package org.dromara.wms.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import org.dromara.wms.domain.WmsPsmInLoad; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 装车架子信息视图对象 wms_psm_in_load + * + * @author LionLi + * @date 2025-01-15 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsPsmInLoad.class) +public class WmsPsmInLoadVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + @ExcelProperty(value = "表主键") + private Long inLoadId; + + /** + * 装车班次 + */ + @ExcelProperty(value = "装车班次") + private Long loadShift; + + /** + * 装车班组 + */ + @ExcelProperty(value = "装车班组") + private Long loadClass; + + /** + * 工装条码 + */ + @ExcelProperty(value = "工装条码") + private String toolingBarcode; + + /** + * 仓库名称 + */ + @ExcelProperty(value = "仓库名称") + private String storeName; + + /** + * 库位条码 + */ + @ExcelProperty(value = "库位条码") + private String storePlaceCode; + + /** + * 物料ID + */ + @ExcelProperty(value = "物料ID") + private Long materialId; + + /** + * 轮胎规格 + */ + @ExcelProperty(value = "轮胎规格") + private String materialSpe; + + /** + * 品级编号 + */ + @ExcelProperty(value = "品级编号") + private String checkGradeCode; + + /** + * 装载数量 + */ + @ExcelProperty(value = "装载数量") + private Long loadAmount; + /** + * 租户id + */ + private String tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + private String materialCode; +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadDetailMapper.java new file mode 100644 index 0000000..1fad44a --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsPsmInLoadDetail; +import org.dromara.wms.domain.vo.WmsPsmInLoadDetailVo; + +/** + * 装车架子详细信息Mapper接口 + * + * @author LionLi + * @date 2025-01-15 + */ +public interface WmsPsmInLoadDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadMapper.java new file mode 100644 index 0000000..9cf8671 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmInLoadMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsPsmInLoad; +import org.dromara.wms.domain.vo.WmsPsmInLoadVo; + +/** + * 装车架子信息Mapper接口 + * + * @author LionLi + * @date 2025-01-15 + */ +public interface WmsPsmInLoadMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmInLoadDetailService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmInLoadDetailService.java new file mode 100644 index 0000000..b7ae963 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmInLoadDetailService.java @@ -0,0 +1,68 @@ +package org.dromara.wms.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsPsmInLoadDetailBo; +import org.dromara.wms.domain.vo.WmsPsmInLoadDetailVo; + +import java.util.Collection; +import java.util.List; + +/** + * 装车架子详细信息Service接口 + * + * @author LionLi + * @date 2025-01-15 + */ +public interface IWmsPsmInLoadDetailService { + + /** + * 查询装车架子详细信息 + * + * @param objid 主键 + * @return 装车架子详细信息 + */ + WmsPsmInLoadDetailVo queryById(Long objid); + + /** + * 分页查询装车架子详细信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 装车架子详细信息分页列表 + */ + TableDataInfo queryPageList(WmsPsmInLoadDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的装车架子详细信息列表 + * + * @param bo 查询条件 + * @return 装车架子详细信息列表 + */ + List queryList(WmsPsmInLoadDetailBo bo); + + /** + * 新增装车架子详细信息 + * + * @param bo 装车架子详细信息 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsPsmInLoadDetailBo bo); + + /** + * 修改装车架子详细信息 + * + * @param bo 装车架子详细信息 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsPsmInLoadDetailBo bo); + + /** + * 校验并批量删除装车架子详细信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmInLoadService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmInLoadService.java new file mode 100644 index 0000000..8035796 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmInLoadService.java @@ -0,0 +1,68 @@ +package org.dromara.wms.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsPsmInLoadBo; +import org.dromara.wms.domain.vo.WmsPsmInLoadVo; + +import java.util.Collection; +import java.util.List; + +/** + * 装车架子信息Service接口 + * + * @author LionLi + * @date 2025-01-15 + */ +public interface IWmsPsmInLoadService { + + /** + * 查询装车架子信息 + * + * @param inLoadId 主键 + * @return 装车架子信息 + */ + WmsPsmInLoadVo queryById(Long inLoadId); + + /** + * 分页查询装车架子信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 装车架子信息分页列表 + */ + TableDataInfo queryPageList(WmsPsmInLoadBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的装车架子信息列表 + * + * @param bo 查询条件 + * @return 装车架子信息列表 + */ + List queryList(WmsPsmInLoadBo bo); + + /** + * 新增装车架子信息 + * + * @param bo 装车架子信息 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsPsmInLoadBo bo); + + /** + * 修改装车架子信息 + * + * @param bo 装车架子信息 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsPsmInLoadBo bo); + + /** + * 校验并批量删除装车架子信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmInLoadDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmInLoadDetailServiceImpl.java new file mode 100644 index 0000000..cedc10c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmInLoadDetailServiceImpl.java @@ -0,0 +1,137 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsPsmInLoadDetail; +import org.dromara.wms.domain.bo.WmsPsmInLoadDetailBo; +import org.dromara.wms.domain.vo.WmsPsmInLoadDetailVo; +import org.dromara.wms.mapper.WmsPsmInLoadDetailMapper; +import org.dromara.wms.service.IWmsPsmInLoadDetailService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 装车架子详细信息Service业务层处理 + * + * @author LionLi + * @date 2025-01-15 + */ +@RequiredArgsConstructor +@Service +public class WmsPsmInLoadDetailServiceImpl implements IWmsPsmInLoadDetailService { + + private final WmsPsmInLoadDetailMapper baseMapper; + + /** + * 查询装车架子详细信息 + * + * @param objid 主键 + * @return 装车架子详细信息 + */ + @Override + public WmsPsmInLoadDetailVo queryById(Long objid){ + return baseMapper.selectVoById(objid); + } + + /** + * 分页查询装车架子详细信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 装车架子详细信息分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsPsmInLoadDetailBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的装车架子详细信息列表 + * + * @param bo 查询条件 + * @return 装车架子详细信息列表 + */ + @Override + public List queryList(WmsPsmInLoadDetailBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsPsmInLoadDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsPsmInLoadDetail.class) + .selectAll(WmsPsmInLoadDetail.class) + .eq(bo.getObjid() != null, WmsPsmInLoadDetail::getObjid, bo.getObjid()) + .eq(bo.getInLoadId() != null, WmsPsmInLoadDetail::getInLoadId, bo.getInLoadId()) + .eq(bo.getMaterialId() != null, WmsPsmInLoadDetail::getMaterialId, bo.getMaterialId()) + .eq(StringUtils.isNotBlank(bo.getMaterialSpe()), WmsPsmInLoadDetail::getMaterialSpe, bo.getMaterialSpe()) + .eq(StringUtils.isNotBlank(bo.getTyreNo()), WmsPsmInLoadDetail::getTyreNo, bo.getTyreNo()) + .eq(StringUtils.isNotBlank(bo.getCheckGradeCode()), WmsPsmInLoadDetail::getCheckGradeCode, bo.getCheckGradeCode()) + .orderByDesc(WmsPsmInLoadDetail::getCreateTime); + return lqw; + } + + /** + * 新增装车架子详细信息 + * + * @param bo 装车架子详细信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsPsmInLoadDetailBo bo) { + WmsPsmInLoadDetail add = MapstructUtils.convert(bo, WmsPsmInLoadDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setObjid(add.getObjid()); + } + return flag; + } + + /** + * 修改装车架子详细信息 + * + * @param bo 装车架子详细信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsPsmInLoadDetailBo bo) { + WmsPsmInLoadDetail update = MapstructUtils.convert(bo, WmsPsmInLoadDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsPsmInLoadDetail entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除装车架子详细信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmInLoadServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmInLoadServiceImpl.java new file mode 100644 index 0000000..a9d7f2b --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmInLoadServiceImpl.java @@ -0,0 +1,141 @@ +package org.dromara.wms.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsPsmInLoad; +import org.dromara.wms.domain.bo.WmsPsmInLoadBo; +import org.dromara.wms.domain.vo.WmsPsmInLoadVo; +import org.dromara.wms.mapper.WmsPsmInLoadMapper; +import org.dromara.wms.service.IWmsPsmInLoadService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 装车架子信息Service业务层处理 + * + * @author LionLi + * @date 2025-01-15 + */ +@RequiredArgsConstructor +@Service +public class WmsPsmInLoadServiceImpl implements IWmsPsmInLoadService { + + private final WmsPsmInLoadMapper baseMapper; + + /** + * 查询装车架子信息 + * + * @param inLoadId 主键 + * @return 装车架子信息 + */ + @Override + public WmsPsmInLoadVo queryById(Long inLoadId){ + return baseMapper.selectVoById(inLoadId); + } + + /** + * 分页查询装车架子信息列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 装车架子信息分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsPsmInLoadBo bo, PageQuery pageQuery) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的装车架子信息列表 + * + * @param bo 查询条件 + * @return 装车架子信息列表 + */ + @Override + public List queryList(WmsPsmInLoadBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsPsmInLoadBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsPsmInLoad.class) + .selectAll(WmsPsmInLoad.class) + .eq(bo.getInLoadId() != null, WmsPsmInLoad::getInLoadId, bo.getInLoadId()) + .eq(bo.getLoadShift() != null, WmsPsmInLoad::getLoadShift, bo.getLoadShift()) + .eq(bo.getLoadClass() != null, WmsPsmInLoad::getLoadClass, bo.getLoadClass()) + .eq(StringUtils.isNotBlank(bo.getToolingBarcode()), WmsPsmInLoad::getToolingBarcode, bo.getToolingBarcode()) + .like(StringUtils.isNotBlank(bo.getStoreName()), WmsPsmInLoad::getStoreName, bo.getStoreName()) + .eq(StringUtils.isNotBlank(bo.getStorePlaceCode()), WmsPsmInLoad::getStorePlaceCode, bo.getStorePlaceCode()) + .eq(bo.getMaterialId() != null, WmsPsmInLoad::getMaterialId, bo.getMaterialId()) + .eq(StringUtils.isNotBlank(bo.getMaterialSpe()), WmsPsmInLoad::getMaterialSpe, bo.getMaterialSpe()) + .eq(StringUtils.isNotBlank(bo.getCheckGradeCode()), WmsPsmInLoad::getCheckGradeCode, bo.getCheckGradeCode()) + .eq(bo.getLoadAmount() != null, WmsPsmInLoad::getLoadAmount, bo.getLoadAmount()) + .orderByDesc(WmsPsmInLoad::getCreateTime); + return lqw; + } + + /** + * 新增装车架子信息 + * + * @param bo 装车架子信息 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsPsmInLoadBo bo) { + WmsPsmInLoad add = MapstructUtils.convert(bo, WmsPsmInLoad.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInLoadId(add.getInLoadId()); + } + return flag; + } + + /** + * 修改装车架子信息 + * + * @param bo 装车架子信息 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsPsmInLoadBo bo) { + WmsPsmInLoad update = MapstructUtils.convert(bo, WmsPsmInLoad.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsPsmInLoad entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除装车架子信息信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInLoadDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInLoadDetailMapper.xml new file mode 100644 index 0000000..5d56f6c --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInLoadDetailMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInLoadMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInLoadMapper.xml new file mode 100644 index 0000000..329f6b5 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmInLoadMapper.xml @@ -0,0 +1,7 @@ + + + + +