kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
刘名喜 2024-11-27 15:20:26 +08:00
commit bc00c4380c
4 changed files with 87 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ktg-admin/pom.xml
View File

@ -30,6 +30,41 @@
<artifactId>springfox-boot-starter</artifactId> <artifactId>springfox-boot-starter</artifactId>
</dependency> </dependency>
<!-- 测试 -->
<!-- 测试所需 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!--去除内嵌tomcat-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-websocket -->
<!--websocket依赖包-->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>8.5.23</version>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 --> <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
@ -37,7 +72,7 @@
<version>1.6.2</version> <version>1.6.2</version>
</dependency> </dependency>
<!-- Mysql驱动包 --> <!-- Mysql驱动包 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
@ -68,20 +103,43 @@
</dependency> </dependency>
<!-- 达梦数据库驱动依赖 --> <!-- 达梦数据库驱动依赖 -->
<!-- <dependency>-->
<!-- <groupId>com.dameng</groupId>-->
<!-- <artifactId>DmJdbcDriver18</artifactId>-->
<!-- <version>8.1.2.79</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.dameng</groupId>-->
<!-- <artifactId>DmDialect-for-hibernate5.4</artifactId>-->
<!-- <version>8.1.3.140</version>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.dm</groupId>-->
<!-- <artifactId>DmJdbcDriver</artifactId>-->
<!-- <version>1.8</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${basedir}/lib/DmJdbcDriver18.jar</systemPath>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.dm.dialect</groupId>-->
<!-- <artifactId>hibernate5</artifactId>-->
<!-- <version>5.4</version>-->
<!-- <scope>system</scope>-->
<!-- <systemPath>${basedir}/lib/DmDialect-for-hibernate5.4.jar</systemPath>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.dm</groupId> <groupId>com.dm</groupId>
<artifactId>DmJdbcDriver</artifactId> <artifactId>DmJdbcDriver</artifactId>
<version>1.8</version> <version>1.8</version>
<scope>system</scope>
<systemPath>${basedir}/lib/DmJdbcDriver18.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dm.dialect</groupId> <groupId>com.dm.dialect</groupId>
<artifactId>hibernate5</artifactId> <artifactId>hibernate5</artifactId>
<version>5.4</version> <version>5.4</version>
<scope>system</scope>
<systemPath>${basedir}/lib/DmDialect-for-hibernate5.4.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -109,7 +167,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName> <warName>${project.artifactId}</warName>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>
</build> </build>

4
ktg-admin/src/main/resources/application-druid.yml
View File

@ -7,8 +7,8 @@ spring:
# 主库数据源 # 主库数据源
master: master:
# url: jdbc:dm://30.30.2.24:5237/WMS_DJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:dm://30.30.2.24:5237/WMS_DJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:dm://localhost:5236/WMS_DJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:dm://localhost:5236/WMS_DJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:dm://192.168.8.60:5236/WMS_DJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:dm://192.168.8.60:5236/WMS_DJ?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: SYSDBA username: SYSDBA
password: SYSDBA password: SYSDBA
# 从库数据源 # 从库数据源

13
ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsOutTask.java
View File

@ -44,6 +44,11 @@ public class WmsOutTask extends BaseEntity {
@Excel(name = "出库类型ID") @Excel(name = "出库类型ID")
private Long wmsBusinessTypeId; private Long wmsBusinessTypeId;
/**
* 出库类型编码
*/
private String wmsBusinessTypeCode;
/** /**
* 任务编码 * 任务编码
*/ */
@ -204,6 +209,14 @@ public class WmsOutTask extends BaseEntity {
this.wmStorageAreaId = wmStorageAreaId; this.wmStorageAreaId = wmStorageAreaId;
} }
public String getWmsBusinessTypeCode() {
return wmsBusinessTypeCode;
}
public void setWmsBusinessTypeCode(String wmsBusinessTypeCode) {
this.wmsBusinessTypeCode = wmsBusinessTypeCode;
}
public String getBatchNum() { public String getBatchNum() {
return batchNum; return batchNum;
} }

9
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
View File

@ -136,7 +136,14 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService {
*/ */
@Override @Override
public List<WmsOutTask> selectWmsOutTaskList(WmsOutTask wmsOutTask) { public List<WmsOutTask> selectWmsOutTaskList(WmsOutTask wmsOutTask) {
return wmsOutTaskMapper.selectWmsOutTaskList(wmsOutTask); List<WmsOutTask> wmsOutTasks = new ArrayList<>();
wmsOutTaskMapper.selectWmsOutTaskList(wmsOutTask).forEach(nowWmsOutTask -> {
WmsBusinessType wmsBusinessType = wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(nowWmsOutTask.getWmsBusinessTypeId().toString());
nowWmsOutTask.setWmsBusinessTypeCode(wmsBusinessType.getCode());
wmsOutTasks.add(nowWmsOutTask);
});
return wmsOutTasks;
} }
/** /**