From 8f2b1fc281755c110faff41b75d0182b44243811 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 十一月 2025 15:59:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 3
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 272 +++++++++++++++-------
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 19 +
src/main/java/com/zy/core/DevpThread.java | 6
src/main/java/com/zy/common/model/LocTypeDto.java | 8
/dev/null | 50 ----
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 50 ----
src/main/java/com/zy/core/model/command/LiftCommand.java | 14 +
src/main/resources/WCS与PLC通讯协议.docx | 0
src/main/java/com/zy/asrs/utils/Utils.java | 26 ++
src/main/java/com/zy/core/MainProcess.java | 8
src/main/java/com/zy/core/model/protocol/TemperatureProtocol.java | 14 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 237 +++++++------------
13 files changed, 360 insertions(+), 347 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
deleted file mode 100644
index 272e105..0000000
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.core.common.R;
-import com.zy.asrs.domain.param.ToOutStaParam;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.Task;
-import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.thread.SiemensDevpThread;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-public class OpenController {
-
- @RequestMapping("/open/toOutSta")
- public R toOutSta(@RequestBody ToOutStaParam param) {
- log.info("toOutSta:{}",param);
- Integer sourceStaNo = param.getSourceStaNo();
- SiemensDevpThread siemensDevpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- if(siemensDevpThread == null) {
- return R.error("绾跨▼涓嶅瓨鍦�");
- }
-
- StaProtocol staProtocol = siemensDevpThread.getStation().get(sourceStaNo).clone();
- if(staProtocol == null) {
- return R.error("绔欑偣涓嶅瓨鍦�");
- }
-
- if (staProtocol.getWorkNo().intValue() != param.getWrkNo()) {
- return R.error("宸ヤ綔鍙蜂笉涓�鑷�");
- }
-
- if (!staProtocol.isLoading()) {
- return R.error("绔欑偣鏃犵墿");
- }
-
- staProtocol.setWorkNo(param.getWrkNo().shortValue());
- staProtocol.setStaNo(param.getStaNo().shortValue());
- staProtocol.setPalletSize((short) 1);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- log.info("鍙戠敓鎴愬姛:{}",result);
- return R.ok().add(result);
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 86c538d..fd671c3 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -188,9 +188,6 @@
if (staNo != null) {
staProtocol.setStaNo(staNo);
}
- if (palletSize != null) {
- staProtocol.setPalletSize(palletSize);
- }
if (pakMk != null) {
staProtocol.setPakMk(pakMk.equals("Y"));
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 5142e6d..1f0c5aa 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5,15 +5,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
-import com.zy.common.constant.RedisConstantType;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
import com.zy.common.model.SearchLocParam;
@@ -29,28 +26,23 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
import com.zy.core.model.*;
-import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.LedCommand;
-import com.zy.core.model.command.RgvCommand;
+import com.zy.core.model.command.LiftCommand;
import com.zy.core.model.protocol.CrnProtocol;
-import com.zy.core.model.protocol.RgvProtocol;
+import com.zy.core.model.protocol.LiftProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
-import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
-import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 绔嬩綋浠撳簱WCS绯荤粺涓绘祦绋嬩笟鍔�
@@ -74,8 +66,6 @@
private WrkDetlService wrkDetlService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
- @Autowired
- private WaitPakinMapper waitPakinMapper;
@Autowired
private LocMastService locMastService;
@Autowired
@@ -136,17 +126,13 @@
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
&& staProtocol.getWorkNo() == 9999
- && staProtocol.isPakMk() && (staProtocol.getEmptyInType() != 1 && staProtocol.getEmptyInType() != 2)) {
+ && staProtocol.isPakMk()) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
String barcode = barcodeThread.getBarcode();
if (!Cools.isEmpty(barcode)) {
News.info("" + mark + " - 1" + " - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
-// staProtocol.setWorkNo((short) 9992);
-// staProtocol.setStaNo(inSta.getBackSta().shortValue());
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
News.info("" + mark + " - 2" + " - 鎵爜澶辫触1 ===>> {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{},绔欑偣:{}", inSta.getBarcode(), barcode, inSta.getStaNo());
// led 寮傚父鏄剧ず
if (ledThread != null) {
@@ -156,11 +142,6 @@
continue;
}
} else {
-// staProtocol.setWorkNo((short) 9992);
-// staProtocol.setStaNo(inSta.getBackSta().shortValue());
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-
News.info("" + mark + " - 3" + " - 鎵爜澶辫触2 ===>> {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{},绔欑偣:{}", inSta.getBarcode(), barcode, inSta.getStaNo());
// led 寮傚父鏄剧ず
if (ledThread != null) {
@@ -181,13 +162,6 @@
}
if (wrkMast != null) {
News.error("" + mark + " - 4" + " - 宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
-// staProtocol.setWorkNo((short)9992);
-// staProtocol.setStaNo(inSta.getBackSta().shortValue());
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// if (!result) {
-// throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
-// }
// led 寮傚父鏄剧ず
if (ledThread != null) {
@@ -197,16 +171,21 @@
continue;
}
- if (inSta.getStaNo() == 1002 || inSta.getStaNo() == 1007) {
- //妫�娴嬫槸鍚︽湁鍑哄簱浠诲姟
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101, 103, 107)
- .in("sta_no", 1003, 1004)
- );
- if (!wrkMasts.isEmpty()) {
- News.error("" + mark + " - 4" + " - 鍏ュ簱锛屾娴嬪瓨鍦ㄥ嚭搴撲换鍔★紝绛夊緟鍑哄簱浠诲姟鎵ц瀹屾垚,鎵樼洏鐮�={}", barcode);
- continue;
- }
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if(liftProtocol == null) {
+ continue;
+ }
+
+ if (liftProtocol.getMode() != 1) {
+ continue;
+ }
+
+ if (liftProtocol.getDeviceStatus() != 0) {
+ continue;
+ }
+
+ if (liftProtocol.getWorkNo() > 0) {
+ continue;
}
try {
@@ -227,54 +206,29 @@
if (jsonObject.getInteger("code").equals(200)) {
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", dto.getLocNo()));
-
- short staNo = dto.getStaNo().shortValue();
-
- int sourceStaNo = dto.getSourceStaNo();
- if (sourceStaNo == 1007) {
- staNo = 2002;
+ WrkMast currentWrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", dto.getWorkNo()));
+ if (currentWrkMast == null) {
+ throw new CoolException("WMS鐢熸垚浠诲姟鍚庯紝WCS鏌ヨ涓虹┖");
}
- if (inSta.getStaNo() == 1002) {
- staNo = 2002;
- }
+ Integer staNo = Utils.getStaNoByLocNo(dto.getLocNo());
+
+ LiftCommand command = new LiftCommand();
+ command.setWorkNo(dto.getWorkNo());
+ command.setSourceStaNo(inSta.getStaNo());
+ command.setTargetStaNo(staNo);
barcodeThread.setBarcode("");
- staProtocol.setWorkNo(dto.getWorkNo().shortValue());
- staProtocol.setStaNo(staNo);
- staProtocol.setPalletSize(locMast.getLocType2());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, command));
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
-// // led 鍏ュ簱淇℃伅鏄剧ず
-// if (ledThread != null) {
-// // 鍛戒护闆嗗悎
-// List<LedCommand> commands = new ArrayList<>();
-// // 缁勮鍛戒护
-// LedCommand ledCommand = new LedCommand();
-// ledCommand.setWorkNo(dto.getWorkNo());
-// ledCommand.setIoType(1);
-// ledCommand.setTitle("鍏ㄦ澘鍏ュ簱");
-// ledCommand.setLocNo(dto.getLocNo());
-// ledCommand.setStaNo(dto.getStaNo());
-// commands.add(ledCommand);
-// MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands));
-//// ledThread.errorReset();
-// }
+ currentWrkMast.setWrkSts(3L);// 3.璁惧鎵ц涓�
+ currentWrkMast.setCrnStrTime(new Date());
+ wrkMastService.updateById(currentWrkMast);
} else {
News.error("" + mark + " - 5" + " - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
-// staProtocol.setWorkNo((short)9992);
-// staProtocol.setStaNo(inSta.getBackSta().shortValue());
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-// if (!result) {
-// throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
-// }
// led 寮傚父鏄剧ず
if (ledThread != null) {
@@ -358,11 +312,6 @@
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
-// News.error(""+mark+" - 2"+" - 鍏ュ簱璺緞涓嶅瓨鍦紒type_no={},stn_no={},crn_no={}", wrkMast.getIoType(), pickSta.getStaNo(), wrkMast.getCrnNo());
-// staProtocol.setWorkNo((short) 9989);
-// staProtocol.setStaNo((short) (pickSta.getStaNo().shortValue()-(short)1));
-// devpThread.setPakMk(staProtocol.getSiteId(), false);
-// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//LED
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, pickSta.getLed());
// led 寮傚父鏄剧ず
@@ -370,6 +319,23 @@
String errorMsg = "姝や负鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱.璇锋斁鍦�" + pickSta.getBackSta().shortValue() + "绔欑偣";
MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(5, errorMsg));
}
+ continue;
+ }
+
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if(liftProtocol == null) {
+ continue;
+ }
+
+ if (liftProtocol.getMode() != 1) {
+ continue;
+ }
+
+ if (liftProtocol.getDeviceStatus() != 0) {
+ continue;
+ }
+
+ if (liftProtocol.getWorkNo() > 0) {
continue;
}
@@ -405,16 +371,20 @@
continue;
}
- LocMast locMast = locMastService.selectById(newWrkMast.getLocNo());
- // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
- staProtocol.setWorkNo(newWrkMast.getWrkNo().shortValue());
- staProtocol.setStaNo(newWrkMast.getStaNo().shortValue());
- staProtocol.setPalletSize(locMast.getLocType2());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ Integer staNo = Utils.getStaNoByLocNo(newWrkMast.getLocNo());
+ LiftCommand command = new LiftCommand();
+ command.setWorkNo(newWrkMast.getWrkNo());
+ command.setSourceStaNo(pickSta.getStaNo());
+ command.setTargetStaNo(staNo);
+
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, command));
if (!result) {
- News.error("" + mark + " - 3" + " - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
+
+ newWrkMast.setWrkSts(3L);// 3.璁惧鎵ц涓�
+ newWrkMast.setCrnStrTime(new Date());
+ wrkMastService.updateById(newWrkMast);
} else {
News.error("" + mark + " - 5" + " - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/pick/loc/v1", JSON.toJSONString(param), response);
}
@@ -436,6 +406,128 @@
}
/**
+ * 鎵ц鍑哄簱浠诲姟
+ */
+ public synchronized void executeOutTask() {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if(devpThread == null) {
+ return;
+ }
+
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if(liftProtocol == null) {
+ return;
+ }
+
+ if (liftProtocol.getMode() != 1) {
+ return;
+ }
+
+ if (liftProtocol.getDeviceStatus() != 0) {
+ return;
+ }
+
+ if (liftProtocol.getWorkNo() > 0) {
+ return;
+ }
+
+ //妫�娴嬪嚭搴撶珯鏄惁鍙嚭
+ StaProtocol staProtocol = devpThread.getStation().get(100);
+ if (staProtocol == null) {
+ return;
+ }
+
+ if (!staProtocol.isAutoing()) {
+ return;
+ }
+
+ if (staProtocol.isLoading()) {
+ return;
+ }
+
+ if (!staProtocol.isOutEnable()) {
+ return;
+ }
+
+ //妫�鏌ユ槸鍚︽湁姝ｅ湪鎵ц鐨勪换鍔�
+ List<WrkMast> workingWrkMast = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("wrk_sts", 3, 12));
+ if (!workingWrkMast.isEmpty()) {
+ return;
+ }
+
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11));
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+
+ WrkMast wrkMast = wrkMasts.get(0);
+ Integer sourceStaNo = Utils.getStaNoByLocNo(wrkMast.getSourceLocNo());
+
+ LiftCommand command = new LiftCommand();
+ command.setWorkNo(wrkMast.getWrkNo());
+ command.setSourceStaNo(sourceStaNo);
+ command.setTargetStaNo(100);
+
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, command));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
+
+ wrkMast.setWrkSts(12L);// 12.璁惧鎵ц涓�
+ wrkMast.setCrnStrTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }
+
+ /**
+ * 妫�娴嬩换鍔″畬鎴�
+ */
+ public synchronized void deviceFinished() {
+ // 鏍规嵁plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (devpThread == null) {
+ continue;
+ }
+
+ LiftProtocol liftProtocol = devpThread.getLiftStatus();
+ if (liftProtocol == null) {
+ continue;
+ }
+
+ if (liftProtocol.getWorkNo() <= 0) {
+ continue;
+ }
+
+ if (liftProtocol.getMode() != 1) {
+ continue;
+ }
+
+ if (liftProtocol.getDeviceStatus() != 0) {
+ continue;
+ }
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", liftProtocol.getWorkNo()));
+ if (wrkMast == null) {
+ continue;
+ }
+
+ if (wrkMast.getWrkSts() == 3) {
+ wrkMast.setWrkSts(4L);
+ wrkMast.setCrnEndTime(new Date());
+ wrkMast.setIoTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }else if (wrkMast.getWrkSts() == 12) {
+ wrkMast.setWrkSts(14L);
+ wrkMast.setCrnEndTime(new Date());
+ wrkMast.setIoTime(new Date());
+ wrkMastService.updateById(wrkMast);
+ }else {
+ News.error("鏈煡鐨勫伐浣滅姸鎬�");
+ }
+ }
+ }
+
+ /**
* 鍫嗗灈鏈哄紓甯镐俊鎭褰�
*/
public synchronized void recCrnErr(Integer mark) {
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index dba50db..8089e58 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -6,6 +6,7 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -22,6 +23,31 @@
return (float) Arith.multiplys(2, f, 1);
}
+ public static Integer getStaNoByLocNo(String locNo) {
+ HashMap<String, Integer> map = new HashMap<>();
+ map.put("0100101", 102);
+ map.put("0100202", 103);
+ map.put("0100102", 104);
+ map.put("0100203", 105);
+ map.put("0100103", 106);
+ map.put("0100204", 107);
+ map.put("0100104", 108);
+ map.put("0100205", 109);
+ map.put("0100105", 110);
+ map.put("0100206", 111);
+ map.put("0100106", 112);
+ map.put("0100207", 113);
+ map.put("0100107", 114);
+ map.put("0100208", 115);
+ map.put("0100108", 116);
+ map.put("0100209", 117);
+ map.put("0100109", 118);
+ map.put("0100210", 119);
+ map.put("0100110", 120);
+
+ return map.get(locNo);
+ }
+
public static String zerofill(String msg, Integer count){
if (msg.length() == count){
return msg;
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 4cb4b14..0071497 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -29,14 +29,10 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- if (staProtocol.isHigh() == staProtocol.isLow()) {
+ if (staProtocol.getLocHeight() == null) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
- if (staProtocol.isLow()) {
- this.locType1 = 1; // 浣庡簱浣�
- } else {
- this.locType1 = 2; // 楂樺簱浣�
- }
+ this.locType1 = staProtocol.getLocHeight();
}
/**
diff --git a/src/main/java/com/zy/core/DevpThread.java b/src/main/java/com/zy/core/DevpThread.java
index 715c3a5..40f6db3 100644
--- a/src/main/java/com/zy/core/DevpThread.java
+++ b/src/main/java/com/zy/core/DevpThread.java
@@ -1,6 +1,8 @@
package com.zy.core;
+import com.zy.core.model.protocol.LiftProtocol;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.model.protocol.TemperatureProtocol;
import java.util.Map;
@@ -8,6 +10,10 @@
Map<Integer, StaProtocol> getStation();
+ Map<Integer, TemperatureProtocol> getTemperatureList();
+
+ LiftProtocol getLiftStatus();
+
void setPakMk(Integer siteId, boolean pakMk);
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 79d0c10..26e29fb 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -46,8 +46,12 @@
Thread.sleep(200);
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick(2);
- // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr(3);
+ // 鎵ц鍑哄簱浠诲姟
+ mainService.executeOutTask();
+ // 妫�娴嬩换鍔″畬鎴�
+ mainService.deviceFinished();
+// // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+// mainService.recCrnErr(3);
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute(4);
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
diff --git a/src/main/java/com/zy/core/model/command/LiftCommand.java b/src/main/java/com/zy/core/model/command/LiftCommand.java
new file mode 100644
index 0000000..8962d38
--- /dev/null
+++ b/src/main/java/com/zy/core/model/command/LiftCommand.java
@@ -0,0 +1,14 @@
+package com.zy.core.model.command;
+
+import lombok.Data;
+
+@Data
+public class LiftCommand {
+
+ private Integer workNo;
+
+ private Integer sourceStaNo;
+
+ private Integer targetStaNo;
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
new file mode 100644
index 0000000..63a11dd
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -0,0 +1,19 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+@Data
+public class LiftProtocol {
+
+ //0鎵嬪姩 1鑷姩
+ private Short mode = 0;
+
+ //0绌洪棽 1杩愯涓�
+ private Short deviceStatus = 0;
+
+ private Short workNo = 0;
+
+ //0鏈畬鎴� 1宸插畬鎴�
+ private Short taskStatus = 0;
+
+}
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index 03d4cab..6e8b15f 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,6 +1,5 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasDevp;
import lombok.Data;
/**
@@ -40,59 +39,14 @@
// 婊℃墭鐩�
private boolean fullPlt;
- // 楂�
- private boolean high;
-
- // 浣�
- private boolean low;
+ // 楂樺害
+ private Short locHeight;
// 閿佸畾鏍囪
private boolean pakMk = true;
//鎶ヨ
private Short error;
-
- // 鍓嶈秴鎶ヨ
- private boolean frontError;
-
- // 鍚庤秴鎶ヨ
- private boolean backError;
-
- // 瓒呴珮鎶ヨ
- private boolean highError;
-
- // 宸﹂珮鎶ヨ
- private boolean leftError;
-
- // 鍙抽珮鎶ヨ
- private boolean rightError;
-
- // 瓒呴噸鎶ヨ
- private boolean weightError;
-
- // 鎵爜鎶ヨ
- private boolean barcodeError;
-
- // 鎵樼洏灏哄
- private Short palletSize;
-
- //绌烘墭鍏ュ簱绫诲瀷
- private Short emptyInType;
-
- public BasDevp toSqlModel(){
- BasDevp basDevp = new BasDevp();
- basDevp.setDevNo(siteId);
- basDevp.setWrkNo(workNo.intValue());
- basDevp.setAutoing(autoing?"Y":"N");
- basDevp.setLoading(loading?"Y":"N");
- basDevp.setInEnable(inEnable?"Y":"N");
- basDevp.setOutEnable(outEnable?"Y":"N");
- basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
- basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
- basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
- basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
- return basDevp;
- }
@Override
public StaProtocol clone() {
diff --git a/src/main/java/com/zy/core/model/protocol/TemperatureProtocol.java b/src/main/java/com/zy/core/model/protocol/TemperatureProtocol.java
new file mode 100644
index 0000000..e21e04f
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/TemperatureProtocol.java
@@ -0,0 +1,14 @@
+package com.zy.core.model.protocol;
+
+import lombok.Data;
+
+@Data
+public class TemperatureProtocol {
+
+ private Integer deviceId;
+
+ private Short temperature;
+
+ private Short humidity;
+
+}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 7c3d608..5baf7d8 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,9 +9,7 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.DeviceDataLog;
-import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
@@ -22,7 +20,10 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
+import com.zy.core.model.command.LiftCommand;
+import com.zy.core.model.protocol.LiftProtocol;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.model.protocol.TemperatureProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -32,7 +33,6 @@
/**
* 杈撻�佺嚎绾跨▼
- * Created by vincent on 2020/8/4
*/
@Data
@Slf4j
@@ -41,7 +41,8 @@
private DevpSlave slave;
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
- private short heartBeatVal = 1;
+ private LiftProtocol liftProtocol = new LiftProtocol();
+ private Map<Integer, TemperatureProtocol> temperatureMap = new ConcurrentHashMap<>();
/**
* 鏃ュ織閲囬泦鏃堕棿
@@ -51,24 +52,16 @@
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(100);add(101);add(102);add(103);add(104);
add(105);add(106);add(107);add(108);add(109);
- add(110);
+ add(110);add(111);add(112);add(113);add(114);
+ add(115);add(116);add(117);add(118);add(119);add(120);
}};
-
- public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(2000);add(2001);add(2002);add(1001);add(1002);add(1003);add(1004);add(1005);add(1006);add(1007);
- }};
-
-
- private Integer count = 0;
public static final ArrayList<Integer> barcode1 = new ArrayList<Integer>() {{
add(1);
- add(2);
}};
- public static final ArrayList<Integer> barcode2 = new ArrayList<Integer>() {{
- add(3);
- add(4);
+ public static final ArrayList<Integer> temperature1 = new ArrayList<Integer>() {{
+ add(1);add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);
}};
/**
@@ -108,6 +101,15 @@
}
}
+ private ArrayList<Integer> getTemperature() {
+ switch (slave.getId()) {
+ case 1:
+ return temperature1;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
+ }
+
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
@@ -126,7 +128,7 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- write((StaProtocol)task.getData());
+ write((LiftCommand) task.getData());
break;
default:
break;
@@ -142,30 +144,26 @@
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
private void initSite() {
- count ++;
ArrayList<Integer> staNos = getStaNo();
- if(count > 77) {
- // 绔欑偣缂栧彿
- for (Integer siteId : staNos) {
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setWorkNo((short) 0); // ID
- staProtocol.setAutoing(false); // 鑷姩
- staProtocol.setLoading(false); // 鏈夌墿
- staProtocol.setInEnable(false); // 鍙叆
- staProtocol.setOutEnable(false); // 鍙嚭
- staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
- staProtocol.setStaNo((short) 0); // 鐩爣绔�
-
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
- }
+ // 绔欑偣缂栧彿
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
}
- count = 0;
+ staProtocol.setWorkNo((short) 0); // ID
+ staProtocol.setAutoing(false); // 鑷姩
+ staProtocol.setLoading(false); // 鏈夌墿
+ staProtocol.setInEnable(false); // 鍙叆
+ staProtocol.setOutEnable(false); // 鍙嚭
+ staProtocol.setEmptyMk(false); // 绌烘澘淇″彿
+ staProtocol.setStaNo((short) 0); // 鐩爣绔�
+
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
}
}
@@ -195,7 +193,7 @@
private void read() throws InterruptedException {
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 18));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 13));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -206,21 +204,12 @@
station.put(siteId, staProtocol);
}
staProtocol.setSiteId(siteId);
- staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 18))); // 宸ヤ綔鍙�
- staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 18) + 4)); // 鐩爣绔�
+ staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 13))); // 宸ヤ綔鍙�
+ staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, (i * 13) + 4)); // 鐩爣绔�
+ staProtocol.setLocHeight(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 13) + 8));//搴撲綅楂樺害
+ staProtocol.setError(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 13) + 10)); // 鎶ヨ
- short locHeight = siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 18) + 8);//搴撲綅楂樺害
- if (locHeight == 2) {//high
- staProtocol.setHigh(true);
- staProtocol.setLow(false);
- }else {//low
- staProtocol.setHigh(false);
- staProtocol.setLow(true);
- }
-
- staProtocol.setError(siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 18) + 10)); // 鎶ヨ
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, (i * 18) + 12, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, (i * 13) + 12, 1);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
@@ -228,21 +217,37 @@
staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- boolean[] statusError = siemensS7Net.getByteTransform().TransBool(result.Content, (i * 18) + 13, 1);
- staProtocol.setFrontError(statusError[0]); // 鍓嶈秴鎶ヨ
- staProtocol.setBackError(statusError[1]); // 鍚庤秴鎶ヨ
- staProtocol.setHighError(statusError[2]); // 瓒呴珮鎶ヨ
- staProtocol.setLeftError(statusError[3]);// 宸﹂珮鎶ヨ
- staProtocol.setRightError(statusError[4]); // 鍙抽珮鎶ヨ
- staProtocol.setWeightError(statusError[5]); // 瓒呴噸鎶ヨ
- staProtocol.setBarcodeError(statusError[6]); // 鎵爜鎶ヨ
-
- short emptyInType = siemensS7Net.getByteTransform().TransInt16(result.Content, (i * 18) + 14);//棰勭暀1-绌烘墭鍏ュ簱绫诲瀷锛�1:绔嬪簱鏂瑰悜 2:浜х嚎鏂瑰悜
- staProtocol.setEmptyInType(emptyInType);
-
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
+ }
+ }
+
+ //浠诲姟淇℃伅鍙嶉
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.400", (short) 10);
+ if (result3.IsSuccess) {
+ liftProtocol.setMode(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)); // 妯″紡
+ liftProtocol.setDeviceStatus(siemensS7Net.getByteTransform().TransInt16(result3.Content, 2)); // 璁惧鐘舵��
+ liftProtocol.setTaskStatus(siemensS7Net.getByteTransform().TransInt16(result3.Content, 4)); // 瀹屾垚淇″彿
+ liftProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result3.Content, 6)); // 宸ヤ綔鍙�
+ }
+
+ //娓╂箍搴︿俊鎭弽棣�
+ Thread.sleep(200);
+ ArrayList<Integer> temperatureList = getTemperature();
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.300", (short) (temperatureList.size() * 4));
+ if (result4.IsSuccess) {
+ for (int i = 0; i < temperatureList.size(); i++) {
+ Integer deviceId = temperatureList.get(i); // 缂栧彿
+ TemperatureProtocol temperatureProtocol = temperatureMap.get(deviceId);
+ if (null == temperatureProtocol) {
+ temperatureProtocol = new TemperatureProtocol();
+ temperatureProtocol.setDeviceId(deviceId);
+ temperatureMap.put(deviceId, temperatureProtocol);
+ }
+ temperatureProtocol.setTemperature(siemensS7Net.getByteTransform().TransInt16(result4.Content, (i * 4))); // 娓╁害
+ temperatureProtocol.setHumidity(siemensS7Net.getByteTransform().TransInt16(result4.Content, (i * 4) + 2)); // 婀垮害
}
}
@@ -280,91 +285,31 @@
if (result.IsSuccess && result2.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- try {
- List<BasDevp> basDevps = new ArrayList<>();
- for (Integer siteId : staNos) {
- StaProtocol staProtocol = station.get(siteId);
- basDevps.add(staProtocol.toSqlModel());
- }
-
- BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
- throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
- }
- } catch (Exception e) {
- initSite();
- e.printStackTrace();
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- News.error("SiemensDevp"+" - 3"+" - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
-
} else {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
}
}
/**
- * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
+ * 鍐欏叆鍛戒护
*/
- private void write(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
+ private void write(LiftCommand liftCommand) throws InterruptedException {
+ if (null == liftCommand) {
return;
}
- ArrayList<Integer> staNos = getStaNo();
- int index = staNos.indexOf(staProtocol.getSiteId());
int[] array = new int[3];
- array[0] = staProtocol.getWorkNo().intValue();
- array[1] = staProtocol.getStaNo().intValue();
- array[2] = staProtocol.getPalletSize().intValue();
+ array[0] = liftCommand.getWorkNo();
+ array[1] = liftCommand.getSourceStaNo();
+ array[2] = liftCommand.getTargetStaNo();
- OperateResult write = siemensS7Net.Write("DB102." + index * 16, array);
-
-// OperateResult write = null;
-// OperateResult write1 = null;
-// //浠诲姟涓嬪彂娆℃暟
-// int writeCount = 0;
-// do {
-// write = siemensS7Net.Write("DB100." + index*2, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
-// Thread.sleep(500);
-// write1 = siemensS7Net.Write("DB101." + index*2, staProtocol.getStaNo()); // 鐩爣绔�
-// if(write.IsSuccess || write1.IsSuccess){
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100." + index*2, (short) 2);
-// OperateResultExOne<byte[]> readResult1 = siemensS7Net.Read("DB101." + index*2, (short) 2);
-// if(readResult.IsSuccess && readResult1.IsSuccess){
-// short workNo = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
-// short staNo = siemensS7Net.getByteTransform().TransInt16(readResult1.Content, 0);
-// if(staProtocol.getWorkNo().equals(workNo) && staProtocol.getStaNo().equals(staNo)){
-// //浠诲姟鍛戒护鍐欏叆鎴愬姛
-// log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-// break;
-// } else {//杩斿洖缁撴灉鏄垚鍔熶簡锛屼絾鏄湡瀹炲�间笉鐩稿悓
-// writeCount++;
-// log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝浣嗘槸璇诲彇浠诲姟鍊间笉涓�鑷淬�傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-// }
-// } else {
-// writeCount++;
-// log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-// }
-// }
-// else {
-// writeCount++;
-// log.error("鍐欏叆杈撻�佺嚎鍛戒护鍚庤鍙栧け璐ャ�傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
-// }
-// }while (writeCount<5);
+ OperateResult write = siemensS7Net.Write("DB100.0", array);
if (!write.IsSuccess) {
- staProtocol = station.get(staProtocol.getSiteId());
- if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
- staProtocol.setPakMk(true);
- }
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- News.error("SiemensDevp"+" - 4"+" - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(liftCommand)));
+ News.error("SiemensDevp"+" - 4"+" - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(liftCommand));
} else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(liftCommand)));
+ News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(liftCommand));
}
}
@@ -384,17 +329,13 @@
siemensS7Net.ConnectClose();
}
- public static void main(String[] args) {
- System.out.println(staNos1.indexOf(129));
- System.out.println(staNos1.size());
- for (int i = 0; i<staNos1.size(); i++) {
-// System.out.println(i*2);
-// System.out.println(i*2 + 200);
-// System.out.println(i);
- }
- int index = staNos1.indexOf(128);
- System.out.println(index*2);
- System.out.println(index*2 + 200);
+ @Override
+ public Map<Integer, TemperatureProtocol> getTemperatureList() {
+ return this.temperatureMap;
}
+ @Override
+ public LiftProtocol getLiftStatus() {
+ return this.liftProtocol;
+ }
}
diff --git "a/src/main/resources/WCS\344\270\216PLC\351\200\232\350\256\257\345\215\217\350\256\256.docx" "b/src/main/resources/WCS\344\270\216PLC\351\200\232\350\256\257\345\215\217\350\256\256.docx"
new file mode 100644
index 0000000..b5b8141
--- /dev/null
+++ "b/src/main/resources/WCS\344\270\216PLC\351\200\232\350\256\257\345\215\217\350\256\256.docx"
Binary files differ
--
Gitblit v1.9.1