licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

抛异常代码改造

Browse Source
This commit is contained in:
zxy 2026-01-12 17:57:44 +08:00
parent d4368b3559
commit 1acef9b999
2 changed files with 3 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
mes-module-heli/mes-module-heli-biz/.flattened-pom.xml
View File

@ -1,107 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-heli</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-heli-biz</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>合立业务模块</description>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-heli-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-biz</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra-biz</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-operatelog</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-tenant</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-job</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mq</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
<groupId>cn.smallbun.screw</groupId>
<artifactId>screw-core</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-monitor</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-file</artifactId>
</dependency>
<dependency>
<groupId>com.github.dadiyang</groupId>
<artifactId>equator</artifactId>
<version>1.0.4</version>
</dependency>
</dependencies>
</project>

3
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java
View File

@ -57,6 +57,9 @@ public class TaskInReportServiceImpl implements TaskInReportService {
@Override
public void rework(Long id, String remark) {
TaskInReportDO taskInReportDO = taskInReportMapper.selectById(id);
if (taskInReportDO == null) {
throw exception(TASK_IN_REPORT_NOT_EXISTS);
}
TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskInReportDO.getDispatchDetailId());
if (taskDispatchDetailDO != null) {
if (taskDispatchDetailDO.getInReportProcess() != 2) {