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

feat(mes,wms): 新增设备送检审批流程及相关功能

Browse Source 
1. 新增设备送检审批的API接口层
2. 在待办页面添加设备送检审批标签页
3. 完善设备巡检日报的送检提交功能
4. 修复报表模板查询的参数传递问题
5. 优化设备送检审批单的业务逻辑处理
This commit is contained in:
砂糖
2026-05-29 17:05:23 +08:00
parent d6099a781f
commit aad568f320
6 changed files with 340 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
klp-mes/src/main/java/com/klp/mes/eqp/service/impl/EqpEquipmentInspectionApprovalServiceImpl.java
View File

@@ -81,12 +81,8 @@ public class EqpEquipmentInspectionApprovalServiceImpl implements IEqpEquipmentI
@Override
public Boolean insertByBo(EqpEquipmentInspectionApprovalBo bo) {
EqpEquipmentInspectionApproval add = BeanUtil.toBean(bo, EqpEquipmentInspectionApproval.class);
if (StringUtils.isBlank(bo.getApprovalUser())) {
add.setApprovalUser(LoginHelper.getNickName());
}
if (bo.getApplyTime() == null) {
add.setApplyTime(new Date());
}
add.setApplyUser(LoginHelper.getNickName());
add.setApplyTime(new Date());
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
@@ -101,6 +97,10 @@ public class EqpEquipmentInspectionApprovalServiceImpl implements IEqpEquipmentI
@Override
public Boolean updateByBo(EqpEquipmentInspectionApprovalBo bo) {
EqpEquipmentInspectionApproval update = BeanUtil.toBean(bo, EqpEquipmentInspectionApproval.class);
if (bo.getApprovalStatus() != null && (bo.getApprovalStatus() == 2 || bo.getApprovalStatus() == 3)) {
update.setApprovalUser(LoginHelper.getNickName());
update.setApprovalTime(new Date());
}
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}