From 4e13e7b5f3625431736f786855ce897a12f69a31 Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Fri, 28 Feb 2025 13:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=E5=AD=98=E8=BF=87?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/WmsPsmAreaController.java | 117 +++++++++++++++ .../controller/WmsPsmStorageController.java | 17 +++ .../org/dromara/wms/domain/WmsPsmArea.java | 76 ++++++++++ .../dromara/wms/domain/bo/WmsPsmAreaBo.java | 48 +++++++ .../dromara/wms/domain/vo/WmsPsmAreaVo.java | 89 ++++++++++++ .../mapper/WmsAllocateOrderDetailMapper.java | 11 +- .../dromara/wms/mapper/WmsPsmAreaMapper.java | 15 ++ .../wms/mapper/WmsPsmStorageMapper.java | 7 + .../wms/service/IWmsPsmAreaService.java | 68 +++++++++ .../wms/service/IWmsPsmStorageService.java | 4 + .../WmsAllocateOrderDetailServiceImpl.java | 12 +- .../service/impl/WmsPsmAreaServiceImpl.java | 135 ++++++++++++++++++ .../impl/WmsPsmStorageServiceImpl.java | 18 +++ .../wms/WmsAllocateOrderDetailMapper.xml | 9 ++ .../resources/mapper/wms/WmsPsmAreaMapper.xml | 7 + .../mapper/wms/WmsPsmStorageMapper.xml | 25 ++++ 16 files changed, 650 insertions(+), 8 deletions(-) create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmAreaController.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmArea.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmAreaBo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmAreaVo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmAreaMapper.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmAreaService.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmAreaServiceImpl.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmAreaMapper.xml diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmAreaController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmAreaController.java new file mode 100644 index 0000000..4e79325 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmAreaController.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.common.mybatis.core.page.TableDataInfo; +import org.dromara.wms.domain.bo.WmsPsmAreaBo; +import org.dromara.wms.domain.vo.WmsPsmAreaVo; +import org.dromara.wms.service.IWmsPsmAreaService; +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; + +/** + * 成品库区 + * 前端访问路由地址为:/system/psmArea + * + * @author LionLi + * @date 2025-02-27 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/psmArea") +public class WmsPsmAreaController extends BaseController { + + private final IWmsPsmAreaService wmsPsmAreaService; + + /** + * 查询成品库区列表 + */ + @SaCheckPermission("system:psmArea:list") + @GetMapping("/list") + public TableDataInfo list(WmsPsmAreaBo bo, PageQuery pageQuery) { + return wmsPsmAreaService.queryPageList(bo, pageQuery); + } + + /** + * 导出成品库区列表 + */ + @SaCheckPermission("system:psmArea:export") + @Log(title = "成品库区", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsPsmAreaBo bo, HttpServletResponse response) { + List list = wmsPsmAreaService.queryList(bo); + ExcelUtil.exportExcel(list, "成品库区", WmsPsmAreaVo.class, response); + } + + /** + * 获取成品库区详细信息 + * + * @param areaId 主键 + */ + @SaCheckPermission("system:psmArea:query") + @GetMapping("/{areaId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long areaId) { + return R.ok(wmsPsmAreaService.queryById(areaId)); + } + + /** + * 新增成品库区 + */ + @SaCheckPermission("system:psmArea:add") + @Log(title = "成品库区", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsPsmAreaBo bo) { + return toAjax(wmsPsmAreaService.insertByBo(bo)); + } + + /** + * 修改成品库区 + */ + @SaCheckPermission("system:psmArea:edit") + @Log(title = "成品库区", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsPsmAreaBo bo) { + return toAjax(wmsPsmAreaService.updateByBo(bo)); + } + + /** + * 删除成品库区 + * + * @param areaIds 主键串 + */ + @SaCheckPermission("system:psmArea:remove") + @Log(title = "成品库区", businessType = BusinessType.DELETE) + @DeleteMapping("/{areaIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] areaIds) { + return toAjax(wmsPsmAreaService.deleteWithValidByIds(List.of(areaIds), true)); + } + + + /** + * 下拉框查询成品库区列表 + */ + + @GetMapping("/getWmsPsmAreaList") + public R> getWmsPsmAreaList(WmsPsmAreaBo bo) { + List list = wmsPsmAreaService.queryList(bo); + return R.ok(list); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmStorageController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmStorageController.java index 146ba3a..0116a1e 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmStorageController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPsmStorageController.java @@ -114,4 +114,21 @@ public class WmsPsmStorageController extends BaseController { List list = wmsPsmStorageService.queryList(bo); return R.ok(list); } + /** + * 获取过期库存列表 + */ + @SaCheckPermission("system:psmStorage:list") + @GetMapping("/expiredList") + public TableDataInfo expiredList(WmsPsmStorageBo bo, PageQuery pageQuery) { + return wmsPsmStorageService.expiredList(bo, pageQuery); + } + + /** + * 获取将过期库存列表 + */ + @SaCheckPermission("system:psmStorage:list") + @GetMapping("/expiringList") + public TableDataInfo expiringList(WmsPsmStorageBo bo, PageQuery pageQuery) { + return wmsPsmStorageService.expiringList(bo, pageQuery); + } } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmArea.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmArea.java new file mode 100644 index 0000000..ce26759 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsPsmArea.java @@ -0,0 +1,76 @@ +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_area + * + * @author LionLi + * @date 2025-02-27 + */ +@Data +@TableName("wms_psm_area") +public class WmsPsmArea { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "area_id", type = IdType.AUTO) + private Long areaId; + + /** + * 库区名称 + */ + private String areaName; + + /** + * 库区代码 + */ + private String areaCode; + + /** + * 仓库 + */ + private Long warehouseId; + /** + * 租户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; + + /** + * 创建部门 + */ + @TableField(fill = FieldFill.INSERT) + private String createDept; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmAreaBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmAreaBo.java new file mode 100644 index 0000000..108ad3e --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsPsmAreaBo.java @@ -0,0 +1,48 @@ +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.WmsPsmArea; + +/** + * 成品库区业务对象 wms_psm_area + * + * @author LionLi + * @date 2025-02-27 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsPsmArea.class, reverseConvertGenerate = false) +public class WmsPsmAreaBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long areaId; + + /** + * 库区名称 + */ + @NotBlank(message = "库区名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String areaName; + + /** + * 库区代码 + */ + @NotBlank(message = "库区代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String areaCode; + + /** + * 仓库 + */ + @NotNull(message = "仓库不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long warehouseId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmAreaVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmAreaVo.java new file mode 100644 index 0000000..d820096 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPsmAreaVo.java @@ -0,0 +1,89 @@ +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.WmsPsmArea; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 成品库区视图对象 wms_psm_area + * + * @author LionLi + * @date 2025-02-27 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsPsmArea.class) +public class WmsPsmAreaVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long areaId; + + /** + * 库区名称 + */ + @ExcelProperty(value = "库区名称") + private String areaName; + + /** + * 库区代码 + */ + @ExcelProperty(value = "库区代码") + private String areaCode; + + /** + * 仓库 + */ + @ExcelProperty(value = "仓库") + private Long warehouseId; + /** + * 租户id + */ + private String tenantId; + + private String createBy; + + /** + * 创建时间 + */ + + private Date createTime; + + /** + * 更新者 + */ + + private String updateBy; + + /** + * 更新时间 + */ + + private Date updateTime; + + /** + * 创建部门 + */ + + private String createDept; + + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsAllocateOrderDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsAllocateOrderDetailMapper.java index a9e50fd..fdc25b2 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsAllocateOrderDetailMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsAllocateOrderDetailMapper.java @@ -1,15 +1,22 @@ package org.dromara.wms.mapper; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.wms.domain.WmsAllocateOrderDetail; import org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo; +import java.util.ArrayList; +import java.util.Collection; + /** * 调拨子Mapper接口 * * @author LionLi * @date 2025-01-09 */ -public interface WmsAllocateOrderDetailMapper extends BaseMapperPlus { - +public interface WmsAllocateOrderDetailMapper extends BaseMapperPlus{ + @Options(useGeneratedKeys = false) + int insertDetails(@Param("list") ArrayList list); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmAreaMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmAreaMapper.java new file mode 100644 index 0000000..9af4364 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmAreaMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsPsmArea; +import org.dromara.wms.domain.vo.WmsPsmAreaVo; + +/** + * 成品库区Mapper接口 + * + * @author LionLi + * @date 2025-02-27 + */ +public interface WmsPsmAreaMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorageMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorageMapper.java index b8407b4..9f5fb1a 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorageMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPsmStorageMapper.java @@ -1,9 +1,13 @@ package org.dromara.wms.mapper; +import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.wms.domain.WmsPsmStorage; +import org.dromara.wms.domain.bo.WmsPsmStorageBo; import org.dromara.wms.domain.vo.WmsPsmStorageVo; +import java.util.List; + /** * 成品库存Mapper接口 * @@ -12,4 +16,7 @@ import org.dromara.wms.domain.vo.WmsPsmStorageVo; */ public interface WmsPsmStorageMapper extends BaseMapperPlus { + List expiredList(@Param("entity") WmsPsmStorageBo bo); + + List expiringList(@Param("entity") WmsPsmStorageBo bo); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmAreaService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmAreaService.java new file mode 100644 index 0000000..c88c82e --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmAreaService.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.WmsPsmAreaBo; +import org.dromara.wms.domain.vo.WmsPsmAreaVo; + +import java.util.Collection; +import java.util.List; + +/** + * 成品库区Service接口 + * + * @author LionLi + * @date 2025-02-27 + */ +public interface IWmsPsmAreaService { + + /** + * 查询成品库区 + * + * @param areaId 主键 + * @return 成品库区 + */ + WmsPsmAreaVo queryById(Long areaId); + + /** + * 分页查询成品库区列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 成品库区分页列表 + */ + TableDataInfo queryPageList(WmsPsmAreaBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的成品库区列表 + * + * @param bo 查询条件 + * @return 成品库区列表 + */ + List queryList(WmsPsmAreaBo bo); + + /** + * 新增成品库区 + * + * @param bo 成品库区 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsPsmAreaBo bo); + + /** + * 修改成品库区 + * + * @param bo 成品库区 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsPsmAreaBo 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/IWmsPsmStorageService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmStorageService.java index 83a1727..275d59b 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmStorageService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPsmStorageService.java @@ -65,4 +65,8 @@ public interface IWmsPsmStorageService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + TableDataInfo expiredList(WmsPsmStorageBo bo, PageQuery pageQuery); + + TableDataInfo expiringList(WmsPsmStorageBo bo, PageQuery pageQuery); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java index bc7e192..b3c35b4 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsAllocateOrderDetailServiceImpl.java @@ -21,6 +21,8 @@ import org.dromara.wms.domain.vo.WmsAllocateOrderDetailVo; import org.dromara.wms.mapper.WmsAllocateOrderDetailMapper; import org.dromara.wms.service.IWmsAllocateOrderDetailService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; +import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -110,14 +112,12 @@ public class WmsAllocateOrderDetailServiceImpl implements IWmsAllocateOrderDetai ArrayList list = new ArrayList<>(); for (WmsAllocateOrderDetailBo detailBo : bo) { WmsAllocateOrderDetail add = MapstructUtils.convert(detailBo, WmsAllocateOrderDetail.class); + add.setCreateBy(LoginHelper.getUsername()); + add.setTenantId(LoginHelper.getTenantId()); list.add(add); } - - boolean flag = baseMapper.insertBatch(list); -// if (flag) { -// bo.setAoDId(add.getAoDId()); -// } - return flag; + int i = baseMapper.insertDetails(list); + return i > 0; } /** diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmAreaServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmAreaServiceImpl.java new file mode 100644 index 0000000..8344ae7 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmAreaServiceImpl.java @@ -0,0 +1,135 @@ +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.WmsPsmArea; +import org.dromara.wms.domain.bo.WmsPsmAreaBo; +import org.dromara.wms.domain.vo.WmsPsmAreaVo; +import org.dromara.wms.mapper.WmsPsmAreaMapper; +import org.dromara.wms.service.IWmsPsmAreaService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 成品库区Service业务层处理 + * + * @author LionLi + * @date 2025-02-27 + */ +@RequiredArgsConstructor +@Service +public class WmsPsmAreaServiceImpl implements IWmsPsmAreaService { + + private final WmsPsmAreaMapper baseMapper; + + /** + * 查询成品库区 + * + * @param areaId 主键 + * @return 成品库区 + */ + @Override + public WmsPsmAreaVo queryById(Long areaId){ + return baseMapper.selectVoById(areaId); + } + + /** + * 分页查询成品库区列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 成品库区分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsPsmAreaBo 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(WmsPsmAreaBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsPsmAreaBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsPsmArea.class) + .selectAll(WmsPsmArea.class) + .eq(bo.getAreaId() != null, WmsPsmArea::getAreaId, bo.getAreaId()) + .like(StringUtils.isNotBlank(bo.getAreaName()), WmsPsmArea::getAreaName, bo.getAreaName()) + .like(StringUtils.isNotBlank(bo.getAreaCode()), WmsPsmArea::getAreaCode, bo.getAreaCode()) + .eq(bo.getWarehouseId() != null, WmsPsmArea::getWarehouseId, bo.getWarehouseId()) + .orderByDesc(WmsPsmArea::getCreateTime); + return lqw; + } + + /** + * 新增成品库区 + * + * @param bo 成品库区 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsPsmAreaBo bo) { + WmsPsmArea add = MapstructUtils.convert(bo, WmsPsmArea.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setAreaId(add.getAreaId()); + } + return flag; + } + + /** + * 修改成品库区 + * + * @param bo 成品库区 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsPsmAreaBo bo) { + WmsPsmArea update = MapstructUtils.convert(bo, WmsPsmArea.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsPsmArea 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/WmsPsmStorageServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStorageServiceImpl.java index 46e132e..2dc20f6 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStorageServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPsmStorageServiceImpl.java @@ -124,6 +124,24 @@ public class WmsPsmStorageServiceImpl implements IWmsPsmStorageService { //TODO 做一些数据校验,如唯一约束 } + @Override + public TableDataInfo expiringList(WmsPsmStorageBo bo, PageQuery pageQuery) { + List list = baseMapper.expiringList(bo); + Page page = new Page<>(); + page.setRecords(list); + page.setTotal(list.size()); + return TableDataInfo.build(page); + } + + @Override + public TableDataInfo expiredList(WmsPsmStorageBo bo, PageQuery pageQuery) { + List list = baseMapper.expiredList(bo); + Page page = new Page<>(); + page.setRecords(list); + page.setTotal(list.size()); + return TableDataInfo.build(page); + } + /** * 校验并批量删除成品库存信息 * diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsAllocateOrderDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsAllocateOrderDetailMapper.xml index afe5ded..94852a4 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsAllocateOrderDetailMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsAllocateOrderDetailMapper.xml @@ -4,4 +4,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + INSERT INTO wms_allocate_order_detail + (allocate_code,material_id,allocate_order_qty,tenant_id,create_by,create_time,update_by,update_time) + values + + (#{item.allocateCode},#{item.materialId},#{item.allocateOrderQty},#{item.tenantId},#{item.createBy},#{item.createTime},#{item.updateBy},#{item.updateTime}) + + diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmAreaMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmAreaMapper.xml new file mode 100644 index 0000000..fbb6b49 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmAreaMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmStorageMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmStorageMapper.xml index f958440..edf120e 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmStorageMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPsmStorageMapper.xml @@ -4,4 +4,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +