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

feat(wms/report): 新增修复报告页面和功能

Browse Source 
feat(ems/assisted): 添加公辅消耗记录和类型管理功能

fix(eqp): 修改公辅消耗记录接口返回类型为Long

refactor(wms/report): 优化合并模板查询逻辑和统计信息展示

style(wms/report): 调整时间范围选择器组件逻辑

docs(wms/report): 更新配置文件中产线类型配置

feat(wms/report): 新增异常报告页面和功能
This commit is contained in:
砂糖
2026-04-30 13:57:42 +08:00
parent 9967d8be46
commit 12b3f0556d
18 changed files with 1543 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-mes/src/main/java/com/klp/mes/eqp/controller/EqpAuxiliaryConsumeController.java
View File

@@ -71,8 +71,8 @@ public class EqpAuxiliaryConsumeController extends BaseController {
@Log(title = "公辅消耗记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryConsumeBo bo) {
return toAjax(iEqpAuxiliaryConsumeService.insertByBo(bo));
public R<Long> add(@Validated(AddGroup.class) @RequestBody EqpAuxiliaryConsumeBo bo) {
return R.ok(iEqpAuxiliaryConsumeService.insertByBo(bo));
}
/**

3
klp-mes/src/main/java/com/klp/mes/eqp/domain/bo/EqpAuxiliaryConsumeBo.java
View File

@@ -8,6 +8,7 @@ import javax.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 公辅消耗记录业务对象 eqp_auxiliary_consume
@@ -28,6 +29,8 @@ public class EqpAuxiliaryConsumeBo extends BaseEntity {
/**
* 记录日期
*/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date recordDate;
/**

2
klp-mes/src/main/java/com/klp/mes/eqp/service/IEqpAuxiliaryConsumeService.java
View File

@@ -35,7 +35,7 @@ public interface IEqpAuxiliaryConsumeService {
/**
* 新增公辅消耗记录
*/
Boolean insertByBo(EqpAuxiliaryConsumeBo bo);
Long insertByBo(EqpAuxiliaryConsumeBo bo);
/**
* 修改公辅消耗记录

4
klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpAuxiliaryConsumeServiceImpl.java
View File

@@ -70,14 +70,14 @@ public class EqpAuxiliaryConsumeServiceImpl implements IEqpAuxiliaryConsumeServi
* 新增公辅消耗记录
*/
@Override
public Boolean insertByBo(EqpAuxiliaryConsumeBo bo) {
public Long insertByBo(EqpAuxiliaryConsumeBo bo) {
EqpAuxiliaryConsume add = BeanUtil.toBean(bo, EqpAuxiliaryConsume.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setConsumeId(add.getConsumeId());
}
return flag;
return add.getConsumeId();
}
/**