From 776767451819638e5aa83dd8bc3df34cf2c305d6 Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Thu, 9 Jan 2025 13:45:50 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99wms=5Fou?= =?UTF-8?q?tstock=5Forder=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsOutstockOrderController.java | 106 +++++++++++ .../dromara/wms/domain/WmsOutstockOrder.java | 108 +++++++++++ .../wms/domain/bo/WmsOutstockOrderBo.java | 93 ++++++++++ .../wms/domain/vo/WmsOutstockDetailVo.java | 97 ++++++++++ .../wms/domain/vo/WmsOutstockOrderVo.java | 128 +++++++++++++ .../wms/mapper/WmsOutstockOrderMapper.java | 15 ++ .../wms/service/IWmsOutstockOrderService.java | 68 +++++++ .../impl/WmsOutstockOrderServiceImpl.java | 171 ++++++++++++++++++ .../mapper/wms/WmsOutstockOrderMapper.xml | 7 + 9 files changed, 793 insertions(+) create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockOrderMapper.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsOutstockOrderService.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsOutstockOrderMapper.xml diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java new file mode 100644 index 00000000..51950e4d --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsOutstockOrderController.java @@ -0,0 +1,106 @@ +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.WmsOutstockOrderBo; +import org.dromara.wms.domain.vo.WmsOutstockOrderVo; +import org.dromara.wms.service.IWmsOutstockOrderService; +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/outstockOrder + * + * @author LionLi + * @date 2025-01-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/outstockOrder") +public class WmsOutstockOrderController extends BaseController { + + private final IWmsOutstockOrderService wmsOutstockOrderService; + + /** + * 查询出库单列表 + */ + @SaCheckPermission("system:outstockOrder:list") + @GetMapping("/list") + public TableDataInfo list(WmsOutstockOrderBo bo, PageQuery pageQuery) { + return wmsOutstockOrderService.queryPageList(bo, pageQuery); + } + + /** + * 导出出库单列表 + */ + @SaCheckPermission("system:outstockOrder:export") + @Log(title = "出库单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsOutstockOrderBo bo, HttpServletResponse response) { + List list = wmsOutstockOrderService.queryList(bo); + ExcelUtil.exportExcel(list, "出库单", WmsOutstockOrderVo.class, response); + } + + /** + * 获取出库单详细信息 + * + * @param outstockId 主键 + */ + @SaCheckPermission("system:outstockOrder:query") + @GetMapping("/{outstockId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long outstockId) { + return R.ok(wmsOutstockOrderService.queryById(outstockId)); + } + + /** + * 新增出库单 + */ + @SaCheckPermission("system:outstockOrder:add") + @Log(title = "出库单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsOutstockOrderBo bo) { + return toAjax(wmsOutstockOrderService.insertByBo(bo)); + } + + /** + * 修改出库单 + */ + @SaCheckPermission("system:outstockOrder:edit") + @Log(title = "出库单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsOutstockOrderBo bo) { + return toAjax(wmsOutstockOrderService.updateByBo(bo)); + } + + /** + * 删除出库单 + * + * @param outstockIds 主键串 + */ + @SaCheckPermission("system:outstockOrder:remove") + @Log(title = "出库单", businessType = BusinessType.DELETE) + @DeleteMapping("/{outstockIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] outstockIds) { + return toAjax(wmsOutstockOrderService.deleteWithValidByIds(List.of(outstockIds), true)); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java new file mode 100644 index 00000000..0ef6c898 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockOrder.java @@ -0,0 +1,108 @@ +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.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 出库单对象 wms_outstock_order + * + * @author LionLi + * @date 2025-01-08 + */ +@Data +@TableName("wms_outstock_order") +public class WmsOutstockOrder { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 出库单 主键 + */ + @TableId(type = IdType.AUTO) + private Long outstockId; + + /** + * 仓库ID + */ + private Long warehouseId; + + /** + * 出库单号 + */ + private String outstockCode; + + /** + * 出库类型 + */ + private String outstockType; + + /** + * 物料大类 + */ + private String materialCategories; + + /** + * 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成) + */ + private String orderType; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 审核人 + */ + private String auditBy; + + /** + * 审核时间 + */ + private Date auditTime; + + /** + * 审核状态(0待审核,1审核通过,2审核未通过) + */ + private String auditStatus; + + /** + * 审核意见 + */ + private String auditComments; + /** + * 租户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 warehouseCode;//字段映射 + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java new file mode 100644 index 00000000..25877eee --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsOutstockOrderBo.java @@ -0,0 +1,93 @@ +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 java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.wms.domain.WmsOutstockOrder; + +/** + * 出库单业务对象 wms_outstock_order + * + * @author LionLi + * @date 2025-01-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsOutstockOrder.class, reverseConvertGenerate = false) +public class WmsOutstockOrderBo extends BaseEntity { + + /** + * 出库单 主键 + */ +// @NotNull(message = "出库单 主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long outstockId; + + /** + * 仓库ID + */ +// @NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long warehouseId; + + /** + * 出库单号 + */ +// @NotBlank(message = "出库单号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String outstockCode; + + /** + * 出库类型 + */ +// @NotBlank(message = "出库类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String outstockType; + + /** + * 物料大类 + */ +// @NotBlank(message = "物料大类不能为空", groups = { AddGroup.class, EditGroup.class }) + private String materialCategories; + + /** + * 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成) + */ +// @NotBlank(message = "工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderType; + + /** + * 订单编号 + */ +// @NotBlank(message = "订单编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String orderNo; + + /** + * 审核人 + */ +// @NotBlank(message = "审核人不能为空", groups = { AddGroup.class, EditGroup.class }) + private String auditBy; + + /** + * 审核时间 + */ +// @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class }) + private Date auditTime; + + /** + * 审核状态(0待审核,1审核通过,2审核未通过) + */ +// @NotBlank(message = "审核状态(0待审核,1审核通过,2审核未通过)不能为空", groups = { AddGroup.class, EditGroup.class }) + private String auditStatus; + + /** + * 审核意见 + */ +// @NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class }) + private String auditComments; + private String tenantId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java new file mode 100644 index 00000000..40a7f721 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockDetailVo.java @@ -0,0 +1,97 @@ +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 com.ibm.icu.math.BigDecimal; +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.WmsOutstockDetail; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 出库单-物料视图对象 wms_outstock_detail + * + * @author LionLi + * @date 2025-01-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsOutstockDetail.class) +public class WmsOutstockDetailVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + @ExcelProperty(value = "表主键") + private Long outstockDetailId; + + /** + * 出库单号 + */ + @ExcelProperty(value = "出库单号") + private String outstockCode; + + /** + * 出库单 主键 + */ + @ExcelProperty(value = "出库单 主键") + private Long outstockId; + + /** + * 物料id + */ + @ExcelProperty(value = "物料id") + private Long materialId; + + /** + * 出库数量 + */ + @ExcelProperty(value = "出库数量") + private BigDecimal outstockQty; + + /** + * 物料大类 + */ + @ExcelProperty(value = "物料大类") + 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; + + private String materialCode; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java new file mode 100644 index 00000000..1aebe3d7 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockOrderVo.java @@ -0,0 +1,128 @@ +package org.dromara.wms.domain.vo; + +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.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 org.dromara.wms.domain.WmsOutstockOrder; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 出库单视图对象 wms_outstock_order + * + * @author LionLi + * @date 2025-01-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsOutstockOrder.class) +public class WmsOutstockOrderVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 出库单 主键 + */ + @ExcelProperty(value = "出库单 主键") + private Long outstockId; + + /** + * 仓库ID + */ + @ExcelProperty(value = "仓库ID") + private Long warehouseId; + + /** + * 出库单号 + */ + @ExcelProperty(value = "出库单号") + private String outstockCode; + + /** + * 出库类型 + */ + @ExcelProperty(value = "出库类型") + private String outstockType; + + /** + * 物料大类 + */ + @ExcelProperty(value = "物料大类") + private String materialCategories; + + /** + * 工单类型(字典：1销售订单,2生产订单,3手工,4系统生成) + */ + @ExcelProperty(value = "工单类型(字典：1销售订单,2生产订单,3手工,4系统生成)") + private String orderType; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderNo; + + /** + * 审核人 + */ + @ExcelProperty(value = "审核人") + private String auditBy; + + /** + * 审核时间 + */ + @ExcelProperty(value = "审核时间") + private Date auditTime; + + /** + * 审核状态(0待审核,1审核通过,2审核未通过) + */ + @ExcelProperty(value = "审核状态(0待审核,1审核通过,2审核未通过)") + private String auditStatus; + + /** + * 审核意见 + */ + @ExcelProperty(value = "审核意见") + private String auditComments; + /** + * 租户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 warehouseCode;//字段映射 + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockOrderMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockOrderMapper.java new file mode 100644 index 00000000..850aaf0e --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockOrderMapper.java @@ -0,0 +1,15 @@ +package org.dromara.wms.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsOutstockOrder; +import org.dromara.wms.domain.vo.WmsOutstockOrderVo; + +/** + * 出库单Mapper接口 + * + * @author LionLi + * @date 2025-01-08 + */ +public interface WmsOutstockOrderMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsOutstockOrderService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsOutstockOrderService.java new file mode 100644 index 00000000..8900c56f --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsOutstockOrderService.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.WmsOutstockOrderBo; +import org.dromara.wms.domain.vo.WmsOutstockOrderVo; + +import java.util.Collection; +import java.util.List; + +/** + * 出库单Service接口 + * + * @author LionLi + * @date 2025-01-08 + */ +public interface IWmsOutstockOrderService { + + /** + * 查询出库单 + * + * @param outstockId 主键 + * @return 出库单 + */ + WmsOutstockOrderVo queryById(Long outstockId); + + /** + * 分页查询出库单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 出库单分页列表 + */ + TableDataInfo queryPageList(WmsOutstockOrderBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的出库单列表 + * + * @param bo 查询条件 + * @return 出库单列表 + */ + List queryList(WmsOutstockOrderBo bo); + + /** + * 新增出库单 + * + * @param bo 出库单 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsOutstockOrderBo bo); + + /** + * 修改出库单 + * + * @param bo 出库单 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsOutstockOrderBo 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/WmsOutstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java new file mode 100644 index 00000000..f27af785 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsOutstockOrderServiceImpl.java @@ -0,0 +1,171 @@ +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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsOutstockOrder; +import org.dromara.wms.domain.bo.WmsOutstockOrderBo; +import org.dromara.wms.domain.vo.WmsOutstockOrderVo; +import org.dromara.wms.mapper.WmsInstockOrderMapper; +import org.dromara.wms.mapper.WmsOutstockOrderMapper; +import org.dromara.wms.service.IWmsOutstockOrderService; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Collection; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * 出库单Service业务层处理 + * + * @author LionLi + * @date 2025-01-08 + */ +@RequiredArgsConstructor +@Service +public class WmsOutstockOrderServiceImpl implements IWmsOutstockOrderService { + + private final WmsOutstockOrderMapper baseMapper; + private static final AtomicInteger sequence = new AtomicInteger(999); + public static Integer nextSequence() { + return sequence.incrementAndGet(); + } + + /** + * 查询出库单 + * + * @param outstockId 主键 + * @return 出库单 + */ + @Override + public WmsOutstockOrderVo queryById(Long outstockId){ + return baseMapper.selectVoById(outstockId); + } + + /** + * 分页查询出库单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 出库单分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsOutstockOrderBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(WmsOutstockOrder::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的出库单列表 + * + * @param bo 查询条件 + * @return 出库单列表 + */ + @Override + public List queryList(WmsOutstockOrderBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsOutstockOrderBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getOutstockId() != null, WmsOutstockOrder::getOutstockId, bo.getOutstockId()); + lqw.eq(bo.getWarehouseId() != null, WmsOutstockOrder::getWarehouseId, bo.getWarehouseId()); + lqw.eq(StringUtils.isNotBlank(bo.getOutstockCode()), WmsOutstockOrder::getOutstockCode, bo.getOutstockCode()); + lqw.eq(StringUtils.isNotBlank(bo.getOutstockType()), WmsOutstockOrder::getOutstockType, bo.getOutstockType()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterialCategories()), WmsOutstockOrder::getMaterialCategories, bo.getMaterialCategories()); + lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), WmsOutstockOrder::getOrderType, bo.getOrderType()); + lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), WmsOutstockOrder::getOrderNo, bo.getOrderNo()); + lqw.eq(StringUtils.isNotBlank(bo.getAuditBy()), WmsOutstockOrder::getAuditBy, bo.getAuditBy()); + lqw.eq(bo.getAuditTime() != null, WmsOutstockOrder::getAuditTime, bo.getAuditTime()); + lqw.eq(StringUtils.isNotBlank(bo.getAuditStatus()), WmsOutstockOrder::getAuditStatus, bo.getAuditStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getAuditComments()), WmsOutstockOrder::getAuditComments, bo.getAuditComments()); + return lqw; + } + + /** + * 新增出库单 + * + * @param bo 出库单 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsOutstockOrderBo bo) { + Date date = new Date(); + SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHssmm"); + String orderDate = format.format(date); + String order = "OU"; + String orderLast=""; + Integer value = nextSequence(); + if (value.toString().length()==4){ + sequence.set(1); + orderLast = generateOrder(sequence.get()); + }else { + orderLast = generateOrder(value); + } + String outStockOrder = order + orderDate + orderLast; + WmsOutstockOrder add = MapstructUtils.convert(bo, WmsOutstockOrder.class); + validEntityBeforeSave(add); + add.setOutstockCode(outStockOrder); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setOutstockId(add.getOutstockId()); + } + return flag; + } + public String generateOrder(Integer value){ + if (value.toString().length()<3){ + String fixedLengthString = String.format("%03d", value); + return fixedLengthString; + }else if (value.toString().length()==3){ + return value.toString(); + } + return value.toString(); + } + + /** + * 修改出库单 + * + * @param bo 出库单 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsOutstockOrderBo bo) { + WmsOutstockOrder update = MapstructUtils.convert(bo, WmsOutstockOrder.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsOutstockOrder 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/WmsOutstockOrderMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsOutstockOrderMapper.xml new file mode 100644 index 00000000..07e74953 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsOutstockOrderMapper.xml @@ -0,0 +1,7 @@ + + + + +