From eb4ea056ddd2502fdb6f49a2ad0a01836b7e71fa Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 17 十月 2024 14:40:14 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/LiftAction.java | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 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 a84e807..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());
@@ -147,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 {
@@ -164,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