xins
/
hwmom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加 库区

Browse Source
master
wanghao 3 months ago
parent dc379f5ef6
commit b884019459
10 changed files with 160 additions and 196 deletions
Show Stats Download Patch File Download Diff File

58
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmStoreTypeController.java
Unescape Escape View File

@ -6,9 +6,6 @@ import lombok.RequiredArgsConstructor;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.wms.domain.bo.WmsPsmStoreTypeBo;
import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo;
import org.dromara.wms.service.IWmsPsmStoreTypeService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.idempotent.annotation.RepeatSubmit;
@ -20,14 +17,17 @@ import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType; import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo;
import org.dromara.wms.domain.bo.WmsPsmStoreTypeBo;
import org.dromara.wms.service.IWmsPsmStoreTypeService;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
/** /**
* 成品仓库类型 * 成品库区
* 前端访问路由地址为:/system/psmStoreType * 前端访问路由地址为:/wms/psmStoreType
* *
* @author LionLi * @author Yinq
* @date 2025-01-15 * @date 2025-04-08
*/ */
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@ -38,31 +38,31 @@ public class WmsPsmStoreTypeController extends BaseController {
private final IWmsPsmStoreTypeService wmsPsmStoreTypeService; private final IWmsPsmStoreTypeService wmsPsmStoreTypeService;
/** /**
* 查询成品仓库类型列表 * 查询成品库区列表
*/ */
@SaCheckPermission("system:psmStoreType:list") @SaCheckPermission("wms:psmStoreType:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<WmsPsmStoreTypeVo> list(WmsPsmStoreTypeBo bo, PageQuery pageQuery) { public TableDataInfo<WmsPsmStoreTypeVo> list(WmsPsmStoreTypeBo bo, PageQuery pageQuery) {
return wmsPsmStoreTypeService.queryPageList(bo, pageQuery); return wmsPsmStoreTypeService.queryPageList(bo, pageQuery);
} }
/** /**
* 导出成品仓库类型列表 * 导出成品库区列表
*/ */
@SaCheckPermission("system:psmStoreType:export") @SaCheckPermission("wms:psmStoreType:export")
@Log(title = "成品仓库类型", businessType = BusinessType.EXPORT) @Log(title = "成品库区", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(WmsPsmStoreTypeBo bo, HttpServletResponse response) { public void export(WmsPsmStoreTypeBo bo, HttpServletResponse response) {
List<WmsPsmStoreTypeVo> list = wmsPsmStoreTypeService.queryList(bo); List<WmsPsmStoreTypeVo> list = wmsPsmStoreTypeService.queryList(bo);
ExcelUtil.exportExcel(list, "成品仓库类型", WmsPsmStoreTypeVo.class, response); ExcelUtil.exportExcel(list, "成品库区", WmsPsmStoreTypeVo.class, response);
} }
/** /**
* 获取成品仓库类型详细信息 * 获取成品库区详细信息
* *
* @param storeTypeId 主键 * @param storeTypeId 主键
*/ */
@SaCheckPermission("system:psmStoreType:query") @SaCheckPermission("wms:psmStoreType:query")
@GetMapping("/{storeTypeId}") @GetMapping("/{storeTypeId}")
public R<WmsPsmStoreTypeVo> getInfo(@NotNull(message = "主键不能为空") public R<WmsPsmStoreTypeVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long storeTypeId) { @PathVariable Long storeTypeId) {
@ -70,34 +70,34 @@ public class WmsPsmStoreTypeController extends BaseController {
} }
/** /**
* 新增成品仓库类型 * 新增成品库区
*/ */
@SaCheckPermission("system:psmStoreType:add") @SaCheckPermission("wms:psmStoreType:add")
@Log(title = "成品仓库类型", businessType = BusinessType.INSERT) @Log(title = "成品库区", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@RequestBody WmsPsmStoreTypeBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsPsmStoreTypeBo bo) {
return toAjax(wmsPsmStoreTypeService.insertByBo(bo)); return toAjax(wmsPsmStoreTypeService.insertByBo(bo));
} }
/** /**
* 修改成品仓库类型 * 修改成品库区
*/ */
@SaCheckPermission("system:psmStoreType:edit") @SaCheckPermission("wms:psmStoreType:edit")
@Log(title = "成品仓库类型", businessType = BusinessType.UPDATE) @Log(title = "成品库区", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
public R<Void> edit(@RequestBody WmsPsmStoreTypeBo bo) { public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsPsmStoreTypeBo bo) {
return toAjax(wmsPsmStoreTypeService.updateByBo(bo)); return toAjax(wmsPsmStoreTypeService.updateByBo(bo));
} }
/** /**
* 删除成品仓库类型 * 删除成品库区
* *
* @param storeTypeIds 主键串 * @param storeTypeIds 主键串
*/ */
@SaCheckPermission("system:psmStoreType:remove") @SaCheckPermission("wms:psmStoreType:remove")
@Log(title = "成品仓库类型", businessType = BusinessType.DELETE) @Log(title = "成品库区", businessType = BusinessType.DELETE)
@DeleteMapping("/{storeTypeIds}") @DeleteMapping("/{storeTypeIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] storeTypeIds) { @PathVariable Long[] storeTypeIds) {
@ -106,11 +106,11 @@ public class WmsPsmStoreTypeController extends BaseController {
/** /**
* 下拉框查询成品仓库类型列表 * 下拉框查询成品库区列表
*/ */
@GetMapping("getWmsPsmStoreTypeList") @GetMapping("/getWmsPsmStoreTypeList")
public R<List<WmsPsmStoreTypeVo>> getWmsPsmStoreTypelist(WmsPsmStoreTypeBo bo) { public R<List<WmsPsmStoreTypeVo>> getWmsPsmStoreTypeList(WmsPsmStoreTypeBo bo) {
List<WmsPsmStoreTypeVo> list = wmsPsmStoreTypeService.queryList(bo); List<WmsPsmStoreTypeVo> list = wmsPsmStoreTypeService.queryList(bo);
return R.ok(list); return R.ok(list);
} }

39
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmStoreType.java
Unescape Escape View File

@ -6,17 +6,17 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serial; import java.io.Serial;
import java.util.Date;
/** /**
* 成品仓库类型对象 wms_psm_store_type * 成品库区对象 wms_psm_store_type
* *
* @author LionLi * @author Yinq
* @date 2025-01-15 * @date 2025-04-08
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true)
@TableName("wms_psm_store_type") @TableName("wms_psm_store_type")
public class WmsPsmStoreType { public class WmsPsmStoreType extends TenantEntity {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -28,12 +28,12 @@ public class WmsPsmStoreType {
private Long storeTypeId; private Long storeTypeId;
/** /**
* 仓库类型代码 * 库区代码
*/ */
private String storeTypeCode; private String storeTypeCode;
/** /**
* 仓库类型名称 * 库区名称
*/ */
private String storeTypeName; private String storeTypeName;
@ -46,30 +46,13 @@ public class WmsPsmStoreType {
* 存放品级名称 * 存放品级名称
*/ */
private String checkGradeName; private String checkGradeName;
/**
* 租户id
*/
private String tenantId;
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** /**
* 创建时间 * 所属仓库
*/ */
@TableField(fill = FieldFill.INSERT) private Long storeId;
private Date createTime; @TableField(exist = false)
private String storeName;
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
* 更新时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
} }

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmStoreBo.java
Unescape Escape View File

@ -41,7 +41,7 @@ public class WmsPsmStoreBo extends BaseEntity {
/** /**
* 仓库类型 * 仓库类型
*/ */
@NotNull(message = "仓库类型不能为空", groups = { AddGroup.class, EditGroup.class }) // @NotNull(message = "仓库类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long storeTypeId; private Long storeTypeId;
private String tenantId; private String tenantId;

31
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmStoreTypeBo.java
Unescape Escape View File

@ -1,5 +1,6 @@
package org.dromara.wms.domain.bo; package org.dromara.wms.domain.bo;
import org.dromara.wms.domain.WmsPsmStoreType;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
@ -7,13 +8,12 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import org.dromara.wms.domain.WmsPsmStoreType;
/** /**
* 成品仓库类型业务对象 wms_psm_store_type * 成品库区业务对象 wms_psm_store_type
* *
* @author LionLi * @author Yinq
* @date 2025-01-15 * @date 2025-04-08
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ -21,35 +21,32 @@ import org.dromara.wms.domain.WmsPsmStoreType;
public class WmsPsmStoreTypeBo extends BaseEntity { public class WmsPsmStoreTypeBo extends BaseEntity {
/** /**
* 表主键 * 库区代码
*/ */
@NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class }) @NotBlank(message = "库区代码不能为空", groups = { AddGroup.class, EditGroup.class })
private Long storeTypeId;
/**
* 仓库类型代码
*/
@NotBlank(message = "仓库类型代码不能为空", groups = { AddGroup.class, EditGroup.class })
private String storeTypeCode; private String storeTypeCode;
/** /**
* 仓库类型名称 * 库区名称
*/ */
@NotBlank(message = "仓库类型名称不能为空", groups = { AddGroup.class, EditGroup.class }) @NotBlank(message = "库区名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String storeTypeName; private String storeTypeName;
/** /**
* 存放品级编号 * 存放品级编号
*/ */
@NotBlank(message = "存放品级编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String checkGradeCode; private String checkGradeCode;
/** /**
* 存放品级名称 * 存放品级名称
*/ */
@NotBlank(message = "存放品级名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String checkGradeName; private String checkGradeName;
private String tenantId;
/**
* 所属仓库
*/
@NotNull(message = "所属仓库不能为空", groups = { AddGroup.class, EditGroup.class })
private Long storeId;
private String storeName;
} }

70
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmStoreTypeVo.java
Unescape Escape View File

@ -1,14 +1,10 @@
package org.dromara.wms.domain.vo; package org.dromara.wms.domain.vo;
import org.dromara.wms.domain.WmsPsmStoreType;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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 io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.wms.domain.WmsPsmStoreType;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -17,10 +13,10 @@ import java.util.Date;
/** /**
* 成品仓库类型视图对象 wms_psm_store_type * 成品库区视图对象 wms_psm_store_type
* *
* @author LionLi * @author Yinq
* @date 2025-01-15 * @date 2025-04-08
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
@ -37,15 +33,39 @@ public class WmsPsmStoreTypeVo implements Serializable {
private Long storeTypeId; private Long storeTypeId;
/** /**
* 仓库类型代码 * 创建人
*/ */
@ExcelProperty(value = "仓库类型代码") @ExcelProperty(value = "创建人")
private Long createBy;
/**
* 创建时间
*/
@ExcelProperty(value = "创建时间")
private Date createTime;
/**
* 更新人
*/
@ExcelProperty(value = "更新人")
private Long updateBy;
/**
* 更新时间
*/
@ExcelProperty(value = "更新时间")
private Date updateTime;
/**
* 库区代码
*/
@ExcelProperty(value = "库区代码")
private String storeTypeCode; private String storeTypeCode;
/** /**
* 仓库类型名称 * 库区名称
*/ */
@ExcelProperty(value = "仓库类型名称") @ExcelProperty(value = "库区名称")
private String storeTypeName; private String storeTypeName;
/** /**
@ -59,30 +79,12 @@ public class WmsPsmStoreTypeVo implements Serializable {
*/ */
@ExcelProperty(value = "存放品级名称") @ExcelProperty(value = "存放品级名称")
private String checkGradeName; private String checkGradeName;
/**
* 租户id
*/
private String tenantId;
@TableField(fill = FieldFill.INSERT)
private String createBy;
/** /**
* 创建时间 * 所属仓库
*/ */
@TableField(fill = FieldFill.INSERT) @ExcelProperty(value = "所属仓库")
private Date createTime; private Long storeId;
private String storeName;
/**
* 更新者
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/**
* 更新时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
} }

2
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStoreMapper.java
Unescape Escape View File

@ -3,6 +3,7 @@ package org.dromara.wms.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wms.domain.WmsPsmStore; import org.dromara.wms.domain.WmsPsmStore;
import org.dromara.wms.domain.vo.WmsPsmStoreVo; import org.dromara.wms.domain.vo.WmsPsmStoreVo;
import org.springframework.stereotype.Repository;
/** /**
* 成品仓库管理Mapper接口 * 成品仓库管理Mapper接口
@ -10,6 +11,7 @@ import org.dromara.wms.domain.vo.WmsPsmStoreVo;
* @author LionLi * @author LionLi
* @date 2025-01-15 * @date 2025-01-15
*/ */
@Repository
public interface WmsPsmStoreMapper extends BaseMapperPlus<WmsPsmStore, WmsPsmStoreVo> { public interface WmsPsmStoreMapper extends BaseMapperPlus<WmsPsmStore, WmsPsmStoreVo> {
} }

10
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStoreTypeMapper.java
Unescape Escape View File

@ -1,15 +1,17 @@
package org.dromara.wms.mapper; package org.dromara.wms.mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.wms.domain.WmsPsmStoreType; import org.dromara.wms.domain.WmsPsmStoreType;
import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo; import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.springframework.stereotype.Repository;
/** /**
* 成品仓库类型Mapper接口 * 成品库区Mapper接口
* *
* @author LionLi * @author Yinq
* @date 2025-01-15 * @date 2025-04-08
*/ */
@Repository
public interface WmsPsmStoreTypeMapper extends BaseMapperPlus<WmsPsmStoreType, WmsPsmStoreTypeVo> { public interface WmsPsmStoreTypeMapper extends BaseMapperPlus<WmsPsmStoreType, WmsPsmStoreTypeVo> {
} }

32
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmStoreTypeService.java
Unescape Escape View File

@ -1,64 +1,64 @@
package org.dromara.wms.service; package org.dromara.wms.service;
import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo;
import org.dromara.wms.domain.bo.WmsPsmStoreTypeBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.wms.domain.bo.WmsPsmStoreTypeBo;
import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
/** /**
* 成品仓库类型Service接口 * 成品库区Service接口
* *
* @author LionLi * @author Yinq
* @date 2025-01-15 * @date 2025-04-08
*/ */
public interface IWmsPsmStoreTypeService { public interface IWmsPsmStoreTypeService {
/** /**
* 查询成品仓库类型 * 查询成品库区
* *
* @param storeTypeId 主键 * @param storeTypeId 主键
* @return 成品仓库类型 * @return 成品库区
*/ */
WmsPsmStoreTypeVo queryById(Long storeTypeId); WmsPsmStoreTypeVo queryById(Long storeTypeId);
/** /**
* 分页查询成品仓库类型列表 * 分页查询成品库区列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @param pageQuery 分页参数 * @param pageQuery 分页参数
* @return 成品仓库类型分页列表 * @return 成品库区分页列表
*/ */
TableDataInfo<WmsPsmStoreTypeVo> queryPageList(WmsPsmStoreTypeBo bo, PageQuery pageQuery); TableDataInfo<WmsPsmStoreTypeVo> queryPageList(WmsPsmStoreTypeBo bo, PageQuery pageQuery);
/** /**
* 查询符合条件的成品仓库类型列表 * 查询符合条件的成品库区列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @return 成品仓库类型列表 * @return 成品库区列表
*/ */
List<WmsPsmStoreTypeVo> queryList(WmsPsmStoreTypeBo bo); List<WmsPsmStoreTypeVo> queryList(WmsPsmStoreTypeBo bo);
/** /**
* 新增成品仓库类型 * 新增成品库区
* *
* @param bo 成品仓库类型 * @param bo 成品库区
* @return 是否新增成功 * @return 是否新增成功
*/ */
Boolean insertByBo(WmsPsmStoreTypeBo bo); Boolean insertByBo(WmsPsmStoreTypeBo bo);
/** /**
* 修改成品仓库类型 * 修改成品库区
* *
* @param bo 成品仓库类型 * @param bo 成品库区
* @return 是否修改成功 * @return 是否修改成功
*/ */
Boolean updateByBo(WmsPsmStoreTypeBo bo); Boolean updateByBo(WmsPsmStoreTypeBo bo);
/** /**
* 校验并批量删除成品仓库类型信息 * 校验并批量删除成品库区信息
* *
* @param ids 待删除的主键集合 * @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验 * @param isValid 是否进行有效性校验

27
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreServiceImpl.java
Unescape Escape View File

@ -7,7 +7,6 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.wms.domain.WmsPsmStore; import org.dromara.wms.domain.WmsPsmStore;
@ -19,7 +18,6 @@ import org.dromara.wms.service.IWmsPsmStoreService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Collection; import java.util.Collection;
/** /**
@ -72,7 +70,7 @@ public class WmsPsmStoreServiceImpl implements IWmsPsmStoreService {
} }
private MPJLambdaWrapper<WmsPsmStore> buildQueryWrapper(WmsPsmStoreBo bo) { private MPJLambdaWrapper<WmsPsmStore> buildQueryWrapper(WmsPsmStoreBo bo) {
Map<String, Object> params = bo.getParams(); // Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsPsmStore> lqw = JoinWrappers.lambda(WmsPsmStore.class) MPJLambdaWrapper<WmsPsmStore> lqw = JoinWrappers.lambda(WmsPsmStore.class)
.selectAll(WmsPsmStore.class).select(WmsPsmStoreType::getStoreTypeCode) .selectAll(WmsPsmStore.class).select(WmsPsmStoreType::getStoreTypeCode)
.leftJoin(WmsPsmStoreType.class,WmsPsmStoreType::getStoreTypeId,WmsPsmStore::getStoreTypeId) .leftJoin(WmsPsmStoreType.class,WmsPsmStoreType::getStoreTypeId,WmsPsmStore::getStoreTypeId)
@ -94,13 +92,13 @@ public class WmsPsmStoreServiceImpl implements IWmsPsmStoreService {
public Boolean insertByBo(WmsPsmStoreBo bo) { public Boolean insertByBo(WmsPsmStoreBo bo) {
String username = LoginHelper.getUsername(); String username = LoginHelper.getUsername();
WmsPsmStore add = MapstructUtils.convert(bo, WmsPsmStore.class); WmsPsmStore add = MapstructUtils.convert(bo, WmsPsmStore.class);
assert add != null;
add.setCreateBy(username); add.setCreateBy(username);
validEntityBeforeSave(add); return baseMapper.insert(add) > 0;
boolean flag = baseMapper.insert(add) > 0; // if (flag) {
if (flag) { // bo.setStoreId(add.getStoreId());
bo.setStoreId(add.getStoreId()); // }
} // flag;
return flag;
} }
/** /**
@ -114,16 +112,10 @@ public class WmsPsmStoreServiceImpl implements IWmsPsmStoreService {
String username = LoginHelper.getUsername(); String username = LoginHelper.getUsername();
WmsPsmStore update = MapstructUtils.convert(bo, WmsPsmStore.class); WmsPsmStore update = MapstructUtils.convert(bo, WmsPsmStore.class);
update.setUpdateBy(username); update.setUpdateBy(username);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsPsmStore entity){
//TODO 做一些数据校验,如唯一约束
}
/** /**
* 校验并批量删除成品仓库管理信息 * 校验并批量删除成品仓库管理信息
@ -134,9 +126,6 @@ public class WmsPsmStoreServiceImpl implements IWmsPsmStoreService {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;
} }
} }

85
ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStoreTypeServiceImpl.java
Unescape Escape View File

@ -7,25 +7,23 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.WmsPsmStore;
import org.dromara.wms.domain.WmsPsmStoreType; import org.springframework.stereotype.Service;
import org.dromara.wms.domain.bo.WmsPsmStoreTypeBo; import org.dromara.wms.domain.bo.WmsPsmStoreTypeBo;
import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo; import org.dromara.wms.domain.vo.WmsPsmStoreTypeVo;
import org.dromara.wms.domain.WmsPsmStoreType;
import org.dromara.wms.mapper.WmsPsmStoreTypeMapper; import org.dromara.wms.mapper.WmsPsmStoreTypeMapper;
import org.dromara.wms.service.IWmsPsmStoreTypeService; import org.dromara.wms.service.IWmsPsmStoreTypeService;
import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Collection; import java.util.Collection;
/** /**
* 成品仓库类型Service业务层处理 * 成品库区Service业务层处理
* *
* @author LionLi * @author Yinq
* @date 2025-01-15 * @date 2025-04-08
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
@ -34,22 +32,22 @@ public class WmsPsmStoreTypeServiceImpl implements IWmsPsmStoreTypeService {
private final WmsPsmStoreTypeMapper baseMapper; private final WmsPsmStoreTypeMapper baseMapper;
/** /**
* 查询成品仓库类型 * 查询成品库区
* *
* @param storeTypeId 主键 * @param storeTypeId 主键
* @return 成品仓库类型 * @return 成品库区
*/ */
@Override @Override
public WmsPsmStoreTypeVo queryById(Long storeTypeId){ public WmsPsmStoreTypeVo queryById(Long storeTypeId) {
return baseMapper.selectVoById(storeTypeId); return baseMapper.selectVoById(storeTypeId);
} }
/** /**
* 分页查询成品仓库类型列表 * 分页查询成品库区列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @param pageQuery 分页参数 * @param pageQuery 分页参数
* @return 成品仓库类型分页列表 * @return 成品库区分页列表
*/ */
@Override @Override
public TableDataInfo<WmsPsmStoreTypeVo> queryPageList(WmsPsmStoreTypeBo bo, PageQuery pageQuery) { public TableDataInfo<WmsPsmStoreTypeVo> queryPageList(WmsPsmStoreTypeBo bo, PageQuery pageQuery) {
@ -59,10 +57,10 @@ public class WmsPsmStoreTypeServiceImpl implements IWmsPsmStoreTypeService {
} }
/** /**
* 查询符合条件的成品仓库类型列表 * 查询符合条件的成品库区列表
* *
* @param bo 查询条件 * @param bo 查询条件
* @return 成品仓库类型列表 * @return 成品库区列表
*/ */
@Override @Override
public List<WmsPsmStoreTypeVo> queryList(WmsPsmStoreTypeBo bo) { public List<WmsPsmStoreTypeVo> queryList(WmsPsmStoreTypeBo bo) {
@ -71,61 +69,54 @@ public class WmsPsmStoreTypeServiceImpl implements IWmsPsmStoreTypeService {
} }
private MPJLambdaWrapper<WmsPsmStoreType> buildQueryWrapper(WmsPsmStoreTypeBo bo) { private MPJLambdaWrapper<WmsPsmStoreType> buildQueryWrapper(WmsPsmStoreTypeBo bo) {
Map<String, Object> params = bo.getParams(); // Map<String, Object> params = bo.getParams();
MPJLambdaWrapper<WmsPsmStoreType> lqw = JoinWrappers.lambda(WmsPsmStoreType.class) MPJLambdaWrapper<WmsPsmStoreType> lqw = JoinWrappers.lambda(WmsPsmStoreType.class)
.selectAll(WmsPsmStoreType.class) .selectAll(WmsPsmStoreType.class)
.eq(bo.getStoreTypeId() != null, WmsPsmStoreType::getStoreTypeId, bo.getStoreTypeId()) .leftJoin(WmsPsmStore.class, WmsPsmStore::getStoreId, WmsPsmStoreType::getStoreId)
.eq(StringUtils.isNotBlank(bo.getStoreTypeCode()), WmsPsmStoreType::getStoreTypeCode, bo.getStoreTypeCode()) .select(WmsPsmStore::getStoreName)
.like(StringUtils.isNotBlank(bo.getStoreTypeName()), WmsPsmStoreType::getStoreTypeName, bo.getStoreTypeName()) .like(StringUtils.isNotBlank(bo.getStoreTypeCode()), WmsPsmStoreType::getStoreTypeCode, bo.getStoreTypeCode())
.eq(StringUtils.isNotBlank(bo.getCheckGradeCode()), WmsPsmStoreType::getCheckGradeCode, bo.getCheckGradeCode()) .like(StringUtils.isNotBlank(bo.getStoreTypeName()), WmsPsmStoreType::getStoreTypeName, bo.getStoreTypeName())
.like(StringUtils.isNotBlank(bo.getCheckGradeName()), WmsPsmStoreType::getCheckGradeName, bo.getCheckGradeName()) .eq(StringUtils.isNotBlank(bo.getCheckGradeCode()), WmsPsmStoreType::getCheckGradeCode, bo.getCheckGradeCode())
.orderByDesc(WmsPsmStoreType::getCreateTime); .eq(StringUtils.isNotBlank(bo.getCheckGradeName()), WmsPsmStoreType::getCheckGradeName, bo.getCheckGradeName())
.eq(bo.getStoreId() != null, WmsPsmStoreType::getStoreId, bo.getStoreId())
.orderByDesc(WmsPsmStoreType::getCreateTime);
return lqw; return lqw;
} }
/** /**
* 新增成品仓库类型 * 新增成品库区
* *
* @param bo 成品仓库类型 * @param bo 成品库区
* @return 是否新增成功 * @return 是否新增成功
*/ */
@Override @Override
public Boolean insertByBo(WmsPsmStoreTypeBo bo) { public Boolean insertByBo(WmsPsmStoreTypeBo bo) {
String username = LoginHelper.getUsername();
WmsPsmStoreType add = MapstructUtils.convert(bo, WmsPsmStoreType.class); WmsPsmStoreType add = MapstructUtils.convert(bo, WmsPsmStoreType.class);
add.setCreateBy(username);
validEntityBeforeSave(add); return baseMapper.insert(add) > 0;
boolean flag = baseMapper.insert(add) > 0; // if (flag) {
if (flag) { // bo.setStoreTypeId(add.getStoreTypeId());
bo.setStoreTypeId(add.getStoreTypeId()); // }
} // flag;
return flag;
} }
/** /**
* 修改成品仓库类型 * 修改成品库区
* *
* @param bo 成品仓库类型 * @param bo 成品库区
* @return 是否修改成功 * @return 是否修改成功
*/ */
@Override @Override
public Boolean updateByBo(WmsPsmStoreTypeBo bo) { public Boolean updateByBo(WmsPsmStoreTypeBo bo) {
String username = LoginHelper.getUsername();
WmsPsmStoreType update = MapstructUtils.convert(bo, WmsPsmStoreType.class); WmsPsmStoreType update = MapstructUtils.convert(bo, WmsPsmStoreType.class);
update.setUpdateBy(username); // validEntityBeforeSave(update);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(WmsPsmStoreType entity){
//TODO 做一些数据校验,如唯一约束
}
/** /**
* 校验并批量删除成品仓库类型信息 * 校验并批量删除成品库区信息
* *
* @param ids 待删除的主键集合 * @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验 * @param isValid 是否进行有效性校验
@ -133,9 +124,7 @@ public class WmsPsmStoreTypeServiceImpl implements IWmsPsmStoreTypeService {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;
} }
} }

Write Preview
Loading…
Cancel
Save