From 3fca1b6a028a1688120e9fee8fe538a588a615ab Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 11 一月 2025 17:26:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 5 +++--
src/main/java/com/zy/core/enums/ShuttleChargeType.java | 3 ++-
src/main/java/com/zy/asrs/controller/OpenController.java | 21 +++++++++++++++++++++
src/main/java/com/zy/asrs/controller/ShuttleController.java | 1 +
src/main/java/com/zy/asrs/domain/param/CreateMoveTaskParam.java | 12 ++++++++++++
5 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e7f299d..91f6ecf 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,6 +1,12 @@
package com.zy.asrs.controller;
+import com.core.common.R;
+import com.zy.asrs.domain.param.CreateMoveTaskParam;
+import com.zy.common.service.CommonService;
+import com.zy.core.dispatcher.ShuttleDispatchUtils;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -9,6 +15,21 @@
@RequestMapping("/openapi")
public class OpenController {
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private ShuttleDispatchUtils shuttleDispatchUtils;
+ @PostMapping("/createMoveTask")
+ public R createMoveTask(CreateMoveTaskParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ boolean dispatchShuttle = shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(99), param.getLocNo(), param.getShuttleNo());
+ if (dispatchShuttle) {
+ return R.ok();
+ }
+ return R.error();
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index f24d1cf..fdb376a 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -350,6 +350,7 @@
}
shuttleAction.assignWork(shuttleProtocol.getShuttleNo(), assignCommand);
+ return R.ok();
}
}
return R.error();
diff --git a/src/main/java/com/zy/asrs/domain/param/CreateMoveTaskParam.java b/src/main/java/com/zy/asrs/domain/param/CreateMoveTaskParam.java
new file mode 100644
index 0000000..2a8070e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/param/CreateMoveTaskParam.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.domain.param;
+
+import lombok.Data;
+
+@Data
+public class CreateMoveTaskParam {
+
+ private Integer shuttleNo;
+
+ private String locNo;
+
+}
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index 72f341a..46e5a64 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -13,6 +13,7 @@
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
import com.zy.core.model.ForkLiftSlave;
import com.zy.core.model.ShuttleSlave;
@@ -254,8 +255,8 @@
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(now);
wrkMast.setWrkSts(WrkStsType.NEW_MOVE.sts); // 宸ヤ綔鐘舵�侊細301.鐢熸垚杩佺Щ浠诲姟
- wrkMast.setIoType(200); // 鍏ュ嚭搴撶姸鎬侊細 200.灏忚溅杩佺Щ
- wrkMast.setIoPri(20D);
+ wrkMast.setIoType(WrkIoType.SHUTTLE_MOVE.id); // 鍏ュ嚭搴撶姸鎬侊細 200.灏忚溅杩佺Щ
+ wrkMast.setIoPri(800D);
wrkMast.setShuttleNo(shuttleNo);//绌挎杞﹀彿
wrkMast.setSourceLocNo(shuttleProtocol.getCurrentLocNo()); // 婧愬簱浣� => 灏忚溅褰撳墠搴撲綅鍙�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
diff --git a/src/main/java/com/zy/core/enums/ShuttleChargeType.java b/src/main/java/com/zy/core/enums/ShuttleChargeType.java
index 6d6e7df..7ed3039 100644
--- a/src/main/java/com/zy/core/enums/ShuttleChargeType.java
+++ b/src/main/java/com/zy/core/enums/ShuttleChargeType.java
@@ -4,7 +4,8 @@
public enum ShuttleChargeType {
- CHARGE_1(1, "1402001", "1402001"),
+ CHARGE_1(1, "1000402", "0700402"),
+ CHARGE_2(2, "1000403", "0700403"),
;
ShuttleChargeType(int id, String locNo,String waitLocNo) {
--
Gitblit v1.9.1