diff --git a/ktg-admin/pom.xml b/ktg-admin/pom.xml
index d1db2ec..dbebbe6 100644
--- a/ktg-admin/pom.xml
+++ b/ktg-admin/pom.xml
@@ -30,6 +30,41 @@
springfox-boot-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ junit
+ junit
+ test
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+ provided
+
+
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-websocket
+ 8.5.23
+
+
+
+ javax.websocket
+ javax.websocket-api
+ 1.1
+ provided
+
+
+
io.swagger
@@ -37,7 +72,7 @@
1.6.2
-
+
mysql
mysql-connector-java
@@ -68,20 +103,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
com.dm
DmJdbcDriver
1.8
- system
- ${basedir}/lib/DmJdbcDriver18.jar
com.dm.dialect
hibernate5
5.4
- system
- ${basedir}/lib/DmDialect-for-hibernate5.4.jar
+
@@ -109,7 +167,7 @@
false
${project.artifactId}
-
+
${project.artifactId}
diff --git a/ktg-admin/src/main/resources/application-druid.yml b/ktg-admin/src/main/resources/application-druid.yml
index 29031e6..ac71691 100644
--- a/ktg-admin/src/main/resources/application-druid.yml
+++ b/ktg-admin/src/main/resources/application-druid.yml
@@ -7,8 +7,8 @@ spring:
# 主库数据源
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://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://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
username: SYSDBA
password: SYSDBA
# 从库数据源
diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsOutTask.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsOutTask.java
index 67be088..1b736a3 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsOutTask.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsOutTask.java
@@ -44,6 +44,11 @@ public class WmsOutTask extends BaseEntity {
@Excel(name = "出库类型ID")
private Long wmsBusinessTypeId;
+ /**
+ * 出库类型编码
+ */
+ private String wmsBusinessTypeCode;
+
/**
* 任务编码
*/
@@ -204,6 +209,14 @@ public class WmsOutTask extends BaseEntity {
this.wmStorageAreaId = wmStorageAreaId;
}
+ public String getWmsBusinessTypeCode() {
+ return wmsBusinessTypeCode;
+ }
+
+ public void setWmsBusinessTypeCode(String wmsBusinessTypeCode) {
+ this.wmsBusinessTypeCode = wmsBusinessTypeCode;
+ }
+
public String getBatchNum() {
return batchNum;
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
index 52b2121..5225050 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsOutTaskServiceImpl.java
@@ -136,7 +136,14 @@ public class WmsOutTaskServiceImpl implements IWmsOutTaskService {
*/
@Override
public List selectWmsOutTaskList(WmsOutTask wmsOutTask) {
- return wmsOutTaskMapper.selectWmsOutTaskList(wmsOutTask);
+ List wmsOutTasks = new ArrayList<>();
+ wmsOutTaskMapper.selectWmsOutTaskList(wmsOutTask).forEach(nowWmsOutTask -> {
+ WmsBusinessType wmsBusinessType = wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(nowWmsOutTask.getWmsBusinessTypeId().toString());
+ nowWmsOutTask.setWmsBusinessTypeCode(wmsBusinessType.getCode());
+ wmsOutTasks.add(nowWmsOutTask);
+ });
+
+ return wmsOutTasks;
}
/**