From dbb60e2e942adb7b16e33d5d51650319aaead683 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 06 八月 2024 14:05:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 10
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 2
src/main/java/com/zy/common/task/GhlnWcsScheduler.java | 142 ++++++++++
src/main/java/com/zy/common/model/AgvTaskCompleteDto.java | 12
src/main/java/com/zy/controller/OpenController.java | 91 +++++++
src/main/java/com/zy/Boot.java | 2
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/java/com/zy/service/impl/MainServiceImpl.java | 197 ++++++++------
src/main/java/com/zy/core/MainProcess.java | 11
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 257 ++++++++++++++-----
src/main/resources/application.yml | 15
11 files changed, 565 insertions(+), 176 deletions(-)
diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index 2f3a7c0..5c4f448 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/src/main/java/com/zy/Boot.java
@@ -5,8 +5,10 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
@EnableAsync
+@EnableScheduling
@SpringBootApplication
public class Boot extends SpringBootServletInitializer {
diff --git a/src/main/java/com/zy/common/model/AgvTaskCompleteDto.java b/src/main/java/com/zy/common/model/AgvTaskCompleteDto.java
new file mode 100644
index 0000000..2db5b9b
--- /dev/null
+++ b/src/main/java/com/zy/common/model/AgvTaskCompleteDto.java
@@ -0,0 +1,12 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description
+ * @createDate 2024/7/29 11:04
+ */
+@Data
+public class AgvTaskCompleteDto {
+}
diff --git a/src/main/java/com/zy/common/task/GhlnWcsScheduler.java b/src/main/java/com/zy/common/task/GhlnWcsScheduler.java
new file mode 100644
index 0000000..049777e
--- /dev/null
+++ b/src/main/java/com/zy/common/task/GhlnWcsScheduler.java
@@ -0,0 +1,142 @@
+package com.zy.common.task;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+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 com.zy.entity.BasDevp;
+import com.zy.entity.WrkDetl;
+import com.zy.entity.WrkMast;
+import com.zy.service.BasDevpService;
+import com.zy.service.WrkDetlService;
+import com.zy.service.WrkMastService;
+import com.zy.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author pang.jiabao
+ * @description 鍐犻缚榫欏崡涓撶敤瀹氭椂浠诲姟
+ * @createDate 2024/7/10 9:20
+ */
+@Slf4j
+@Component
+public class GhlnWcsScheduler {
+
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ @Resource
+ private WrkDetlService wrkDetlService;
+
+ /**
+ * wcs寮�闂ㄥ畬鎴愶紝閫氱煡agv鍙栬揣鏀捐揣
+ */
+ @Scheduled(cron = "0/5 * * * * ?")
+ private void wcsOpenComplete() {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol305 = devpThread.getStation().get(305);
+ if (staProtocol305!= null && staProtocol305.getIfOpenDoor()) {
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ if (basDevp.getWrkNo() != 0) {
+ WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
+ if (wrkMast == null || wrkMast.getWhsType() == null || wrkMast.getWhsType() == 3){
+ return;
+ }
+ if (wrkMast.getWhsType() == 4) {
+ return;
+ }
+ WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ // 鍒ゆ柇寮�闂ㄥ畬鎴愶紝鍒欓�氱煡agv鍙互鏀捐揣
+ // 璋冪敤缁撴灉
+ boolean success = false;
+ // 鏋勯�犺姹傚ご
+ Map<String, Object> headers = new HashMap<>();
+ headers.put("Content-Type", "application/json;charset=UTF-8");
+ // 鏋勯�犺姹備綋
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("matnr",wrkDetl.getMatnr());
+ jsonObject.put("batch",wrkDetl.getBatch());
+ jsonObject.put("flag",wrkMast.getIoType() > 100 ? "0" : "1");
+ String body = jsonObject.toJSONString();
+ String response = "";
+ try {
+ response = new HttpHandler.Builder()
+ .setUri("http://192.168.204.44:8010")
+ .setPath("/api/TaskCreat/AllowEntry")
+ .setHeaders(headers)
+ .setJson(body)
+ .build()
+ .doPost();
+ if (!Cools.isEmpty(response)) {
+ JSONObject jsonObject1 = JSONObject.parseObject(response);
+ if ((Integer) jsonObject1.get("code") == 200) {
+ success = true;
+ wrkMast.setWhsType(3);
+ wrkMastService.updateById(wrkMast);
+ }
+ } else {
+ log.error("wcs寮�闂ㄥ畬鎴愰�氱煡agv鎺ュ彛寮傚父鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", "", body, response);
+ }
+ } catch (Exception e) {
+ log.error("wcs寮�闂ㄥ畬鎴愰�氱煡agv鎺ュ彛寮傚父锛歿}", e.getMessage());
+ } finally {
+ log.error("wcs寮�闂ㄥ畬鎴愰�氱煡agv鎺ュ彛锛歿}", success);
+ }
+ }
+ }
+ }
+
+ /**
+ * 璇诲凡鍏抽棬
+ */
+ @Scheduled(cron = "0/5 * * * * ?")
+ private void wcsCloseComplete() {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol = devpThread.getStation().get(305);
+ if (staProtocol == null) {
+ return;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ if (basDevp.getWrkNo() != 0 && basDevp.getWrkNo() != 9999) {
+ WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
+ if (wrkMast == null || wrkMast.getWhsType() == null ||wrkMast.getWhsType() != 4) {
+ return;
+ }
+ if (wrkMast.getIoType() == 1 && wrkMast.getWrkSts() == 1) {
+ staProtocol.setWorkNo(wrkMast.getWrkNo());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ if(!MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol))){
+ log.error("鍏ュ簱鍏抽棬瀹屾垚澶辫触");
+ }
+ wrkMast.setWrkSts(2L);
+ wrkMastService.updateById(wrkMast);
+ basDevp.setWrkNo(staProtocol.getWorkNo());
+ basDevpService.updateById(basDevp);
+ } else if (wrkMast.getIoType() == 101) {
+ staProtocol.setWorkNo(9999);
+ staProtocol.setStaNo(wrkMast.getSourceStaNo().shortValue());
+ if(!MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol))){
+ log.error("鍑哄簱鍏抽棬瀹屾垚澶辫触");
+ }
+ basDevp.setWrkNo(staProtocol.getWorkNo());
+ basDevpService.updateById(basDevp);
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/controller/OpenController.java b/src/main/java/com/zy/controller/OpenController.java
new file mode 100644
index 0000000..58a667f
--- /dev/null
+++ b/src/main/java/com/zy/controller/OpenController.java
@@ -0,0 +1,91 @@
+package com.zy.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.common.model.AgvTaskCompleteDto;
+import com.zy.common.web.BaseController;
+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 com.zy.entity.BasDevp;
+import com.zy.entity.WrkMast;
+import com.zy.service.BasDevpService;
+import com.zy.service.WrkMastService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+
+/**
+ * Created by vincent on 2022/4/8
+ */
+@Slf4j
+@RestController
+@RequestMapping("open/asrs")
+public class OpenController extends BaseController {
+
+ private static final boolean auth = true;
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ /**
+ * agv鍙栨斁璐у畬鎴愶紝閫氱煡wcs
+ */
+ @PostMapping("/agv/agvTaskComplete")
+ public synchronized R agvTaskComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody AgvTaskCompleteDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ // 缁�305鍐欏叧闂�
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ if (basDevp.getWrkNo() != 0) {
+ WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
+ if(wrkMast.getWhsType() != null && wrkMast.getWhsType() == 3) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol305 = devpThread.getStation().get(305);
+ if (!staProtocol305.getIfCloseDoor()) { // 娌¤姹傚叧闂�
+ // 璇锋眰鍏抽棴
+ if(!MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 0))){
+ log.error("璇锋眰鍏抽棬澶辫触");
+ R.parse("璇锋眰鍏抽棬澶辫触");
+ }
+ staProtocol305.setOpenAskDoor(false);
+ wrkMast.setWhsType(4);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+ } else {
+ return R.parse("鏃犱换鍔�");
+ }
+ return R.ok("璇锋眰鍏抽棬鎴愬姛");
+ }
+
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (!auth) {
+ return;
+ }
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 9203b8f..4a11259 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -78,11 +78,14 @@
mainService.outOfDevp(11);
- // 鐢熸垚106鍑哄簱浠诲姟
-// mainService.generateOutbound();
+ // 106鐢熸垚杞Щ浠诲姟
+ mainService.autoMoveLoc();
- // 鐢熸垚106鍒�105杞Щ浠诲姟
-// mainService.autoMoveLoc();
+ // 缁檖lc鍐欏紑闂ㄤ俊鍙�
+ mainService.writePlc305();
+
+ // 305鍏ュ簱璋冪敤搴曞骇鍒�305
+ mainService.invokingBase();
// if (i>10){
// //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
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 b65ca3f..c844cae 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -98,6 +98,14 @@
private Boolean upcontactErr = false; //椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�
+ private Boolean ifOpenDoor = false; // 鏄惁鎵撳紑
+
+ private Boolean ifCloseDoor = false; // 鏄惁鍏抽棴
+
+ private Boolean openAskDoor = false; // 璇锋眰寮�闂�
+
+ private Boolean closeAskDoor = false; // 璇锋眰鍏抽棬
+
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
basDevp.setDevNo(siteId);
@@ -108,7 +116,7 @@
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.setLocType3((short) (high?1:0)); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
return basDevp;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 6308a61..4c5e682 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -314,7 +314,7 @@
|| !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
|| !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
|| !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
- || !command.isTraySize() == one.isTraySize()
+
){
try{
News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1892047..5c16180 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,7 +5,6 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
@@ -21,15 +20,16 @@
import com.zy.core.model.protocol.StaError1;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.entity.BasDevp;
-import com.zy.entity.WrkMast;
import com.zy.service.BasDevpService;
-import com.zy.service.WrkMastService;
import com.zy.utils.News;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -108,6 +108,10 @@
write((StaProtocol)task.getData());
log.error("杈撻�佺嚎涓嬪彂鍛戒护锛�"+((StaProtocol) task.getData()).getWorkNo()+","+((StaProtocol) task.getData()).getStaNo());
break;
+ // 鍐欏紑闂�
+ case 3:
+ write2((Integer) task.getData());
+ break;
default:
break;
}
@@ -120,6 +124,42 @@
}
}
+
+ private void write2(int flag) throws InterruptedException {
+ if (flag == 0) {
+ OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
+ if (readOpenResult.IsSuccess) {
+ boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
+ booleans[1] = true; // 鍏抽棬淇″彿
+ booleans[0] = false;
+ siemensS7Net.Write("DB100.826",booleans);
+ }
+ } else if(flag == 1) {
+ OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
+ if (readOpenResult.IsSuccess) {
+ boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
+ booleans[0] = true; // 寮�闂ㄤ俊鍙�
+ booleans[1] = false;
+ siemensS7Net.Write("DB100.826",booleans);
+ }
+ }
+ Thread.sleep(500);
+ OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
+ if (readOpenResult.IsSuccess) {
+ boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
+ StaProtocol staProtocol = station.get(305);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(305);
+ station.put(305, staProtocol);
+ }
+ staProtocol.setOpenAskDoor(booleans[0]);
+ staProtocol.setCloseAskDoor(booleans[1]);
+ staProtocol.setIfOpenDoor(booleans[2]);
+ staProtocol.setIfCloseDoor(booleans[3]);
+ }
+ }
+
/**
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
@@ -263,7 +303,36 @@
staProtocol.setPakMk(true);
}
}
+ // 璇讳簩妤�3鍖�
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.1600", (short) (6*8));
+ if (result2.IsSuccess) {
+ for (int i = 13; i < staNos.size(); i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result4.Content, (i-13)*8)); // 宸ヤ綔鍙�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result4.Content, (i-13)*8 + 4)); // 鐩爣绔�
+
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, (i-13)*8 + 6, 2);
+ staProtocol.setAutoing(status[0]); // 鑷姩
+ staProtocol.setLoading(status[1]); // 鏈夌墿
+ staProtocol.setInEnable(status[2]); // 鍙叆
+ staProtocol.setOutEnable(status[3]);// 鍙嚭
+ staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+ staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+ staProtocol.setHigh(status[6]); // 楂樺簱浣�
+ staProtocol.setLow(status[7]); // 浣庡簱浣�
+
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
+ }
+ }
// BasRgvMapService basRgvMapService = SpringUtils.getBean(BasRgvMapService.class);
//RGV灏忚溅1
// Thread.sleep(100);
@@ -343,72 +412,105 @@
staProtocol.setUpcontactErr(status[7]);
}
}
-
- // 涓�妤煎嚭鍏ュ簱妯″紡鍒囨崲
- OperateResultExOne<byte[]> ioModeResult = siemensS7Net.Read("DB101.3724", (short) 1);
- if (ioModeResult.IsSuccess) {
- boolean[] ioModelBooleans = siemensS7Net.getByteTransform().TransBool(ioModeResult.Content, 0, 1);
-// log.info("璇诲彇鍑哄叆搴撴ā寮忥細" + Arrays.toString(ioModelBooleans));
- WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
- if (ioModelBooleans[0]) { // 100鍒囧叆搴�
- if (ioModeOf101 == IoModeType.PAKOUT_MODE) {
- int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
- .eq("sta_no", 100).in("wrk_sts", 12, 13, 14));
- if (outCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[0]=true;
- ioModeOf101 = IoModeType.PAKIN_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("101鍒囨崲鍏ュ簱妯″紡鎴愬姛");
- }
- }
- }
- if (ioModelBooleans[1]) { // 100鍒囧嚭搴�
- if (ioModeOf101 == IoModeType.PAKIN_MODE) {
- int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
- .eq("sta_no", 101).in("wrk_sts", 2, 3, 4));
- if (inCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[0]=true;
- ioModeOf101 = IoModeType.PAKOUT_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("101鍒囨崲鍑哄簱妯″紡鎴愬姛");
- }
- }
- }
- if (ioModelBooleans[2]) { // 102鍒囧叆搴�
- if (ioModeOf103 == IoModeType.PAKOUT_MODE) {
- int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
- .eq("sta_no", 102).in("wrk_sts", 12, 13, 14));
- if (outCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[1]=true;
- ioModeOf103 = IoModeType.PAKIN_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("103鍒囨崲鍏ュ簱妯″紡鎴愬姛");
- }
- }
- }
- if (ioModelBooleans[3]) { // 102鍒囧嚭搴�
- if (ioModeOf103 == IoModeType.PAKIN_MODE) {
- int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
- .eq("sta_no", 103).in("wrk_sts", 2, 3, 4));
- if (inCount == 0) {
- boolean[] booleans = new boolean[8];
- booleans[1]=true;
- ioModeOf103 = IoModeType.PAKOUT_MODE;
- siemensS7Net.Write("DB100.824",booleans);
- log.info("103鍒囨崲鍑哄簱妯″紡鎴愬姛");
- }
- }
+ // 璇讳笁鍖烘晠闅滀俊鎭弽棣�
+ OperateResultExOne<byte[]> resultErr4 = siemensS7Net.Read("DB101.2096", (short) (6*2));
+ if (resultErr4.IsSuccess) {
+ for (int i = 13; i < staNos.size(); i++) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr4.Content, (i-13) * 2 + 1, 1);
+ StaProtocol staProtocol = station.get(staNos.get(i)); // 绔欑偣缂栧彿
+ staProtocol.setBreakerErr(status[0]);
+ staProtocol.setInfraredErr(status[1]);
+ staProtocol.setOutTimeErr(status[2]);
+ staProtocol.setSeizeSeatErr(status[3]);
+ staProtocol.setWrkYgoodsN(status[4]);
+ staProtocol.setInverterErr(status[5]);
+ staProtocol.setContactErr(status[6]);
+ staProtocol.setUpcontactErr(status[7]);
}
}
+ // 涓�妤煎嚭鍏ュ簱妯″紡鍒囨崲
+// OperateResultExOne<byte[]> ioModeResult = siemensS7Net.Read("DB101.3724", (short) 1);
+// if (ioModeResult.IsSuccess) {
+// boolean[] ioModelBooleans = siemensS7Net.getByteTransform().TransBool(ioModeResult.Content, 0, 1);
+//// log.info("璇诲彇鍑哄叆搴撴ā寮忥細" + Arrays.toString(ioModelBooleans));
+// WrkMastService wrkMastService = SpringUtils.getBean(WrkMastService.class);
+// if (ioModelBooleans[0]) { // 100鍒囧叆搴�
+// if (ioModeOf101 == IoModeType.PAKOUT_MODE) {
+// int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
+// .eq("sta_no", 100).in("wrk_sts", 12, 13, 14));
+// if (outCount == 0) {
+// boolean[] booleans = new boolean[8];
+// booleans[0]=true;
+// ioModeOf101 = IoModeType.PAKIN_MODE;
+// siemensS7Net.Write("DB100.824",booleans);
+// log.info("101鍒囨崲鍏ュ簱妯″紡鎴愬姛");
+// }
+// }
+// }
+// if (ioModelBooleans[1]) { // 100鍒囧嚭搴�
+// if (ioModeOf101 == IoModeType.PAKIN_MODE) {
+// int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
+// .eq("sta_no", 101).in("wrk_sts", 2, 3, 4));
+// if (inCount == 0) {
+// boolean[] booleans = new boolean[8];
+// booleans[0]=true;
+// ioModeOf101 = IoModeType.PAKOUT_MODE;
+// siemensS7Net.Write("DB100.824",booleans);
+// log.info("101鍒囨崲鍑哄簱妯″紡鎴愬姛");
+// }
+// }
+// }
+// if (ioModelBooleans[2]) { // 102鍒囧叆搴�
+// if (ioModeOf103 == IoModeType.PAKOUT_MODE) {
+// int outCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
+// .eq("sta_no", 102).in("wrk_sts", 12, 13, 14));
+// if (outCount == 0) {
+// boolean[] booleans = new boolean[8];
+// booleans[1]=true;
+// ioModeOf103 = IoModeType.PAKIN_MODE;
+// siemensS7Net.Write("DB100.824",booleans);
+// log.info("103鍒囨崲鍏ュ簱妯″紡鎴愬姛");
+// }
+// }
+// }
+// if (ioModelBooleans[3]) { // 102鍒囧嚭搴�
+// if (ioModeOf103 == IoModeType.PAKIN_MODE) {
+// int inCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 1)
+// .eq("sta_no", 103).in("wrk_sts", 2, 3, 4));
+// if (inCount == 0) {
+// boolean[] booleans = new boolean[8];
+// booleans[1]=true;
+// ioModeOf103 = IoModeType.PAKOUT_MODE;
+// siemensS7Net.Write("DB100.824",booleans);
+// log.info("103鍒囨崲鍑哄簱妯″紡鎴愬姛");
+// }
+// }
+// }
+// }
-// OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
-// if (resultErr3.IsSuccess) {
-// if (staError1 == null){
-// staError1 = new StaError1();
+ // 璇诲紑闂ㄤ俊鍙�
+// OperateResultExOne<byte[]> readOpenResult = siemensS7Net.Read("DB100.826", (short) 1);
+// if (readOpenResult.IsSuccess) {
+// boolean[] booleans = siemensS7Net.getByteTransform().TransBool(readOpenResult.Content, 0, 1);
+// StaProtocol staProtocol = station.get(305);
+// if (null == staProtocol) {
+// staProtocol = new StaProtocol();
+// staProtocol.setSiteId(305);
+// station.put(305, staProtocol);
+// }
+// staProtocol.setOpenAskDoor(booleans[0]);
+// staProtocol.setCloseAskDoor(booleans[1]);
+// staProtocol.setIfOpenDoor(booleans[2]);
+// staProtocol.setIfCloseDoor(booleans[3]);
+//// log.info("寮�闂ㄤ俊鍙凤細" + Arrays.toString(booleans));
+// }
+
+
+//// OperateResultExOne<byte[]> resultErr3 = siemensS7Net.Read("DB13.400", (short) 3);
+//// if (resultErr3.IsSuccess) {
+//// if (staError1 == null){
+//// staError1 = new StaError1();
// }
// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr3.Content, 0, 3);
// staError1.setEMERGENCY_Stop_Core(status[0]);
@@ -486,6 +588,12 @@
case 202: address = 408; break;
case 203: address = 412; break;
case 210: address = 440; break;
+ case 300: address = 800; break;
+ case 301: address = 804; break;
+ case 302: address = 808; break;
+ case 303: address = 812; break;
+ case 304: address = 816; break;
+ case 305: address = 820; break;
default:
}
if(address == -1) {
@@ -562,12 +670,13 @@
siemensS7Net.ConnectClose();
}
-// public static void main(String[] args) throws Exception {
-// DevpSlave slave = new DevpSlave();
-// slave.setIp("192.168.2.125");
-// SiemensDevpThread devpThread = new SiemensDevpThread(slave);
-// devpThread.connect();
-// devpThread.read();
+ public static void main(String[] args) throws Exception {
+ DevpSlave slave = new DevpSlave();
+ slave.setIp("10.10.10.18");
+ SiemensDevpThread devpThread = new SiemensDevpThread(slave);
+ devpThread.connect();
+ devpThread.write2(0);
+ devpThread.read();
// // 鍐�
// StaProtocol staProtocol = devpThread.getStation().get(1);
// staProtocol.setWorkNo((short) 232);
@@ -580,7 +689,7 @@
// // 璇�
// devpThread.read();
// System.out.println(JSON.toJSONString(devpThread.station));
-//
-// }
+
+ }
}
diff --git a/src/main/java/com/zy/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
index 9b4f83e..b6cc5b6 100644
--- a/src/main/java/com/zy/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/service/impl/MainServiceImpl.java
@@ -177,6 +177,7 @@
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
+ return;
}
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
@@ -186,14 +187,14 @@
&& !staProtocol.isEmptyMk()
&& staProtocol.isPakMk()) {
if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
- News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
-
- staProtocol.setWorkNo(wrkNo);
- News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
+// News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+//
+// staProtocol.setWorkNo(wrkNo);
+// News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
continue;
}
// 鍒ゆ柇閲嶅宸ヤ綔妗�
@@ -681,17 +682,33 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
- // 涓嬪彂绔欑偣淇℃伅
- staProtocol.setWorkNo(wrkMast.getWrkNo());
- staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
- continue;
- }
-
// 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14澶辫触
- wrkMast.setWrkSts(14L);
+
+ // 涓嬪彂绔欑偣淇℃伅
+
if (wrkMast.getSourceStaNo() == 106 && wrkMast.getWrkSts() == 12L) {
wrkMast.setWrkSts(16L);
+ wrkMast.setCrnNo(1);
+ if (wrkMast.getStaNo() == 107) {
+ wrkMast.setSourceStaNo(107);
+ } else if(wrkMast.getStaNo()==104) {
+ wrkMast.setSourceStaNo(105);
+ }
+ staProtocol.setStaNo((short) 106);
+
+ log.info("----------106绉诲簱鏍囪瘑---------");
+ }else if(wrkMast.getSourceStaNo() == 105 && wrkMast.getWrkSts() == 16L) {
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ log.info("106绉诲簱瀹屾垚锛岃緭閫佺嚎鍙戦��105鍒�104锛屾簮绔欎负锛�" + staProtocol.getSiteId());
+ wrkMast.setWrkSts(14L);
+ }else {
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ wrkMast.setWrkSts(14L);
+ }
+
+ staProtocol.setWorkNo(wrkMast.getWrkNo());
+ if (!MessageQueue.offer(SlaveType.Devp, crnStn.getDevpPlcId(), new Task(2, staProtocol))) {
+ continue;
}
wrkMast.setCrnEndTime(new Date());
if (wrkMastMapper.updateById(wrkMast) != 0) {
@@ -991,6 +1008,7 @@
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
// WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
+ // todo 闄愬埗鍑哄簱鍒�305鐨勫伐浣滄。锛屽鏋滈厤缃畂utModel涓嶇瓑浜嶻锛屽垯璺宠繃
for (WrkMast wrkMast : wrkMasts) {
if (wrkMast == null) {
continue;
@@ -1041,7 +1059,7 @@
if (staProtocol.isAutoing() && staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
-
+ log.warn("鍫嗗灈鏈哄嚭搴撳懡浠や笅鍙戯細"+staProtocol.getWorkNo()+","+staProtocol.isOutEnable()+","+staProtocol.getSiteId());
// 鍫嗗灈鏈烘帶鍒惰繃婊�
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
// continue;
@@ -1102,9 +1120,9 @@
break;
// return;
}
- if(crnStn.getStaNo() == 105) {
- continue;
- }
+// if(crnStn.getStaNo() == 105) {
+// continue;
+// }
News.warnNoLog(""+mark+" - 2"+" - 12"+" - 鍛戒护涓嬪彂 : 宸ヤ綔鍙�={},婧愭帓={},婧愬垪={},婧愬眰={},鐩爣鎺�={},鐩爣鍒�={},鐩爣灞�={}",wrkMast.getWrkNo().shortValue()
,sourceSta.getRow1().shortValue(),sourceSta.getBay1().shortValue(),sourceSta.getLev1().shortValue()
@@ -2996,82 +3014,42 @@
}
}
- /**
- * 鍒ゆ柇106绔欑偣鐘舵�侊紝鏈夌墿+鏈変换鍔″彿锛屽垯鐢熸垚绉诲簱浠诲姟
- */
- public synchronized void generateOutbound() {
- WrkMast wrkMast = wrkMastMapper.selectBy104();
- if (wrkMast == null) {
- return;
- }
- BasCrnp basCrnp = basCrnpService.selectById(1);
- if (!basCrnp.getInEnable().equals("Y") && !basCrnp.getOutEnable().equals("Y")) {
- return;
- }
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 1);
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- return;
- }
- // 鍫嗗灈鏈烘帶鍒惰繃婊�
- if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
- return;
- }
-
- // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
- if (wrkMastMapper.selectWorking(1) != null) {
- return;
- }
-
- LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
- // 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
- CrnCommand crnCommand = new CrnCommand();
- crnCommand.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
-// crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX(sourceSta.getRow1().shortValue()); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY(sourceSta.getBay1().shortValue()); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue()); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short) 3); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) 3); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
- crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
- News.error("鍒�106绔欑偣鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
- } else {
- // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
- Date now = new Date();
- wrkMast.setWrkSts(12L);
- wrkMast.setCrnStrTime(now);
- wrkMast.setModiTime(now);
- if (wrkMastMapper.updateById(wrkMast) == 0) {
- News.error("鍒�106绔欑偣淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
- }
- }
-
- }
-
public synchronized void autoMoveLoc() {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 16L));
-
+ if (wrkMast == null || wrkMast.getStaNo() != 104 && wrkMast.getStaNo() != 107) {
+ return;
+ }
// 鍒ゆ柇婧愮珯鐐规儏鍐� 鏈変换鍔″彿锛屾湁鐗╋紝鑷姩
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol106 = devpThread.getStation().get(106);
+ StaProtocol staProtocol105 = devpThread.getStation().get(105);
+ StaProtocol staProtocol107 = devpThread.getStation().get(107);
if (staProtocol106 == null) {
return;
} else {
staProtocol106 = staProtocol106.clone();
}
-// if (staProtocol105 == null) {
-// return;
-// } else {
-// staProtocol105 = staProtocol105.clone();
-// }
+ if (staProtocol105 == null) {
+ return;
+ } else {
+ staProtocol105 = staProtocol105.clone();
+ }
+ if (staProtocol107 == null) {
+ return;
+ } else {
+ staProtocol107 = staProtocol107.clone();
+ }
-
- // 鍒ゆ柇鍑哄簱绔欑偣鎯呭喌
-
+ if (wrkMast.getStaNo() == 104) {
+ // 鍒ゆ柇鍑哄簱绔欑偣鎯呭喌,鍙叆锛屽爢鍨涙満鍙互鍙栬揣锛屽彲鍑猴紝鍫嗗灈鏈哄彲浠ユ斁璐�
+ if (!staProtocol106.isInEnable() || !staProtocol105.isOutEnable()) {
+ return;
+ }
+ } else if (wrkMast.getStaNo() == 107) {
+ if (!staProtocol106.isInEnable() || !staProtocol107.isOutEnable()) {
+ return;
+ }
+ }
// 鑾峰彇鍫嗗灈鏈轰俊鎭� 骞� 鍒ゆ柇鏄惁鍙叆鍑�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 1);
@@ -3102,7 +3080,7 @@
crnCommand.setSourcePosX((short) 3); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY((short) 28); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
- crnCommand.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY((short) 28); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
if(wrkMast.getStaNo() == 104) { // 鐩爣绔�104锛屽嚭鍒�105浣嶇疆
@@ -3110,14 +3088,57 @@
crnCommand.setDestinationPosY((short) 4); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
}
+ crnCommand.setCommand((short)1);
crnCommand.setTraySize(true); //搴撲綅绫诲瀷
- if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
+ if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
News.error("106绉诲簱1鍙峰爢鍨涙満鍛戒护涓嬪彂澶辫触锛屽爢鍨涙満鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
}
// else {
// wrkMast.setCrnNo(2);
// wrkMastMapper.updateById(wrkMast);
// }
- News.infoNoLog("106绉诲簱2鍙峰爢鍨涙満鍏ュ嚭搴撲綔涓氫笅鍙戯細搴撲綅绉昏浆瀹屾垚");
+ News.infoNoLog("106绉诲簱缁�1鍙峰爢鍨涙満涓嬪彂瀹屾垚");
+ }
+
+ public synchronized void writePlc305() {
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ if (basDevp.getWrkNo() != 0 && basDevp.getWrkNo() != 9999) {
+ WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
+ if(wrkMast != null && wrkMast.getWhsType() != null && wrkMast.getWhsType() == 2) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol305 = devpThread.getStation().get(305);
+ if (!staProtocol305.getOpenAskDoor() && !staProtocol305.getIfOpenDoor()) { // 娌¤姹傛墦寮�
+ // 璇锋眰鎵撳紑
+ if(!MessageQueue.offer(SlaveType.Devp, 1, new Task(3, 1))){
+ log.error("璇锋眰寮�闂ㄥけ璐�");
+ }
+ }
+ }
+ }
+ }
+ public synchronized void readPlc305() {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 16L));
+
+ }
+
+ public synchronized void invokingBase() {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 1L).eq("io_type", 1)
+ .eq("source_sta_no", 305));
+ if (wrkMast != null) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol= devpThread.getStation().get(wrkMast.getStaNo());
+ if (staProtocol == null) {
+ return;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if(staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0) {
+ staProtocol.setWorkNo(wrkMast.getWrkNo());
+ staProtocol.setStaNo(wrkMast.getSourceStaNo().shortValue());
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ boolean result = MessageQueue.offer(SlaveType.Devp,1, new Task(2, staProtocol));
+ log.info("鍏ュ簱璇锋眰搴曞骇------");
+ }
+ }
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7bfffd4..0028cc6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghlnasrs
+ url: jdbc:sqlserver://10.10.10.243:1433;databasename=ghlnasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/ghlnwms
+ url: 10.10.10.243:8080/ghlnwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -202,21 +202,22 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.10.190
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 101,100
+
# LED2
led[1]:
id: 2
- ip: 10.10.10.102
+ ip: 10.10.10.191
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
+ staArr: 102,103
# LED3
led[2]:
id: 3
- ip: 10.10.10.103
+ ip: 10.10.10.192
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 104
\ No newline at end of file
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 70e92ba..0b5d5aa 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -111,7 +111,7 @@
</select>
<select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and (wrk_sts=12 or wrk_sts = 16) and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
--
Gitblit v1.9.1