diff --git a/klp-wms/pom.xml b/klp-wms/pom.xml index 27acb30d..1eb61764 100644 --- a/klp-wms/pom.xml +++ b/klp-wms/pom.xml @@ -16,5 +16,11 @@ 8 UTF-8 - + + + com.klp + klp-common + 0.8.3 + + diff --git a/klp-wms/src/main/java/com/klp/domain/WmsOrder.java b/klp-wms/src/main/java/com/klp/domain/WmsOrder.java new file mode 100644 index 00000000..731dd1b3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsOrder.java @@ -0,0 +1,53 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 订单主对象 wms_order + * + * @author Joshi + * @date 2025-07-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_order") +public class WmsOrder extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 订单ID + */ + @TableId(value = "order_id") + private Long orderId; + /** + * 订单编号 + */ + private String orderCode; + /** + * 客户名称 + */ + private String customerName; + /** + * 销售经理 + */ + private String salesManager; + /** + * 订单状态（0=新建，1=生产中，2=已完成，3=已取消） + */ + private Integer orderStatus; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java new file mode 100644 index 00000000..4105be3d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsOrderBo.java @@ -0,0 +1,51 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 订单主业务对象 wms_order + * + * @author Joshi + * @date 2025-07-18 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsOrderBo extends BaseEntity { + + /** + * 订单ID + */ + private Long orderId; + + /** + * 订单编号 + */ + private String orderCode; + + /** + * 客户名称 + */ + private String customerName; + + /** + * 销售经理 + */ + private String salesManager; + + /** + * 订单状态（0=新建，1=生产中，2=已完成，3=已取消） + */ + private Integer orderStatus; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java new file mode 100644 index 00000000..e0765370 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsOrderVo.java @@ -0,0 +1,60 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 订单主视图对象 wms_order + * + * @author Joshi + * @date 2025-07-18 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsOrderVo { + + private static final long serialVersionUID = 1L; + + /** + * 订单ID + */ + @ExcelProperty(value = "订单ID") + private Long orderId; + + /** + * 订单编号 + */ + @ExcelProperty(value = "订单编号") + private String orderCode; + + /** + * 客户名称 + */ + @ExcelProperty(value = "客户名称") + private String customerName; + + /** + * 销售经理 + */ + @ExcelProperty(value = "销售经理") + private String salesManager; + + /** + * 订单状态（0=新建，1=生产中，2=已完成，3=已取消） + */ + @ExcelProperty(value = "订单状态", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0==新建，1=生产中，2=已完成，3=已取消") + private Integer orderStatus; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsOrderMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsOrderMapper.java new file mode 100644 index 00000000..faaf1a5b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsOrderMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsOrder; +import com.klp.domain.vo.WmsOrderVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 订单主Mapper接口 + * + * @author Joshi + * @date 2025-07-18 + */ +public interface WmsOrderMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsOrderService.java b/klp-wms/src/main/java/com/klp/service/IWmsOrderService.java new file mode 100644 index 00000000..c2bd15b1 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsOrderService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsOrder; +import com.klp.domain.vo.WmsOrderVo; +import com.klp.domain.bo.WmsOrderBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 订单主Service接口 + * + * @author Joshi + * @date 2025-07-18 + */ +public interface IWmsOrderService { + + /** + * 查询订单主 + */ + WmsOrderVo queryById(Long orderId); + + /** + * 查询订单主列表 + */ + TableDataInfo queryPageList(WmsOrderBo bo, PageQuery pageQuery); + + /** + * 查询订单主列表 + */ + List queryList(WmsOrderBo bo); + + /** + * 新增订单主 + */ + Boolean insertByBo(WmsOrderBo bo); + + /** + * 修改订单主 + */ + Boolean updateByBo(WmsOrderBo bo); + + /** + * 校验并批量删除订单主信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java new file mode 100644 index 00000000..cf91bad3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOrderServiceImpl.java @@ -0,0 +1,112 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.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 com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsOrderBo; +import com.klp.domain.vo.WmsOrderVo; +import com.klp.domain.WmsOrder; +import com.klp.mapper.WmsOrderMapper; +import com.klp.service.IWmsOrderService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 订单主Service业务层处理 + * + * @author Joshi + * @date 2025-07-18 + */ +@RequiredArgsConstructor +@Service +public class WmsOrderServiceImpl implements IWmsOrderService { + + private final WmsOrderMapper baseMapper; + + /** + * 查询订单主 + */ + @Override + public WmsOrderVo queryById(Long orderId){ + return baseMapper.selectVoById(orderId); + } + + /** + * 查询订单主列表 + */ + @Override + public TableDataInfo queryPageList(WmsOrderBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询订单主列表 + */ + @Override + public List queryList(WmsOrderBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsOrderBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), WmsOrder::getOrderCode, bo.getOrderCode()); + lqw.like(StringUtils.isNotBlank(bo.getCustomerName()), WmsOrder::getCustomerName, bo.getCustomerName()); + lqw.eq(StringUtils.isNotBlank(bo.getSalesManager()), WmsOrder::getSalesManager, bo.getSalesManager()); + lqw.eq(bo.getOrderStatus() != null, WmsOrder::getOrderStatus, bo.getOrderStatus()); + return lqw; + } + + /** + * 新增订单主 + */ + @Override + public Boolean insertByBo(WmsOrderBo bo) { + WmsOrder add = BeanUtil.toBean(bo, WmsOrder.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setOrderId(add.getOrderId()); + } + return flag; + } + + /** + * 修改订单主 + */ + @Override + public Boolean updateByBo(WmsOrderBo bo) { + WmsOrder update = BeanUtil.toBean(bo, WmsOrder.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsOrder entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除订单主 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/WmsOrderMapper.xml b/klp-wms/src/main/resources/mapper/WmsOrderMapper.xml new file mode 100644 index 00000000..ca63c3ce --- /dev/null +++ b/klp-wms/src/main/resources/mapper/WmsOrderMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + +