From d9cea3d7757a8d580bb0574d419ba6dd9c2478e7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 13 十二月 2024 15:11:50 +0800
Subject: [PATCH] #search shuttle
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java | 65 +++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
index 3aa33ba..1946db0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java
@@ -10,14 +10,18 @@
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
+import com.zy.asrs.wcs.rcs.entity.BasLiftOpt;
import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.model.CommandResponse;
import com.zy.asrs.wcs.rcs.model.enums.LiftProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
+import com.zy.asrs.wcs.rcs.service.BasLiftOptService;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
@Component
@@ -27,6 +31,8 @@
private RedisUtil redisUtil;
@Autowired
private TaskService taskService;
+ @Autowired
+ private BasLiftOptService basLiftOptService;
public synchronized boolean assignWork(Device device, LiftAssignCommand assignCommand) {
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getId().intValue());
@@ -109,23 +115,19 @@
command.setComplete(true);
}
- if (task.getTaskSts() < 100) {//鍏ュ簱鍒ゆ柇鎵樼洏鏄惁杩涘叆鎻愬崌鏈�
- if (!liftProtocol.getHasTray()) {
- return false;
- }
- } else if (task.getTaskSts() >= 100 && task.getTaskSts() < 200) {//鍑哄簱鍒ゆ柇鎵樼洏鏄惁绂诲紑鎻愬崌鏈�
- if (liftProtocol.getHasTray()) {
- return false;
- }
+ //鍒ゆ柇鎻愬崌鏈烘墭鐩樻槸鍚﹀瓨鍦�
+ if (liftProtocol.getHasTray()) {
+ return false;
}
+
} else if (command.getMode() == LiftCommandModeType.RESET.id) {
//澶嶄綅
command.setComplete(true);
} else if (command.getMode() == LiftCommandModeType.LOCK.id) {
- //澶嶄綅
+ //閿佸畾
command.setComplete(true);
} else if (command.getMode() == LiftCommandModeType.UNLOCK.id) {
- //澶嶄綅
+ //瑙ｉ攣
command.setComplete(true);
}
@@ -151,8 +153,26 @@
//鍙栧嚭鍛戒护
LiftCommand command = commands.get(commandStep);
- boolean result = write(command, device);
- if (!result) {
+ // 涓嬪彂鍛戒护
+ CommandResponse response = write(command, device);
+
+ //淇濆瓨鍛戒护鏃ュ織
+ BasLiftOpt basLiftOpt = new BasLiftOpt();
+ basLiftOpt.setTaskNo(taskNo);
+ basLiftOpt.setLiftNo(liftProtocol.getLiftNo());
+ basLiftOpt.setMode(LiftCommandModeType.get(command.getMode()).desc);
+ basLiftOpt.setCommand(JSON.toJSONString(command));
+ basLiftOpt.setSystemStatus(JSON.toJSONString(liftProtocol));
+ basLiftOpt.setDeviceId(device.getId());
+ basLiftOpt.setDeviceWrk(String.valueOf(command.getTaskNo()));
+ basLiftOpt.setResponse(response.getMessage());//鑾峰彇鍝嶅簲
+ basLiftOpt.setSendTime(new Date());//鎸囦护涓嬪彂鏃堕棿
+ basLiftOpt.setSend(response.getResult() ? 1 : 0);
+ basLiftOpt.setHostId(device.getHostId());
+ //淇濆瓨鍛戒护娴佹按
+ basLiftOptService.save(basLiftOpt);
+
+ if (!response.getResult()) {
News.error("鎻愬崌鏈哄懡浠や笅鍙戝け璐ワ紝鎻愬崌鏈哄彿={}锛屼换鍔℃暟鎹�={}", command.getLiftNo(), JSON.toJSON(command));
return false;
} else {
@@ -168,30 +188,31 @@
return true;
}
- private synchronized boolean write(LiftCommand command, Device device) {
+ private synchronized CommandResponse write(LiftCommand command, Device device) {
+ CommandResponse response = new CommandResponse(false);
if (null == command) {
News.error("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
- return false;
+ response.setMessage("鎻愬崌鏈哄啓鍏ュ懡浠や负绌�");
+ return response;
}
LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, device.getId().intValue());
if (liftThread == null) {
- return false;
+ return response;
}
- boolean result = false;
if (command.getMode() == LiftCommandModeType.MOVE.id) {
- result = liftThread.move(command);
+ response = liftThread.move(command);
} else if (command.getMode() == LiftCommandModeType.PALLET_INOUT.id) {
- result = liftThread.palletInOut(command);
+ response = liftThread.palletInOut(command);
} else if (command.getMode() == LiftCommandModeType.LOCK.id) {
- result = liftThread.lock(command);
+ response = liftThread.lock(command);
} else if (command.getMode() == LiftCommandModeType.UNLOCK.id) {
- result = liftThread.unlock(command);
+ response = liftThread.unlock(command);
} else if (command.getMode() == LiftCommandModeType.RESET.id) {
- result = liftThread.reset(command);
+ response = liftThread.reset(command);
}
- return result;
+ return response;
}
}
--
Gitblit v1.9.1