diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockDetailController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockDetailController.java new file mode 100644 index 0000000..c3b4bd5 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockDetailController.java @@ -0,0 +1,107 @@ +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.WmsOutstockDetailBo; +import org.dromara.wms.domain.vo.WmsOutstockDetailVo; +import org.dromara.wms.service.IWmsOutstockDetailService; +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/outstockDetail + * + * @author LionLi + * @date 2025-01-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/outstockDetail") +public class WmsOutstockDetailController extends BaseController { + + private final IWmsOutstockDetailService wmsOutstockDetailService; + + /** + * 查询出库单-物料列表 + */ + @SaCheckPermission("system:outstockDetail:list") + @GetMapping("/list") + public TableDataInfo list(WmsOutstockDetailBo bo, PageQuery pageQuery) { + return wmsOutstockDetailService.queryPageList(bo, pageQuery); + } + + /** + * 导出出库单-物料列表 + */ + @SaCheckPermission("system:outstockDetail:export") + @Log(title = "出库单-物料", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsOutstockDetailBo bo, HttpServletResponse response) { + List list = wmsOutstockDetailService.queryList(bo); + ExcelUtil.exportExcel(list, "出库单-物料", WmsOutstockDetailVo.class, response); + } + + /** + * 获取出库单-物料详细信息 + * + * @param outstockDetailId 主键 + */ + @SaCheckPermission("system:outstockDetail:query") + @GetMapping("/{outstockDetailId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long outstockDetailId) { + return R.ok(wmsOutstockDetailService.queryById(outstockDetailId)); + } + + /** + * 新增出库单-物料 + */ + @SaCheckPermission("system:outstockDetail:add") + @Log(title = "出库单-物料", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@RequestBody WmsOutstockDetailBo bo) { + return toAjax(wmsOutstockDetailService.insertByBo(bo)); + } + + /** + * 修改出库单-物料 + */ + @SaCheckPermission("system:outstockDetail:edit") + @Log(title = "出库单-物料", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsOutstockDetailBo bo) { + return toAjax(wmsOutstockDetailService.updateByBo(bo)); + } + + /** + * 删除出库单-物料 + * + * @param outstockDetailIds 主键串 + */ + @SaCheckPermission("system:outstockDetail:remove") + @Log(title = "出库单-物料", businessType = BusinessType.DELETE) + @DeleteMapping("/{outstockDetailIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] outstockDetailIds) { + return toAjax(wmsOutstockDetailService.deleteWithValidByIds(List.of(outstockDetailIds), true)); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java new file mode 100644 index 0000000..bbb1c76 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockDetail.java @@ -0,0 +1,86 @@ +package org.dromara.wms.domain; + +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import com.ibm.icu.math.BigDecimal; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 出库单-物料对象 wms_outstock_detail + * + * @author LionLi + * @date 2025-01-08 + */ +@Data +@TableName("wms_outstock_detail") +public class WmsOutstockDetail { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + @TableId(type = IdType.AUTO) + private Long outstockDetailId; + + /** + * 出库单号 + */ + private String outstockCode; + + /** + * 出库单 主键 + */ + private Long outstockId; + + /** + * 物料id + */ + private Long materialId; + + /** + * 出库数量 + */ + @TableField(typeHandler = JacksonTypeHandler.class) + private BigDecimal outstockQty; + + /** + * 物料大类 + */ + private String materialCategories; + /** + * 租户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(exist = false) + private String materialCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockDetailBo.java new file mode 100644 index 0000000..19e97c0 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockDetailBo.java @@ -0,0 +1,62 @@ +package org.dromara.wms.domain.bo; + +import com.ibm.icu.math.BigDecimal; +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.WmsOutstockDetail; + +/** + * 出库单-物料业务对象 wms_outstock_detail + * + * @author LionLi + * @date 2025-01-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsOutstockDetail.class, reverseConvertGenerate = false) +public class WmsOutstockDetailBo extends BaseEntity { + + /** + * 表主键 + */ +// @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long outstockDetailId; + + /** + * 出库单号 + */ +// @NotBlank(message = "出库单号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String outstockCode; + + /** + * 出库单 主键 + */ +// @NotNull(message = "出库单 主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long outstockId; + + /** + * 物料id + */ +// @NotNull(message = "物料id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long materialId; + + /** + * 出库数量 + */ +// @NotNull(message = "出库数量不能为空", groups = { AddGroup.class, EditGroup.class }) + private BigDecimal outstockQty; + + /** + * 物料大类 + */ +// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialCategories; + private String tenantId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockDetailMapper.java new file mode 100644 index 0000000..6c5c813 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockDetailMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsOutstockDetail; +import org.dromara.wms.domain.vo.WmsOutstockDetailVo; + +/** + * 出库单-物料Mapper接口 + * + * @author LionLi + * @date 2025-01-08 + */ +public interface WmsOutstockDetailMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsOutstockDetailService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsOutstockDetailService.java new file mode 100644 index 0000000..645d3a2 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsOutstockDetailService.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.WmsOutstockDetailBo; +import org.dromara.wms.domain.vo.WmsOutstockDetailVo; + +import java.util.Collection; +import java.util.List; + +/** + * 出库单-物料Service接口 + * + * @author LionLi + * @date 2025-01-08 + */ +public interface IWmsOutstockDetailService { + + /** + * 查询出库单-物料 + * + * @param outstockDetailId 主键 + * @return 出库单-物料 + */ + WmsOutstockDetailVo queryById(Long outstockDetailId); + + /** + * 分页查询出库单-物料列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 出库单-物料分页列表 + */ + TableDataInfo queryPageList(WmsOutstockDetailBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的出库单-物料列表 + * + * @param bo 查询条件 + * @return 出库单-物料列表 + */ + List queryList(WmsOutstockDetailBo bo); + + /** + * 新增出库单-物料 + * + * @param bo 出库单-物料 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsOutstockDetailBo bo); + + /** + * 修改出库单-物料 + * + * @param bo 出库单-物料 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsOutstockDetailBo 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/WmsOutstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java new file mode 100644 index 0000000..8e26d9d --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockDetailServiceImpl.java @@ -0,0 +1,154 @@ +package org.dromara.wms.service.impl; + +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.BaseMaterialInfo; +import org.dromara.wms.domain.WmsInventory; +import org.dromara.wms.domain.WmsOutstockDetail; +import org.dromara.wms.domain.bo.WmsOutstockDetailBo; +import org.dromara.wms.domain.vo.WmsOutstockDetailVo; +import org.dromara.wms.mapper.WmsOutstockDetailMapper; +import org.dromara.wms.service.IWmsOutstockDetailService; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 出库单-物料Service业务层处理 + * + * @author LionLi + * @date 2025-01-08 + */ +@RequiredArgsConstructor +@Service +public class WmsOutstockDetailServiceImpl implements IWmsOutstockDetailService { + + private final WmsOutstockDetailMapper baseMapper; + + /** + * 查询出库单-物料 + * + * @param outstockDetailId 主键 + * @return 出库单-物料 + */ + @Override + public WmsOutstockDetailVo queryById(Long outstockDetailId){ + return baseMapper.selectVoById(outstockDetailId); + } + + /** + * 分页查询出库单-物料列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 出库单-物料分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsOutstockDetailBo bo, PageQuery pageQuery) { +// LambdaQueryWrapper lqw = buildQueryWrapper(bo); + MPJLambdaWrapper mpjLambdaWrapper = buildJoinQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), mpjLambdaWrapper); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的出库单-物料列表 + * + * @param bo 查询条件 + * @return 出库单-物料列表 + */ + @Override + public List queryList(WmsOutstockDetailBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsOutstockDetailBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getOutstockDetailId() != null, WmsOutstockDetail::getOutstockDetailId, bo.getOutstockDetailId()); + lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockDetail::getOutstockCode, bo.getOutstockCode()); + lqw.eq(bo.getOutstockId() != null, WmsOutstockDetail::getOutstockId, bo.getOutstockId()); + lqw.eq(bo.getMaterialId() != null, WmsOutstockDetail::getMaterialId, bo.getMaterialId()); + lqw.eq(bo.getOutstockQty() != null, WmsOutstockDetail::getOutstockQty, bo.getOutstockQty()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockDetail::getMaterialCategories, bo.getMaterialCategories()); + return lqw; + } + private MPJLambdaWrapper buildJoinQueryWrapper(WmsOutstockDetailBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsOutstockDetail.class) + .selectAll(WmsOutstockDetail.class) + .select(BaseMaterialInfo::getMaterialCode) + .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockDetail::getMaterialId) + .eq(bo.getOutstockDetailId() != null, WmsOutstockDetail::getOutstockDetailId, bo.getOutstockDetailId()) + .eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockDetail::getOutstockCode, bo.getOutstockCode()) + .eq(bo.getOutstockId() != null, WmsOutstockDetail::getOutstockId, bo.getOutstockId()) + .eq(bo.getMaterialId() != null, WmsOutstockDetail::getMaterialId, bo.getMaterialId()) + .eq(bo.getOutstockQty() != null, WmsOutstockDetail::getOutstockQty, bo.getOutstockQty()) + .eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockDetail::getMaterialCategories, bo.getMaterialCategories()) + .orderByAsc(WmsOutstockDetail::getCreateTime); + return lqw; + } + + /** + * 新增出库单-物料 + * + * @param bo 出库单-物料 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsOutstockDetailBo bo) { + WmsOutstockDetail add = MapstructUtils.convert(bo, WmsOutstockDetail.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setOutstockDetailId(add.getOutstockDetailId()); + } + return flag; + } + + /** + * 修改出库单-物料 + * + * @param bo 出库单-物料 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsOutstockDetailBo bo) { + WmsOutstockDetail update = MapstructUtils.convert(bo, WmsOutstockDetail.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsOutstockDetail 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/WmsOutstockDetailMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsOutstockDetailMapper.xml new file mode 100644 index 0000000..2103ff7 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsOutstockDetailMapper.xml @@ -0,0 +1,7 @@ + + + + +