From 295ee7dd14f5d36e2fe442714ab0a80c480c8029 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 15 十二月 2025 15:31:32 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java | 58 ++++++++++++++--------------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++--
src/main/java/com/zy/common/service/CommonService.java | 2
src/main/resources/application.yml | 7 ---
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | 6 +-
5 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 99c0711..48d5316 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -235,8 +235,8 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(10D); // 浼樺厛绾�
wrkMast.setCrnNo(locMast.getCrnNo());
-// wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
-// wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
+ wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -470,8 +470,8 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
wrkMast.setIoPri(10D);
-// wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
-// wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
+ wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
+ wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
wrkMast.setIoPri(10.0D);//浼樺厛绾�
diff --git a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
index 113b152..d31e70b 100644
--- a/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OutWorkHandler.java
@@ -49,35 +49,35 @@
String response ="";
boolean bool =false;
- try {
- log.info("wms娲惧彂浠诲姟缁檞cs鍑哄簱={}", JSON.toJSONString(map));
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(addrs)
- .setPath(outboundTaskSend)
- .setJson(JSON.toJSONString(map))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getInteger("code") == 200){
- wrkMast.setWrkSts(12L);
- wrkMastService.updateById(wrkMast);
- bool = true;
- }else {
- log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
- }
- } catch (Exception e) {
- log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
- } finally {
- apiLogService.save("wms娲惧彂浠诲姟缁檞cs鍑哄簱"
- , addrs + outboundTaskSend
- , null
- , "127.0.0.1"
- , JSON.toJSONString(map)
- , response
- , bool
- );
- }
+// try {
+// log.info("wms娲惧彂浠诲姟缁檞cs鍑哄簱={}", JSON.toJSONString(map));
+// response = new HttpHandler.Builder()
+// // .setHeaders(headParam)
+// .setUri(addrs)
+// .setPath(outboundTaskSend)
+// .setJson(JSON.toJSONString(map))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// if(jsonObject.getInteger("code") == 200){
+// wrkMast.setWrkSts(12L);
+// wrkMastService.updateById(wrkMast);
+// bool = true;
+// }else {
+// log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
+// }
+// } catch (Exception e) {
+// log.error("wms娲惧彂浠诲姟缁檞cs鍑哄簱澶辫触{},杩斿洖鍊�={}", JSON.toJSONString(wrkMast), response);
+// } finally {
+// apiLogService.save("wms娲惧彂浠诲姟缁檞cs鍑哄簱"
+// , addrs + outboundTaskSend
+// , null
+// , "127.0.0.1"
+// , JSON.toJSONString(map)
+// , response
+// , bool
+// );
+// }
return SUCCESS;
}
diff --git a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
index 471249d..10d62ab 100644
--- a/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -50,7 +50,7 @@
@Value("${led.id}")
private String ledId;
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void send() {
//楗煎浘
@@ -155,7 +155,7 @@
}
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void ErrorSend(){
Map<String,Object> map=new HashMap<>();
map.put("to",ledId);
@@ -174,7 +174,7 @@
}
- @Scheduled(cron = "0/2 * * * * ? ")
+ //@Scheduled(cron = "0/2 * * * * ? ")
private void TaskSend(){
Map<String,Object> map=new HashMap<>();
map.put("to",ledId);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 45d913c..282c5f1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -161,7 +161,7 @@
// 杩斿洖dto
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(locMast.getCrnNo());
-// startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
return startupDto;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3f7f0e5..a263d56 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,11 +15,6 @@
password: sa@123
mvc:
static-path-pattern: /**
-# redis:
-# host: localhost
-# port: 6379
-# database: 0
-# password: xltys1995
servlet:
multipart:
maxFileSize: 100MB
@@ -69,7 +64,7 @@
wcs:
#鍦板潃
address:
- URL: http://127.0.0.1:8080/wcs
+ URL: http://127.0.0.1:9090/wcs
#鍑哄簱绉诲簱浠诲姟涓嬪彂
outboundTaskSend: open/outboundTaskSend
deviceStatus : open/deviceStatus
--
Gitblit v1.9.1