From a68bf17ab81df98882e19b79628e6876bb260468 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 18 六月 2025 10:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/common/utils/ForkLiftUtils.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ForkLiftUtils.java b/src/main/java/com/zy/common/utils/ForkLiftUtils.java
index adc109d..045054a 100644
--- a/src/main/java/com/zy/common/utils/ForkLiftUtils.java
+++ b/src/main/java/com/zy/common/utils/ForkLiftUtils.java
@@ -94,7 +94,7 @@
}
for (JSONObject data : list) {
- if(data.getInteger("staNo") == staNo) {
+ if(data.getInteger("staNo").equals(staNo)) {
return data.getInteger("liftNo");
}
}
@@ -149,4 +149,53 @@
return false;
}
+ //璇锋眰涓婄骇绯荤粺锛屾槸鍚﹀厑璁稿叆搴�
+ //鏌ヨ鏄惁鏈夊叆搴撴潈闄�
+ public static boolean queryInMission(Integer sourceStaNo, Integer liftNo, String superTaskNo) {
+ ConfigService configService = SpringUtils.getBean(ConfigService.class);
+ if (configService == null) {
+ return false;
+ }
+
+ Config queryInMissionPathEnableConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "queryInMissionPathEnable"));
+ if (queryInMissionPathEnableConfig != null) {
+ String queryInMissionPathEnable = queryInMissionPathEnableConfig.getValue();
+ if (!queryInMissionPathEnable.equals("Y")) {
+ return true;//鍏抽棴鏌ヨ鍏ュ簱鏉冮檺鍔熻兘
+ }
+ }
+
+ Config superSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "superSystemUri"));
+ if (superSystemUriConfig == null) {
+ return false;
+ }
+ String superSystemUri = superSystemUriConfig.getValue();
+
+ Config queryInMissionPathConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "queryInMissionPath"));
+ if (queryInMissionPathConfig == null) {
+ return false;
+ }
+ String missionPath = queryInMissionPathConfig.getValue();
+
+ try {
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("staNo", sourceStaNo);
+ data.put("liftNo", liftNo);
+ data.put("superTaskNo", superTaskNo);
+
+ String response = new HttpHandler.Builder()
+ .setUri(superSystemUri)
+ .setPath(missionPath)
+ .setJson(JSON.toJSONString(data))
+ .build()
+ .doPost();
+ if (response.equals("ok")) {
+ return true;//鏈夊叆搴撴潈闄�
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.1