DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2025-11-15 16:04:46 +08:00
parent ef3a764b19 acd4202d26
commit 4d7ad302ee
12 changed files with 556 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-admin/pom.xml
View File

@@ -104,6 +104,10 @@
<groupId>com.klp</groupId>
<artifactId>klp-pocket</artifactId>
</dependency>
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-erp</artifactId>
</dependency>
<!-- 扫码枪模块-->
<dependency>

6
klp-admin/src/main/resources/application-prod.yml
View File

@@ -123,7 +123,7 @@ spring:
# 密码(如没有密码请注释掉)
password: KeLunPu123!
# 连接超时时间
timeout: 10s
timeout: 30s
# 是否开启ssl
ssl: false
@@ -143,9 +143,9 @@ redisson:
# 连接池大小
connectionPoolSize: 64
# 连接空闲超时，单位：毫秒
idleConnectionTimeout: 10000
idleConnectionTimeout: 100000
# 命令等待超时，单位：毫秒
timeout: 3000
timeout: 30000
# 发布和订阅连接池大小
subscriptionConnectionPoolSize: 50

22
klp-erp/pom.xml Normal file
View File

@@ -0,0 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.klp</groupId>
<artifactId>klp-oa</artifactId>
<version>0.8.3</version>
</parent>
<artifactId>klp-erp</artifactId>
<name>klp-erp</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!-- 依赖wms模块以后所有的关于两种表的操作都在当前模块实现-->
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-wms</artifactId>
</dependency>
</dependencies>
</project>

99
klp-erp/src/main/java/com/klp/erp/controller/ErpPurchaseOrderController.java Normal file
View File

@@ -0,0 +1,99 @@
package com.klp.erp.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.erp.domain.vo.ErpPurchaseOrderVo;
import com.klp.erp.domain.bo.ErpPurchaseOrderBo;
import com.klp.erp.service.IErpPurchaseOrderService;
import com.klp.common.core.page.TableDataInfo;
/**
* 采购订单主
*
* @author klp
* @date 2025-11-13
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/erp/purchaseOrder")
public class ErpPurchaseOrderController extends BaseController {
private final IErpPurchaseOrderService iErpPurchaseOrderService;
/**
* 查询采购订单主列表
*/
@GetMapping("/list")
public TableDataInfo<ErpPurchaseOrderVo> list(ErpPurchaseOrderBo bo, PageQuery pageQuery) {
return iErpPurchaseOrderService.queryPageList(bo, pageQuery);
}
/**
* 导出采购订单主列表
*/
@Log(title = "采购订单主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ErpPurchaseOrderBo bo, HttpServletResponse response) {
List<ErpPurchaseOrderVo> list = iErpPurchaseOrderService.queryList(bo);
ExcelUtil.exportExcel(list, "采购订单主", ErpPurchaseOrderVo.class, response);
}
/**
* 获取采购订单主详细信息
*
* @param orderId 主键
*/
@GetMapping("/{orderId}")
public R<ErpPurchaseOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long orderId) {
return R.ok(iErpPurchaseOrderService.queryById(orderId));
}
/**
* 新增采购订单主
*/
@Log(title = "采购订单主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody ErpPurchaseOrderBo bo) {
return toAjax(iErpPurchaseOrderService.insertByBo(bo));
}
/**
* 修改采购订单主
*/
@Log(title = "采购订单主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ErpPurchaseOrderBo bo) {
return toAjax(iErpPurchaseOrderService.updateByBo(bo));
}
/**
* 删除采购订单主
*
* @param orderIds 主键串
*/
@Log(title = "采购订单主", businessType = BusinessType.DELETE)
@DeleteMapping("/{orderIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] orderIds) {
return toAjax(iErpPurchaseOrderService.deleteWithValidByIds(Arrays.asList(orderIds), true));
}
}

68
klp-erp/src/main/java/com/klp/erp/domain/ErpPurchaseOrder.java Normal file
View File

