From 2d324a02fb9802ad8f5b244ef6c0ebebc4573f27 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 22 四月 2025 09:44:03 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
index ac62c22..261d9b6 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftSlaveThread.java
@@ -43,7 +43,6 @@
     private ForkLiftSlave slave;
     private ForkLiftProtocol forkLiftProtocol;
     private RedisUtil redisUtil;
-    private SiemensS7Net siemensS7Net;
     private List<ForkLiftStaProtocol> forkLiftStaProtocols = new ArrayList<>();
     private LfdZyForkLiftMasterThread masterThread;
 
@@ -140,6 +139,7 @@
                 OutputQueue.FORKLIFT.offer(MessageFormat.format("銆恵0}銆憑1}璇诲彇璐у弶鎻愬崌鏈虹姸鎬佷俊鎭け璐�", DateUtils.convert(new Date()), slave.getId()));
             }
 
+            SiemensS7Net siemensS7Net = this.masterThread.getSiemensS7Net();
             if (result1.IsSuccess) {
                 if (null == forkLiftProtocol) {
                     forkLiftProtocol = new ForkLiftProtocol();
@@ -201,6 +201,15 @@
                 deviceDataLog.setDeviceNo(forkLiftProtocol.getLiftNo());
                 deviceDataLog.setCreateTime(new Date());
                 deviceDataLogService.insert(deviceDataLog);
+
+                //淇濆瓨鏁版嵁璁板綍
+                DeviceDataLog deviceDataLog2 = new DeviceDataLog();
+                deviceDataLog2.setOriginData(Base64.getEncoder().encodeToString(result2.Content));
+                deviceDataLog2.setWcsData(JSON.toJSONString(forkLiftStaProtocols));
+                deviceDataLog2.setType("forkLiftStaProtocols");
+                deviceDataLog2.setDeviceNo(forkLiftProtocol.getLiftNo());
+                deviceDataLog2.setCreateTime(new Date());
+                deviceDataLogService.insert(deviceDataLog2);
 
                 //鏇存柊閲囬泦鏃堕棿
                 forkLiftProtocol.setDeviceDataLog(System.currentTimeMillis());
@@ -304,6 +313,7 @@
         if (this.forkLiftProtocol.getTaskNo() == null
                 || this.forkLiftProtocol.getProtocolStatus() == null
                 || this.forkLiftProtocol.getModel() == null
+                || this.forkLiftProtocol.getErrorCode() == null
         ) {
             return false;
         }
@@ -311,7 +321,9 @@
         boolean res = this.forkLiftProtocol.getProtocolStatus() == ForkLiftProtocolStatusType.IDLE.id
                 && this.forkLiftProtocol.getWrkNo() == 0
                 && this.forkLiftProtocol.getTaskNo() == 0
-                && this.forkLiftProtocol.getModel() == 2;
+                && this.forkLiftProtocol.getModel() == 2
+                && this.forkLiftProtocol.getErrorCode() == 0
+                ;
         return res;
     }
 
@@ -332,13 +344,16 @@
         if (this.forkLiftProtocol.getTaskNo() == null
                 || this.forkLiftProtocol.getProtocolStatus() == null
                 || this.forkLiftProtocol.getModel() == null
+                || this.forkLiftProtocol.getErrorCode() == null
         ) {
             return false;
         }
 
         boolean res = this.forkLiftProtocol.getProtocolStatus() == ForkLiftProtocolStatusType.IDLE.id
                 && this.forkLiftProtocol.getWrkNo() == 0
-                && this.forkLiftProtocol.getModel() == 2;
+                && this.forkLiftProtocol.getModel() == 2
+                && this.forkLiftProtocol.getErrorCode() == 0
+                ;
         return res;
     }
 
@@ -355,7 +370,7 @@
 
     @Override
     public boolean switchIOMode(ForkLiftIoModeType type) {
-        OperateResult result = siemensS7Net.Write("DB103.12", type.id.shortValue());
+        OperateResult result = this.masterThread.write(this.slave.getId(), "switchIOMode", type.id.shortValue());
         if (result.IsSuccess) {
             return true;
         }
@@ -369,13 +384,16 @@
 
     @Override
     public List<ForkLiftCommand> getPickAndPutCommand(Integer taskNo, Integer pick, Integer put) {
+        Integer realPick = pick % 1000;
+        Integer realPut = put % 1000;
+
         List<ForkLiftCommand> commands = new ArrayList<>();
         ForkLiftCommand command = new ForkLiftCommand();
         command.setLiftNo(slave.getId());
         command.setTaskNo(taskNo.shortValue());
         command.setMode(ForkLiftTaskModeType.PICK_PUT.id.shortValue());
-        command.setPick(pick.shortValue());
-        command.setPut(put.shortValue());
+        command.setPick(realPick.shortValue());
+        command.setPut(realPut.shortValue());
         command.setConfirm((short) 1);
 
         commands.add(command);
@@ -383,14 +401,17 @@
     }
 
     @Override
-    public List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer originLev, Integer targetLev) {
+    public List<ForkLiftCommand> getShuttleSwitchCommand(Integer taskNo, Integer pick, Integer put) {
+        Integer realPick = pick % 1000;
+        Integer realPut = put % 1000;
+
         List<ForkLiftCommand> commands = new ArrayList<>();
         ForkLiftCommand command = new ForkLiftCommand();
         command.setLiftNo(slave.getId());
         command.setTaskNo(taskNo.shortValue());
         command.setMode(ForkLiftTaskModeType.SHUTTLE_SWITCH.id.shortValue());
-        command.setPick(originLev.shortValue());
-        command.setPut(targetLev.shortValue());
+        command.setPick(realPick.shortValue());
+        command.setPut(realPut.shortValue());
         command.setConfirm((short) 1);
 
         commands.add(command);

--
Gitblit v1.9.1