From 428b1a646fc0aca998170fe02eeb7df2639f47f6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 06 二月 2024 16:01:34 +0800
Subject: [PATCH] #AGV 输送线扫码器扫描
---
src/main/java/com/zy/asrs/controller/AgvController.java | 35 +++++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 ++++
src/main/resources/application.yml | 40 ++++++++++++++++++++
3 files changed, 84 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvController.java b/src/main/java/com/zy/asrs/controller/AgvController.java
new file mode 100644
index 0000000..d20a6bc
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/AgvController.java
@@ -0,0 +1,35 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 瀵规帴AGV銆佽緭閫佺嚎鏀捐揣鎺ュ彛
+ */
+@Slf4j
+@RestController
+@RequestMapping("/agv")
+public class AgvController {
+
+ @PostMapping("/container/release")
+ public R containerRelease(@RequestBody JSONObject jsonObject){
+
+ System.out.println(jsonObject.toString());
+ HashMap<String, String> map = new HashMap<>();
+ map.put("allow","true");
+ R r = new R(0, "");
+
+ return r.add(map);
+
+ //return R.ok();
+ }
+
+}
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 dd87565..d6ad9cb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2761,8 +2761,16 @@
String agvStaNo = null;
if (staNo == 11) {
agvStaNo = "303-1";
- } else {
+ } else if(staNo == 12){
agvStaNo = "304-1";
+ } else if(staNo == 13){
+ agvStaNo = "311-1";
+ } else if(staNo == 14){
+ agvStaNo = "313-1";
+ } else if(staNo == 15){
+ agvStaNo = "315-1";
+ } else if(staNo == 16){
+ agvStaNo = "317-1";
}
//閫氱煡AGV鍙栬揣
boolean result = agvRestockCall(agvStaNo, barcode);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0620b45..36230aa 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -394,6 +394,46 @@
id: 12
ip: 10.10.10.224
port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[12]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[13]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[14]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[15]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[16]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[17]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[18]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
+# # 鏉＄爜鎵弿浠�
+# barcode[19]:
+# id: 12
+# ip: 10.10.10.224
+# port: 2002
# LED1
led[0]:
--
Gitblit v1.9.1