From 4e0da368106385d208157b9d565374733b7c4a87 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 24 四月 2025 15:27:19 +0800
Subject: [PATCH] 还没有写完
---
src/main/java/com/zy/asrs/entity/param/TaskOverParam.java | 18 +++
src/main/java/com/zy/asrs/controller/OpenController.java | 200 ++++++++++++++++++++++++-------------------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 12 +-
src/main/resources/application.yml | 2
4 files changed, 120 insertions(+), 112 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index fbc8cb1..1cdf7c3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -115,7 +115,7 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getWharfCode())) {
+ if (Cools.isEmpty(param.getStartPoint())) {
return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getStatus())) {
@@ -212,7 +212,7 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getStaNo())) {
+ if (Cools.isEmpty(param.getStartPoint())) {
return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getType())) {
@@ -231,7 +231,7 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getStaNo())) {
+ if (Cools.isEmpty(param.getStartPoint())) {
return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getType())) {
@@ -267,112 +267,108 @@
}
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
- @PostMapping("/targetWharfApply")
- @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
- public R targetWharfApply(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) throws IOException {
- auth(appkey, param, request);
-
- if (Cools.isEmpty(param)) {
- return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("宸ヤ綔鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getContainerCode())) {
- return R.error("鎵樼洏缂栫爜涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWharfSource())) {
- return R.error("婧愮爜澶翠负绌猴紒");
- } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size() == 0) {
- return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
- }
- R r = openService.AgvToWCSToWms(param);
- apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- , request.getRemoteAddr() + request.getRequestURI()
- , appkey
- , request.getRemoteAddr()
- , JSON.toJSONString(param)
- , r.toString()
- , true
- );
- return r;
- }
-
- //AGV璇锋眰鍔ㄤ綔鎺ュ彛
- @PostMapping("/agvTaskRequest")
- @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
- public R agvTaskRequest(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getRequestType())) {
- return R.error("璇锋眰绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWharfCode())) {
- return R.error("鐮佸ご缂栧彿涓虹┖锛�");
- }
-
- Map<String, Integer> map = new HashMap<>();
- map.put("J-1102", 102);
- map.put("J-1101", 101);
- map.put("J-1103", 105);
- map.put("J-1104", 106);
- map.put("J-1105", 109);
- map.put("J-1106", 110);
- map.put("J-1107", 113);
- map.put("J-1108", 114);
- map.put("J-1109", 117);
- map.put("J-1110", 118);
- map.put("J-1111", 121);
- map.put("J-1112", 122);
- map.put("H-1102", 300);
- map.put("H-1101", 305);
- map.put("G-1102", 400);
- map.put("G-1101", 405);
-// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("stn_desc", param.getWharfCode()));
+// @PostMapping("/targetWharfApply")
+// @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
+// public R targetWharfApply(@RequestHeader String appkey,
+// @RequestBody WMSAndAGVInterfaceParam param,
+// HttpServletRequest request) throws IOException {
+// auth(appkey, param, request);
//
-// if (Cools.isEmpty(staDesc)){
-// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+// if (Cools.isEmpty(param)) {
+// return R.error("鍙傛暟涓虹┖锛�");
+// } else if (Cools.isEmpty(param.getTaskNo())) {
+// return R.error("宸ヤ綔鍙蜂负绌猴紒");
+// } else if (Cools.isEmpty(param.getContainerCode())) {
+// return R.error("鎵樼洏缂栫爜涓虹┖锛�");
+// } else if (Cools.isEmpty(param.getWharfSource())) {
+// return R.error("婧愮爜澶翠负绌猴紒");
+// } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size() == 0) {
+// return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
// }
- if (Cools.isEmpty(map.get(param.getWharfCode()))) {
- return R.error("鏈煡璇㈠埌绔欑偣");
- }
- BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
-// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
- if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))) {
- apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- , request.getRemoteAddr() + request.getRequestURI()
- , appkey
- , request.getRemoteAddr()
- , JSON.toJSONString(param)
- , R.ok().toString()
- , true
- );
- return R.ok("鍙叆");
- } else {
- apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- , request.getRemoteAddr() + request.getRequestURI()
- , appkey
- , request.getRemoteAddr()
- , JSON.toJSONString(param)
- , R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
- , true
- );
- return R.error("绔欑偣鐘舵�佷笉鍙叆");
- }
-
-
- }
+// R r = openService.AgvToWCSToWms(param);
+// apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+// , request.getRemoteAddr() + request.getRequestURI()
+// , appkey
+// , request.getRemoteAddr()
+// , JSON.toJSONString(param)
+// , r.toString()
+// , true
+// );
+// return r;
+// }
+//
+// //AGV璇锋眰鍔ㄤ綔鎺ュ彛
+// @PostMapping("/agvTaskRequest")
+// @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
+// public R agvTaskRequest(@RequestHeader String appkey,
+// @RequestBody WMSAndAGVInterfaceParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.error("鍙傛暟涓虹┖锛�");
+// } else if (Cools.isEmpty(param.getRequestType())) {
+// return R.error("璇锋眰绫诲瀷涓虹┖锛�");
+// } else if (Cools.isEmpty(param.getWharfCode())) {
+// return R.error("鐮佸ご缂栧彿涓虹┖锛�");
+// }
+//
+// Map<String, Integer> map = new HashMap<>();
+// map.put("J-1102", 102);
+// map.put("J-1101", 101);
+// map.put("J-1103", 105);
+// map.put("J-1104", 106);
+// map.put("J-1105", 109);
+// map.put("J-1106", 110);
+// map.put("J-1107", 113);
+// map.put("J-1108", 114);
+// map.put("J-1109", 117);
+// map.put("J-1110", 118);
+// map.put("J-1111", 121);
+// map.put("J-1112", 122);
+// map.put("H-1102", 300);
+// map.put("H-1101", 305);
+// map.put("G-1102", 400);
+// map.put("G-1101", 405);
+//// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+//// .eq("stn_desc", param.getWharfCode()));
+////
+//// if (Cools.isEmpty(staDesc)){
+//// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+//// }
+// if (Cools.isEmpty(map.get(param.getWharfCode()))) {
+// return R.error("鏈煡璇㈠埌绔欑偣");
+// }
+// BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+// if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))) {
+// apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+// , request.getRemoteAddr() + request.getRequestURI()
+// , appkey
+// , request.getRemoteAddr()
+// , JSON.toJSONString(param)
+// , R.ok().toString()
+// , true
+// );
+// return R.ok("鍙叆");
+// } else {
+// apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+// , request.getRemoteAddr() + request.getRequestURI()
+// , appkey
+// , request.getRemoteAddr()
+// , JSON.toJSONString(param)
+// , R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
+// , true
+// );
+// return R.error("绔欑偣鐘舵�佷笉鍙叆");
+// }
+//
+//
+// }
//浠诲姟涓嬪彂鎺ュ彛
@PostMapping("/outboundTaskSend")
@Transactional
- public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String, Object> hashMap) {
- String jsonString = JSON.toJSONString(hashMap.get("TaskList"));
- List<CarryParam> params = JSONObject.parseArray(jsonString, CarryParam.class);
+ public HashMap<String, Object> outboundTaskSend(@RequestBody List<CarryParam> params) {
HashMap<String, Object> map = new HashMap<>();
- List<WMSAndAGVInterfaceParam> params1 = new ArrayList<>();
for (CarryParam param : params) {
if (Cools.isEmpty(param)) {
map.put("Code", "0");
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskOverParam.java b/src/main/java/com/zy/asrs/entity/param/TaskOverParam.java
index 0e8d8ba..16e8931 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskOverParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskOverParam.java
@@ -4,9 +4,21 @@
@Data
public class TaskOverParam {
- private String wharfCode;
- private Boolean status;
- private int staNo;
+ /**
+ * 浠诲姟鍙�
+ */
+ private String taskNo;
+ /**
+ * 瀹屾垚鏍囪瘑
+ */
+ private Integer status;
+ /**
+ * 绔欑偣
+ */
+ private Integer startPoint;
+ /**
+ * 1鏀俱��0鍙�
+ */
private int type;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 254ae97..8983bdf 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -216,7 +216,7 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("stn_desc", param.getWharfCode()));
+ .eq("stn_desc", param.getStartPoint()));
if (Cools.isEmpty(staDesc)) {
throw new RuntimeException("鏈煡璇㈠埌绔欑偣淇℃伅");
}
@@ -229,7 +229,7 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- if (wharfCode1.contains(param.getWharfCode())) {
+ if (wharfCode1.contains(param.getStartPoint())) {
if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() > 0) {
//AGV鍑哄簱瀹屾垚浠ュ悗
staProtocol.setWorkNo((short) 0);
@@ -266,9 +266,9 @@
@Override
public R getAgvPickAndPlaceV1(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(param.getStartPoint());
if (Cools.isEmpty(basDevp)) {
- return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStartPoint());
}
if (param.getType() == 0 && basDevp.getAgvStartPick() == 1) {
return R.ok();
@@ -281,9 +281,9 @@
@Override
public R getAgvPickAndPlaceV2(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ BasDevp basDevp = basDevpService.selectById(param.getStartPoint());
if (Cools.isEmpty(basDevp)) {
- return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStartPoint());
}
if (param.getType() == 0) {
basDevp.setAgvTargetPick(1);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7a29a3e..efb5d3b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.107:1433;databasename=glccwcs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=glccwcs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1