@@ -0,0 +1,68 @@
package com.klp.erp.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 采购订单主对象 erp_purchase_order
*
* @author klp
* @date 2025-11-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("erp_purchase_order")
public class ErpPurchaseOrder extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 订单ID
*/
@TableId(value = "order_id")
private Long orderId;
/**
* 订单编号
*/
private String orderCode;
/**
* 供应商ID
*/
private Long supplierId;
/**
* 下单日期
*/
private Date orderDate;
/**
* 预计到货日期
*/
private Date expectedArrival;
/**
* 订单类型
*/
private String orderType;
/**
* 订单总金额
*/
private BigDecimal totalAmount;
/**
* 订单状态
*/
private Long orderStatus;
/**
* 删除标志
*/
@TableLogic
private Long delFlag;
/**
* 备注
*/
private String remark;
}

69
klp-erp/src/main/java/com/klp/erp/domain/bo/ErpPurchaseOrderBo.java Normal file
View File

@@ -0,0 +1,69 @@
package com.klp.erp.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 采购订单主业务对象 erp_purchase_order
*
* @author klp
* @date 2025-11-13
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class ErpPurchaseOrderBo extends BaseEntity {
/**
* 订单ID
*/
private Long orderId;
/**
* 订单编号
*/
private String orderCode;
/**
* 供应商ID
*/
private Long supplierId;
/**
* 下单日期
*/
private Date orderDate;
/**
* 预计到货日期
*/
private Date expectedArrival;
/**
* 订单类型
*/
private String orderType;
/**
* 订单总金额
*/
private BigDecimal totalAmount;
/**
* 订单状态
*/
private Long orderStatus;
/**
* 备注
*/
private String remark;
}

80
klp-erp/src/main/java/com/klp/erp/domain/vo/ErpPurchaseOrderVo.java Normal file
View File

