From 2ff79b71d902e733a0cf0d70052ace24fa1c479e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 06 八月 2024 13:50:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/GhlnHandler.java | 163 +++++++++++++++++++++++-------------------------------
1 files changed, 70 insertions(+), 93 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GhlnHandler.java b/src/main/java/com/zy/asrs/task/handler/GhlnHandler.java
index e606bb3..83042d6 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhlnHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhlnHandler.java
@@ -9,8 +9,6 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
-
-import com.zy.common.constant.MesConstant;
import com.zy.common.constant.OpenApiAddressConstant;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
@@ -20,7 +18,9 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* @author pang.jiabao
@@ -48,96 +48,6 @@
@Resource
private MatService matService;
-
- /**
- * 鍑哄簱鍒拌揪鍑哄簱鐩爣绔欐椂锛岃皟鐢ˋGV寮�鏀惧嚭搴撴帴鍙�
- */
- public void sendOutboundTaskToAGV() {
- // 鑾峰彇agv鍑哄簱绔欑偣淇℃伅,骞跺垽鏂珯鐐圭姸鎬�
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
- if (basDevp != null && basDevp.getWrkNo() != 0 && basDevp.getOutEnable().equals("Y")) {
- // 鍒ゆ柇鏄嚭搴撲换鍔�
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())
- .eq("plt_type",0));
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
- if (wrkMast != null && wrkMast.getIoType() == 101 && !wrkDetls.isEmpty()) {
- // 鎺ㄩ�佸嚭搴撲俊鎭粰agv
- sendTaskToAgv(wrkMast,wrkDetls);
- }
- }
- }
-
-
-
- private void pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo) {
-
- }
-
- /**
- * 璋冪敤AGV鍑哄簱鎺ュ彛
- * @param wrkMast 宸ヤ綔涓绘。
- * @param wrkDetls 宸ヤ綔妗ｆ槑缁�
- */
- private void sendTaskToAgv(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
-
- // 璋冪敤缁撴灉
- boolean success = false;
- // 鏋勯�犺姹傚ご
- Map<String,Object> headers = new HashMap<>();
- headers.put("Content-Type","application/json;charset=UTF-8");
-
- WrkDetl wrkDetl = wrkDetls.get(0);
-
- // 鏋勯�犺姹備綋
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("TaskNo", wrkMast.getWrkNo()); // 浠诲姟鍙�
- jsonObject.put("Address", ""); // 鍑哄簱鍙�
- jsonObject.put("Model", wrkDetl.getModel()); // 鍨嬪彿
- jsonObject.put("Batch", wrkDetl.getBatch()); // 鎵规
- jsonObject.put("Dimension", wrkDetl.getSpecs()); // 瑙勬牸
- jsonObject.put("Weight", wrkDetl.getWeight()); // 閲嶉噺
- jsonObject.put("ProductionDate", wrkDetl.getManuDate()); // 鐢熶骇鏃ユ湡
- String body = jsonObject.toJSONString();
- String response = "";
- try {
- response = new HttpHandler.Builder()
- .setUri(OpenApiAddressConstant.OUT_TO_AGV_IP)
- .setPath(OpenApiAddressConstant.OUT_TO_AGV_URL)
- .setHeaders(headers)
- .setJson(body)
- .build()
- .doPost();
- if (!Cools.isEmpty(response)) {
- JSONObject jsonObject1 = JSONObject.parseObject(response);
- if ((Integer) jsonObject1.get("Code") == 200){
- success = true;
- }
- } else {
- log.error("鍑哄簱璇锋眰agv鎺ュ彛寮傚父鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
- }
- } catch (Exception e) {
- log.error("鍑哄簱璇锋眰agv鎺ュ彛寮傚父锛歿}", e.getMessage());
- } finally {
- if (success) {
- wrkMast.setPltType(1); // 鏄惁鎴愬姛缁檃gv鍑哄簱鎺ュ彛涓嬪彂杩囧懡浠わ紝閬垮厤閲嶅璇锋眰
- wrkMastService.updateById(wrkMast);
- }
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鍑哄簱璇锋眰agv",
- MesConstant.URL + MesConstant.PAKIN_URL,
- null,
- "127.0.0.1",
- jsonObject.toJSONString(),
- response,
- success
- );
- } catch (Exception e) {
- log.error("淇濆瓨鍑哄簱璇锋眰agv鎺ュ彛鏃ュ織寮傚父", e);
- }
- }
- }
/**
* 璋冪敤閲戣澏鍚屾鐗╂枡鎺ュ彛锛屽閲忓悓姝ユ瘡灏忔椂浜х敓鐨勬柊鐗╂枡
@@ -231,4 +141,71 @@
}
}
}
+
+ /**
+ * 鍒拌揪鍑哄簱鍙ｏ紝鍛煎彨agv
+ */
+ public void OutboundCallAGV() {
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ if (basDevp.getWrkNo() > 6000 && basDevp.getWrkNo() <= 9000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")
+ &&basDevp.getOutEnable().equals("Y")) { // 鍑哄簱宸ヤ綔妗�
+ WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
+ if(wrkMast.getWhsType() == null) {
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
+ // 璋冪敤缁撴灉
+ boolean success = false;
+ // 鏋勯�犺姹傚ご
+ Map<String,Object> headers = new HashMap<>();
+ headers.put("Content-Type","application/json;charset=UTF-8");
+ // 鏋勯�犺姹備綋
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("matnr", wrkDetl.getMatnr()); // 鐗╂枡缂栫爜
+ jsonObject.put("model", wrkDetl.getModel()); // 鍨嬪彿
+ jsonObject.put("batch", wrkDetl.getBatch()); // 鎵规
+ jsonObject.put("specs", wrkDetl.getSpecs()); // 鑶滅被鍨�
+ jsonObject.put("manuDate", wrkDetl.getManuDate()); // 鐢熶骇鏃ユ湡
+ jsonObject.put("length", wrkDetl.getLength()+""); // 闀�
+ jsonObject.put("weight", wrkDetl.getWeight()+""); // 瀹�
+ jsonObject.put("volume", wrkDetl.getVolume()+""); // 闈㈢Н
+ String body = jsonObject.toString();
+ String response = "";
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(OpenApiAddressConstant.AGV_IP)
+ .setPath(OpenApiAddressConstant.CALL_AGV_URL)
+ .setHeaders(headers)
+ .setJson(body)
+ .build()
+ .doPost();
+ if (!Cools.isEmpty(response)) {
+ JSONObject jsonObject1 = JSONObject.parseObject(response);
+ if ((Integer) jsonObject1.get("code") == 200){
+ success = true;
+ wrkMast.setWhsType(1);
+ wrkMastService.updateById(wrkMast);
+ }
+ } else {
+ log.error("鍑哄簱鍛煎彨agv鎺ュ彛寮傚父鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", OpenApiAddressConstant.AGV_IP + OpenApiAddressConstant.CALL_AGV_URL, body, response);
+ }
+ } catch (Exception e) {
+ log.error("鍑哄簱鍛煎彨agv鎺ュ彛寮傚父锛歿}", e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍑哄簱璇锋眰agv",
+ OpenApiAddressConstant.AGV_IP + OpenApiAddressConstant.CALL_AGV_URL,
+ null,
+ "127.0.0.1",
+ jsonObject.toJSONString(),
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("鍑哄簱鍛煎彨agv鎺ュ彛鏃ュ織寮傚父", e);
+ }
+ }
+ }
+ }
+ }
}
--
Gitblit v1.9.1