From 4cfee88fa7fad14de4908e1776ebd044d0c4e87f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 09 八月 2024 16:37:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 2 +-
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 1 +
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java | 2 +-
src/main/webapp/views/pipeline.html | 2 +-
src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index d71cb10..efb6049 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -144,7 +144,7 @@
/************************** 璇︽儏鎿嶄綔 ******************************/
/****************************************************************/
- @GetMapping("/detl/{siteId}")
+ @GetMapping("/detl/wcs/{siteId}")
public R siteDetl(@PathVariable("siteId") Integer siteId){
SiteTableVo vo = new SiteTableVo();
for (DevpSlave devp : slaveProperties.getDevp()) {
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8ff93d1..a0d5e80 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -60,7 +60,7 @@
private static final int[][] execute = new int[][]{{1,4},{2,4},{3,4},{4,4},{5,6},{6,6},{7,4},{8,4},{9,3},{10,4},{11,4}};
private static final Integer jarMaxLoc = 7;
- private static final Float jarTemperature = 50F;
+ private static final Float jarTemperature = 80F;
@Autowired
private CommonService commonService;
@Autowired
diff --git a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
index bf94419..0ac9f54 100644
--- a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
@@ -34,7 +34,7 @@
}
}
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){//涓婁紶寮�寮忓喎鍗翠俊鍙�
int[] jarList =new int[]{1,2,3,4,5,6};
for (int jarNo : jarList){
diff --git a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
index 8c525f1..bdd3464 100644
--- a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
@@ -126,7 +126,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("Code")==200) {
+ if (jsonObject.getInteger("code")==200) {
success = true;
} else {
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犺姹傛帴鍙ｅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index d719f26..f2ed2b9 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -70,6 +70,7 @@
if (staProtocol.isAutoing() && staProtocol.getWorkNo()!=0){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()));
if (Cools.isEmpty(wrkMast)) return FAIL;
+ if (wrkMast.getSheetNo().equals("2")) return FAIL;
if (wrkMast.getSheetNo()!=null && wrkMast.getSheetNo()=="2") return FAIL;
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
WrkDetl wrkDetl = null;
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c316cbd..540df2b 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -412,7 +412,7 @@
closeBtn: 0,
content: $("#site-detl"),
success: function(layero, index){
- http.get(baseUrl+ "/site/detl/"+siteId, null, function (res) {
+ http.get(baseUrl+ "/site/detl/wcs/"+siteId, null, function (res) {
$('#siteId').val(siteId);
$('#workNo').val(res.data.workNo);
$('#staNo').val(res.data.staNo);
--
Gitblit v1.9.1