@@ -0,0 +1,80 @@
package com.klp.erp.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
/**
* 采购订单主视图对象 erp_purchase_order
*
* @author klp
* @date 2025-11-13
*/
@Data
@ExcelIgnoreUnannotated
public class ErpPurchaseOrderVo {
private static final long serialVersionUID = 1L;
/**
* 订单ID
*/
@ExcelProperty(value = "订单ID")
private Long orderId;
/**
* 订单编号
*/
@ExcelProperty(value = "订单编号")
private String orderCode;
/**
* 供应商ID
*/
@ExcelProperty(value = "供应商ID")
private Long supplierId;
/**
* 下单日期
*/
@ExcelProperty(value = "下单日期")
private Date orderDate;
/**
* 预计到货日期
*/
@ExcelProperty(value = "预计到货日期")
private Date expectedArrival;
/**
* 订单类型
*/
@ExcelProperty(value = "订单类型")
private String orderType;
/**
* 订单总金额
*/
@ExcelProperty(value = "订单总金额")
private BigDecimal totalAmount;
/**
* 订单状态
*/
@ExcelProperty(value = "订单状态")
private Long orderStatus;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

15
klp-erp/src/main/java/com/klp/erp/mapper/ErpPurchaseOrderMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.klp.erp.mapper;
import com.klp.erp.domain.ErpPurchaseOrder;
import com.klp.erp.domain.vo.ErpPurchaseOrderVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 采购订单主Mapper接口
*
* @author klp
* @date 2025-11-13
*/
public interface ErpPurchaseOrderMapper extends BaseMapperPlus<ErpPurchaseOrderMapper, ErpPurchaseOrder, ErpPurchaseOrderVo> {
}

49
klp-erp/src/main/java/com/klp/erp/service/IErpPurchaseOrderService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.erp.service;
import com.klp.erp.domain.ErpPurchaseOrder;
import com.klp.erp.domain.vo.ErpPurchaseOrderVo;
import com.klp.erp.domain.bo.ErpPurchaseOrderBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 采购订单主Service接口
*
* @author klp
* @date 2025-11-13
*/
public interface IErpPurchaseOrderService {
/**
* 查询采购订单主
*/
ErpPurchaseOrderVo queryById(Long orderId);
/**
* 查询采购订单主列表
*/
TableDataInfo<ErpPurchaseOrderVo> queryPageList(ErpPurchaseOrderBo bo, PageQuery pageQuery);
/**
* 查询采购订单主列表
*/
List<ErpPurchaseOrderVo> queryList(ErpPurchaseOrderBo bo);
/**
* 新增采购订单主
*/
Boolean insertByBo(ErpPurchaseOrderBo bo);
/**
* 修改采购订单主
*/
Boolean updateByBo(ErpPurchaseOrderBo bo);
/**
* 校验并批量删除采购订单主信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

116
klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java Normal file
View File

@@ -0,0 +1,116 @@
package com.klp.erp.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.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import com.klp.erp.domain.bo.ErpPurchaseOrderBo;
import com.klp.erp.domain.vo.ErpPurchaseOrderVo;
import com.klp.erp.domain.ErpPurchaseOrder;
import com.klp.erp.mapper.ErpPurchaseOrderMapper;
import com.klp.erp.service.IErpPurchaseOrderService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 采购订单主Service业务层处理
*
* @author klp
* @date 2025-11-13
*/
@RequiredArgsConstructor
@Service
public class ErpPurchaseOrderServiceImpl implements IErpPurchaseOrderService {
private final ErpPurchaseOrderMapper baseMapper;
/**
* 查询采购订单主
*/
@Override
public ErpPurchaseOrderVo queryById(Long orderId){
return baseMapper.selectVoById(orderId);
}
/**
* 查询采购订单主列表
*/
@Override
public TableDataInfo<ErpPurchaseOrderVo> queryPageList(ErpPurchaseOrderBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<ErpPurchaseOrder> lqw = buildQueryWrapper(bo);
Page<ErpPurchaseOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询采购订单主列表
*/
@Override
public List<ErpPurchaseOrderVo> queryList(ErpPurchaseOrderBo bo) {
LambdaQueryWrapper<ErpPurchaseOrder> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<ErpPurchaseOrder> buildQueryWrapper(ErpPurchaseOrderBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<ErpPurchaseOrder> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), ErpPurchaseOrder::getOrderCode, bo.getOrderCode());
lqw.eq(bo.getSupplierId() != null, ErpPurchaseOrder::getSupplierId, bo.getSupplierId());
lqw.eq(bo.getOrderDate() != null, ErpPurchaseOrder::getOrderDate, bo.getOrderDate());
lqw.eq(bo.getExpectedArrival() != null, ErpPurchaseOrder::getExpectedArrival, bo.getExpectedArrival());
lqw.eq(StringUtils.isNotBlank(bo.getOrderType()), ErpPurchaseOrder::getOrderType, bo.getOrderType());
lqw.eq(bo.getTotalAmount() != null, ErpPurchaseOrder::getTotalAmount, bo.getTotalAmount());
lqw.eq(bo.getOrderStatus() != null, ErpPurchaseOrder::getOrderStatus, bo.getOrderStatus());
return lqw;
}
/**
* 新增采购订单主
*/
@Override
public Boolean insertByBo(ErpPurchaseOrderBo bo) {
ErpPurchaseOrder add = BeanUtil.toBean(bo, ErpPurchaseOrder.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setOrderId(add.getOrderId());
}
return flag;
}
/**
* 修改采购订单主
*/
@Override
public Boolean updateByBo(ErpPurchaseOrderBo bo) {
ErpPurchaseOrder update = BeanUtil.toBean(bo, ErpPurchaseOrder.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ErpPurchaseOrder entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除采购订单主
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

25
klp-erp/src/main/resources/mapper/erp/ErpPurchaseOrderMapper.xml Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.erp.mapper.ErpPurchaseOrderMapper">
<resultMap type="com.klp.erp.domain.ErpPurchaseOrder" id="ErpPurchaseOrderResult">
<result property="orderId" column="order_id"/>
<result property="orderCode" column="order_code"/>
<result property="supplierId" column="supplier_id"/>
<result property="orderDate" column="order_date"/>
<result property="expectedArrival" column="expected_arrival"/>
<result property="orderType" column="order_type"/>
<result property="totalAmount" column="total_amount"/>
<result property="orderStatus" column="order_status"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>

6
pom.xml
View File

@@ -386,6 +386,11 @@
<artifactId>klp-pocket</artifactId>
<version>${klp-flowable-plus.version}</version>
</dependency>
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-erp</artifactId>
<version>${klp-flowable-plus.version}</version>
</dependency>
</dependencies>
@@ -408,6 +413,7 @@
<module>klp-mes</module>
<module>klp-ems</module>
<module>klp-pocket</module>
<module>klp-erp</module>
</modules>
<packaging>pom</packaging>