From f0d105ece8d635fce933266af8c9943542975bcd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 19 十一月 2025 14:20:28 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 20 ++++++++++----------
src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/ArmRulesScheduler.java | 2 +-
src/main/webapp/static/js/common.js | 2 +-
pom.xml | 2 +-
src/main/resources/application.yml | 6 +++---
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 74a13d6..e50470c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
</dependencies>
<build>
- <finalName>jshdasrs</finalName>
+ <finalName>zzgtasrs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java b/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
index c10c764..45e90ed 100644
--- a/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
@@ -29,7 +29,7 @@
@Autowired
private ArmRulesHandler armRulesHandler;
- @Scheduled(cron = "0 0 * * * ? ")
+// @Scheduled(cron = "0 0 * * * ? ")
private void execute(){
List<BasArmRules> basArmRules = basArmRulesService.AllStatusSatisfyBasArmRules(0);
if (basArmRules.isEmpty()) {
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 705c4f5..04eb68b 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -28,7 +28,7 @@
/*
* 鑷姩璋冪┖鏉垮嚭搴�
* */
- @Scheduled(cron = "0/10 * * * * ? ")
+// @Scheduled(cron = "0/10 * * * * ? ")
private void execute(){
if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
Config config = configService.selectConfigByCode("AutomaticFillingBoard");
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 8786ba7..6baa4cf 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -32,7 +32,7 @@
@Autowired
private BasArmMastSignService basArmMastSignService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine() {
//鑾峰彇鏈笅鍙戝崟鎹�
List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 884015d..4a21c46 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -37,14 +37,14 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
- if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
- continue;
- }
- }
- if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
- continue;
- }
+// if(wrkMast.getIoType() != 11 && wrkMast.getStaNo() < 4000 && wrkMast.getWrkNo() != 9997 && wrkMast.getWrkNo() != 9996){
+// if(Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("2")){
+// continue;
+// }
+// }
+// if (!Cools.isEmpty(wrkMast.getTakeNone()) && wrkMast.getTakeNone().equals("1")){
+// continue;
+// }
ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
@@ -52,7 +52,7 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
private void executeArm(){
List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
if (basArmMastList.isEmpty()) {
@@ -66,7 +66,7 @@
}
}
- @Scheduled(cron = "0/10 * * * * ? ")
+// @Scheduled(cron = "0/10 * * * * ? ")
private void executeAgv(){
List<BasArmMast> basArmMastList = basArmMastService.selectList(new EntityWrapper<BasArmMast>().eq("status", 6));
if (basArmMastList.isEmpty()) {
diff --git a/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
index 4acad06..420cf99 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastAgvScheduler.java
@@ -21,7 +21,7 @@
@Autowired
private BasAgvMastService basAgvMastService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 2));
if (basAgvMastList.isEmpty()) {
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 6804b02..1afaba8 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -84,7 +84,7 @@
// }};
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
for(Integer staNo : STA_WORK_IN){
BasDevp basDevp = basDevpService.selectById(staNo);
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java
index 408c6ab..22654f1 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaLogScheduler.java
@@ -20,7 +20,7 @@
@Autowired
private WrkMastStaService wrkMastStaService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
List<WrkMastSta> wrkMastStas = wrkMastStaService.selectToBeHistoryData();
if (wrkMastStas.isEmpty()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fb3133a..e6d4a38 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,8 +11,8 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
- url: jdbc:sqlserver://10.10.10.235;databasename=jshdasrs
-# url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
+# url: jdbc:sqlserver://10.10.10.235;databasename=zzgtasrs
+ url: jdbc:sqlserver://192.168.4.191:50948;databasename=zzgtasrs
username: sa
password: sa@123
mvc:
@@ -41,7 +41,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: jshdasrs
+ subject: zzgtasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3fca8b5..ff3d378 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jshdasrs";
+var baseUrl = "/zzgtasrs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1