From 2402bfd8833ceae684cab99f2981afda75893ea4 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期日, 16 六月 2024 14:55:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/BasJarController.java | 2 +-
src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | 2 +-
src/main/resources/application.yml | 7 +++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasJarController.java b/src/main/java/com/zy/asrs/controller/BasJarController.java
index 2d8aa66..b608c15 100644
--- a/src/main/java/com/zy/asrs/controller/BasJarController.java
+++ b/src/main/java/com/zy/asrs/controller/BasJarController.java
@@ -126,7 +126,7 @@
@PostMapping("/table/jar/state")
- @ManagerAuth(memo = "RGV淇℃伅琛�")
+// @ManagerAuth(memo = "RGV淇℃伅琛�")
public R rgvStateTable(){
List<JarStateTableVo> list = new ArrayList<>();
List<BasJar> jars = basJarService.selectList(new EntityWrapper<BasJar>().orderBy("jar_no"));
diff --git a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
index 1343f7b..ed366a2 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -65,7 +65,7 @@
continue;
}
WrkMastSplitTwin wrkMastSplitTwin = wrkMastSplitTwinList.get(0);
- if (wrkMastSplitTwin.getWrkType()!=1){
+ if (wrkMastSplitTwin.getWrkType()!=1 && wrkMastSplitTwin.getWrkType()!=2){
continue;
}
wrkMastSplitTwinList = wrkMastSplitTwinService.getWrkMastSplitTwinNoComplete(crnNo, 2, null, null, 4);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b7781b6..fd287b7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8082
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -10,9 +10,12 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
+ url: jdbc:sqlserver://10.10.10.254:1433;databasename=ahyxasrs
username: sa
password: sa@123
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
--
Gitblit v1.9.1