diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsOutStockBillController.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsOutStockBillController.java new file mode 100644 index 00000000..91e3f003 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/controller/WmsOutStockBillController.java @@ -0,0 +1,116 @@ +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.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.wms.domain.vo.WmsOutStockBillVo; +import org.dromara.wms.domain.bo.WmsOutStockBillBo; +import org.dromara.wms.service.IWmsOutStockBillService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 出库单 + * 前端访问路由地址为:/wms/outStockBill + * + * @author Yinq + * @date 2025-11-12 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/outStockBill") +public class WmsOutStockBillController extends BaseController { + + private final IWmsOutStockBillService wmsOutStockBillService; + + /** + * 查询出库单列表 + */ + @SaCheckPermission("wms:outStockBill:list") + @GetMapping("/list") + public TableDataInfo list(WmsOutStockBillBo bo, PageQuery pageQuery) { + return wmsOutStockBillService.queryPageList(bo, pageQuery); + } + + /** + * 导出出库单列表 + */ + @SaCheckPermission("wms:outStockBill:export") + @Log(title = "出库单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsOutStockBillBo bo, HttpServletResponse response) { + List list = wmsOutStockBillService.queryList(bo); + ExcelUtil.exportExcel(list, "出库单", WmsOutStockBillVo.class, response); + } + + /** + * 获取出库单详细信息 + * + * @param outStockBillId 主键 + */ + @SaCheckPermission("wms:outStockBill:query") + @GetMapping("/{outStockBillId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("outStockBillId") Long outStockBillId) { + return R.ok(wmsOutStockBillService.queryById(outStockBillId)); + } + + /** + * 新增出库单 + */ + @SaCheckPermission("wms:outStockBill:add") + @Log(title = "出库单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsOutStockBillBo bo) { + return toAjax(wmsOutStockBillService.insertByBo(bo)); + } + + /** + * 修改出库单 + */ + @SaCheckPermission("wms:outStockBill:edit") + @Log(title = "出库单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsOutStockBillBo bo) { + return toAjax(wmsOutStockBillService.updateByBo(bo)); + } + + /** + * 删除出库单 + * + * @param outStockBillIds 主键串 + */ + @SaCheckPermission("wms:outStockBill:remove") + @Log(title = "出库单", businessType = BusinessType.DELETE) + @DeleteMapping("/{outStockBillIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("outStockBillIds") Long[] outStockBillIds) { + return toAjax(wmsOutStockBillService.deleteWithValidByIds(List.of(outStockBillIds), true)); + } + + /** + * 下拉框查询出库单列表 + */ + @GetMapping("/getWmsOutStockBillList") + public R> getWmsOutStockBillList(WmsOutStockBillBo bo) { + List list = wmsOutStockBillService.queryList(bo); + return R.ok(list); + } + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsOutStockBill.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsOutStockBill.java new file mode 100644 index 00000000..4362a865 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsOutStockBill.java @@ -0,0 +1,97 @@ +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; + +/** + * 出库单对象 wms_out_stock_bill + * + * @author Yinq + * @date 2025-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_out_stock_bill") +public class WmsOutStockBill extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 出库单ID + */ + @TableId(value = "out_stock_bill_id", type = IdType.AUTO) + private Long outStockBillId; + + /** + * 出库单号 + */ + private String outStockCode; + + /** + * 出库单类型 + */ + private String outStockType; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 关联单号 + */ + private String inventoryAmount; + + /** + * 客户id + */ + private Long customerId; + + /** + * 联系人 + */ + private String customerUser; + + /** + * 联系电话 + */ + private String customerNumber; + + /** + * 出库说明 + */ + private String directions; + + /** + * 出库(单状态1暂存 2审批中 3完成) + */ + private String outStockBillStatus; + + /** + * 流程状态 + */ + private String flowStatus; + + /** + * 仓库ID + */ + private Long warehouseId; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @TableLogic + private String delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutStockBillBo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutStockBillBo.java new file mode 100644 index 00000000..ec9314a7 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutStockBillBo.java @@ -0,0 +1,80 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.wms.domain.WmsOutStockBill; +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.*; + +/** + * 出库单业务对象 wms_out_stock_bill + * + * @author Yinq + * @date 2025-11-12 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsOutStockBill.class, reverseConvertGenerate = false) +public class WmsOutStockBillBo extends BaseEntity { + + /** + * 出库单ID + */ + @NotNull(message = "出库单ID不能为空", groups = { EditGroup.class }) + private Long outStockBillId; + + /** + * 出库单号 + */ + private String outStockCode; + + /** + * 出库单类型 + */ + private String outStockType; + + /** + * 项目ID + */ + private Long projectId; + + /** + * 关联单号 + */ + private String inventoryAmount; + + /** + * 客户id + */ + private Long customerId; + + /** + * 联系人 + */ + private String customerUser; + + /** + * 联系电话 + */ + private String customerNumber; + + /** + * 出库说明 + */ + private String directions; + + /** + * 出库(单状态1暂存 2审批中 3完成) + */ + private String outStockBillStatus; + + /** + * 仓库ID + */ + private Long warehouseId; + + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutStockBillVo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutStockBillVo.java new file mode 100644 index 00000000..808859f2 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutStockBillVo.java @@ -0,0 +1,150 @@ +package org.dromara.wms.domain.vo; + +import org.dromara.wms.domain.WmsOutStockBill; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 出库单视图对象 wms_out_stock_bill + * + * @author Yinq + * @date 2025-11-12 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsOutStockBill.class) +public class WmsOutStockBillVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 出库单ID + */ + @ExcelProperty(value = "出库单ID") + private Long outStockBillId; + + /** + * 租户编号 + */ + @ExcelProperty(value = "租户编号") + private String tenantId; + + /** + * 出库单号 + */ + @ExcelProperty(value = "出库单号") + private String outStockCode; + + /** + * 出库单类型 + */ + @ExcelProperty(value = "出库单类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "out_stock_type") + private String outStockType; + + /** + * 项目ID + */ + @ExcelProperty(value = "项目ID") + private Long projectId; + + /** + * 关联单号 + */ + @ExcelProperty(value = "关联单号") + private String inventoryAmount; + + /** + * 客户id + */ + @ExcelProperty(value = "客户id") + private Long customerId; + + /** + * 联系人 + */ + @ExcelProperty(value = "联系人") + private String customerUser; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String customerNumber; + + /** + * 出库说明 + */ + @ExcelProperty(value = "出库说明") + private String directions; + + /** + * 出库(单状态1暂存 2审批中 3完成) + */ + @ExcelProperty(value = "出库(单状态1暂存 2审批中 3完成)", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "wms_in_stock_bill_status") + private String outStockBillStatus; + + /** + * 流程状态 + */ + @ExcelProperty(value = "流程状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "flow_status") + private String flowStatus; + + /** + * 仓库ID + */ + @ExcelProperty(value = "仓库ID") + private Long warehouseId; + + /** + * 删除标志(0代表存在 1代表删除) + */ + @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=代表存在,1=代表删除") + private String delFlag; + + /** + * 创建部门 + */ + @ExcelProperty(value = "创建部门") + private Long createDept; + + /** + * 创建人 + */ + @ExcelProperty(value = "创建人") + private Long createBy; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @ExcelProperty(value = "更新人") + private Long updateBy; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + private Date updateTime; + + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsOutStockBillMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsOutStockBillMapper.java new file mode 100644 index 00000000..d09dc00c --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/mapper/WmsOutStockBillMapper.java @@ -0,0 +1,39 @@ +package org.dromara.wms.mapper; + +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.dromara.wms.domain.WmsOutStockBill; +import org.dromara.wms.domain.vo.WmsOutStockBillVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.springframework.stereotype.Repository; + +/** + * 出库单Mapper接口 + * + * @author Yinq + * @date 2025-11-12 + */ +@Repository +public interface WmsOutStockBillMapper extends BaseMapperPlus { + + /** + * 查询出库单列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return 出库单集合 + */ + public Page selectCustomWmsOutStockBillVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + + /** + * 查询出库单列表 + * + * @param queryWrapper 条件 + * @return 出库单集合 + */ + public List selectCustomWmsOutStockBillVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsOutStockBillService.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsOutStockBillService.java new file mode 100644 index 00000000..c41b0f52 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/IWmsOutStockBillService.java @@ -0,0 +1,69 @@ +package org.dromara.wms.service; + +import org.dromara.wms.domain.WmsOutStockBill; +import org.dromara.wms.domain.vo.WmsOutStockBillVo; +import org.dromara.wms.domain.bo.WmsOutStockBillBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 出库单Service接口 + * + * @author Yinq + * @date 2025-11-12 + */ +public interface IWmsOutStockBillService { + + /** + * 查询出库单 + * + * @param outStockBillId 主键 + * @return 出库单 + */ + WmsOutStockBillVo queryById(Long outStockBillId); + + /** + * 分页查询出库单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 出库单分页列表 + */ + TableDataInfo queryPageList(WmsOutStockBillBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的出库单列表 + * + * @param bo 查询条件 + * @return 出库单列表 + */ + List queryList(WmsOutStockBillBo bo); + + /** + * 新增出库单 + * + * @param bo 出库单 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsOutStockBillBo bo); + + /** + * 修改出库单 + * + * @param bo 出库单 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsOutStockBillBo bo); + + /** + * 校验并批量删除出库单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java new file mode 100644 index 00000000..d6ff867a --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/service/impl/WmsOutStockBillServiceImpl.java @@ -0,0 +1,136 @@ +package org.dromara.wms.service.impl; + +import org.apache.dubbo.config.annotation.DubboReference; +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.system.api.RemoteCodeRuleService; +import org.springframework.stereotype.Service; +import org.dromara.wms.domain.bo.WmsOutStockBillBo; +import org.dromara.wms.domain.vo.WmsOutStockBillVo; +import org.dromara.wms.domain.WmsOutStockBill; +import org.dromara.wms.mapper.WmsOutStockBillMapper; +import org.dromara.wms.service.IWmsOutStockBillService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 出库单Service业务层处理 + * + * @author Yinq + * @date 2025-11-12 + */ +@RequiredArgsConstructor +@Service +public class WmsOutStockBillServiceImpl implements IWmsOutStockBillService { + + private final WmsOutStockBillMapper baseMapper; + @DubboReference + private RemoteCodeRuleService remoteCodeRuleService; + /** + * 查询出库单 + * + * @param outStockBillId 主键 + * @return 出库单 + */ + @Override + public WmsOutStockBillVo queryById(Long outStockBillId){ + return baseMapper.selectVoById(outStockBillId); + } + + /** + * 分页查询出库单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 出库单分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsOutStockBillBo 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(WmsOutStockBillBo bo) { + MPJLambdaWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private MPJLambdaWrapper buildQueryWrapper(WmsOutStockBillBo bo) { + Map params = bo.getParams(); + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsOutStockBill.class) + .selectAll(WmsOutStockBill.class) + .eq(WmsOutStockBill::getDelFlag, "0") + .eq(StringUtils.isNotBlank(bo.getOutStockType()), WmsOutStockBill::getOutStockType, bo.getOutStockType()) + .eq(bo.getProjectId() != null, WmsOutStockBill::getProjectId, bo.getProjectId()) + .eq(bo.getCustomerId() != null, WmsOutStockBill::getCustomerId, bo.getCustomerId()) + .eq(StringUtils.isNotBlank(bo.getCustomerUser()), WmsOutStockBill::getCustomerUser, bo.getCustomerUser()) + .eq(StringUtils.isNotBlank(bo.getOutStockBillStatus()), WmsOutStockBill::getOutStockBillStatus, bo.getOutStockBillStatus()) + .eq(bo.getWarehouseId() != null, WmsOutStockBill::getWarehouseId, bo.getWarehouseId()) + .eq(bo.getCreateTime() != null, WmsOutStockBill::getCreateTime, bo.getCreateTime()) +; + return lqw; + } + + /** + * 新增出库单 + * + * @param bo 出库单 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsOutStockBillBo bo) { + WmsOutStockBill add = MapstructUtils.convert(bo, WmsOutStockBill.class); + add.setOutStockCode(remoteCodeRuleService.selectCodeRuleCode("1006")); + + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setOutStockBillId(add.getOutStockBillId()); + } + return flag; + } + + /** + * 修改出库单 + * + * @param bo 出库单 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsOutStockBillBo bo) { + WmsOutStockBill update = MapstructUtils.convert(bo, WmsOutStockBill.class); + + return baseMapper.updateById(update) > 0; + } + + + + /** + * 校验并批量删除出库单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsOutStockBillMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsOutStockBillMapper.xml new file mode 100644 index 00000000..04ca5297 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsOutStockBillMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + +