From 9ff1f1f221aeafc99653c846b2c2442f9c033ee5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 11 十月 2022 08:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 52 +++++++++++++++++++++++++-
src/main/java/com/zy/core/netty/constant/FireDataType.java | 2
src/main/resources/mapper/LocMastMapper.xml | 1
src/main/webapp/views/index.html | 7 ++-
src/main/webapp/static/js/console.map.js | 4 +-
src/main/java/com/zy/asrs/entity/LocMast.java | 3 +
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 10 ++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2
src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java | 2
9 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 2a220ef..1bdae9f 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -195,6 +195,9 @@
@TableField("pack_status")
private Integer packStatus;
+ @ApiModelProperty(value= "閫氶亾")
+ private Integer channel;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
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 7672a11..adf2da1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2019,6 +2019,16 @@
newStatus = 0;
newSingle = 0;//娴嬭瘯澶嶆牳锛屽瘎瀛樺櫒鍦板潃锛�8===>>0
break;
+ case 11://鍏ュ簱鍓嶅垽鏂厖鐢电嚎鏄惁鏀惧ソ
+ olsStatus = 99;
+ newStatus = 0;
+ newSingle = 11;//涓嶅彉
+ break;
+ case 12://鍏呯數绾挎斁濂�
+ olsStatus = 99;
+ newStatus = 0;
+ newSingle = 0;//娴嬭瘯澶嶆牳锛屽瘎瀛樺櫒鍦板潃锛�12===>>0
+ break;
}
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -2044,6 +2054,7 @@
}
}else if (devpThread.startSignal[i] == 5){
SearchLocParam param = new SearchLocParam();
+ param.setBarcode(i+1+"");
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/mobile/test/suspend/auth")
@@ -2086,8 +2097,45 @@
devpThread.startSignal[i] = newSingle;
}
}else if (devpThread.startSignal[i] == 8){
-
- }
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,8==>0
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if(!result){
+// log.error("鏇存柊搴撲綅绱ф�ュ嚭搴撲俊鍙峰け璐�===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode());
+// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
+ } else {
+ devpThread.startSignal[i] = newSingle;
+ }
+ }else if (devpThread.startSignal[i] == 11){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("X");
+ locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ }
+ }else if (devpThread.startSignal[i] == 12){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ if (locMast.getLocSts().equals("X")){
+ locMast.setLocSts("O");
+ locMastService.update(locMast,new EntityWrapper<LocMast>()
+ .eq("channel",(i+1)));
+ //澶嶄綅PLC淇″彿锛屽�熺敤杈撻�佺珯鐐瑰疄浣撶被
+ StaProtocol staProtocol = new StaProtocol();
+ staProtocol.setSiteId(i*2);//瀵勫瓨鍣ㄥ湴鍧�
+ staProtocol.setStaNo(newSingle);//淇敼PLC瀵勫瓨鍣ㄥ湴鍧�鍊�,12==>0
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if(!result){
+// log.error("鏇存柊搴撲綅绱ф�ュ嚭搴撲俊鍙峰け璐�===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode());
+// throw new CoolException("鏇存柊娴嬭瘯淇″彿澶辫触===>>" + i);
+ } else {
+ devpThread.startSignal[i] = newSingle;
+ }
+ }
+ }else { }
}
diff --git a/src/main/java/com/zy/core/netty/constant/FireDataType.java b/src/main/java/com/zy/core/netty/constant/FireDataType.java
index d9f1a20..25d1026 100644
--- a/src/main/java/com/zy/core/netty/constant/FireDataType.java
+++ b/src/main/java/com/zy/core/netty/constant/FireDataType.java
@@ -2,7 +2,7 @@
public enum FireDataType {
- HEARTBEAT(0x30, 0x30, "蹇冭烦淇℃伅"),
+ HEARTBEAT(0x36, 0x39, "蹇冭烦淇℃伅"),
FIRE_ALARM(0x38, 0x30, "鐏"),
diff --git a/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java b/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java
index 2cbb610..14d48c6 100644
--- a/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java
+++ b/src/main/java/com/zy/core/netty/domain/fire/Fire_3030.java
@@ -72,7 +72,7 @@
// System.out.println(byteBuf.refCnt());
this.no = analyze(new byte[]{bytes[3], bytes[4]});
this.loop = analyze(new byte[]{bytes[5], bytes[6]});
- this.partNo = analyze(new byte[]{bytes[7], bytes[8]});
+ this.partNo = analyze(new byte[]{bytes[7], bytes[8]}); //0100201 瀵瑰簲 30 31 0200201 瀵瑰簲 34 35
this.year = analyze(new byte[]{bytes[11], bytes[12]});
this.month = analyze(new byte[]{bytes[13], bytes[14]});
this.day = analyze(new byte[]{bytes[15], bytes[16]});
diff --git a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
index bc61d7c..73ea874 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
@@ -44,10 +44,18 @@
case HEARTBEAT:
ChannelCache.setChannel(String.valueOf(fire3030.getNo()), ctx.channel());
Constant.errorMap.remove(fire3030.getNo());
+ LocMastService locMastService2 = SpringUtils.getBean(LocMastService.class);
+ LocMast locMast2 = locMastService2.selectOne(new EntityWrapper<LocMast>().eq("loc_no","01001804"));
+ if(null != locMast2) {
+ locMast2.setChannel(1000);
+ locMast2.setModiTime(new Date());
+ locMastService2.update(locMast2, new EntityWrapper<LocMast>().eq("loc_no", "01001804"));
+ }
break;
case FIRE_ALARM:
//娑堥槻IO鐐圭紪鍙�
- String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
+// String fireNo = fire3030.getNo().toString() + fire3030.getLoop().toString() + fire3030.getPartNo().toString();
+ String fireNo =fire3030.getPartNo().toString(); //0100201 瀵瑰簲 30 31 0200201 瀵瑰簲 34 35
String fireTime = "20" + fire3030.getYear() + "-" + fire3030.getMonth() + "-" + fire3030.getDay()
+ " " + fire3030.getHour() + ":" + fire3030.getMinute() + ":" + fire3030.getSeconds();
Date dt = DateUtils.convert(fireTime);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d80a469..ea0e6b9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -82,7 +82,7 @@
//澶嶄綅娴嬭瘯淇″彿
case 3:
StaProtocol staProtocol = (StaProtocol)task.getData();
- siemensS7Net.Write("DB200." + staProtocol.getSiteId(), staProtocol.getStaNo());
+ siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
break;
default:
break;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 7821af2..dea056a 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -34,6 +34,7 @@
<result column="mk" property="mk" />
<result column="barcode" property="barcode" />
<result column="ctn_no" property="ctnNo" />
+ <result column="channel" property="channel" />
</resultMap>
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 074d071..a1b4c03 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -8,7 +8,7 @@
"floors": 1,
"racks": [{
"type": "rack",
- "id": "rack1",
+ "id": "rack2",
"top": 168,
"left": 463,
"width": 826,
@@ -17,7 +17,7 @@
"maxBayNo": 18
}, {
"type": "rack",
- "id": "rack2",
+ "id": "rack1",
"top": 226,
"left": 463,
"width": 826,
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 5e42cec..d0eaa3e 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -7,9 +7,10 @@
<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<style>
html{
- transform: scale(0.5) translate(-50%,-50%);
- height: 200%;
- width: 200%;
+ transform: scale(1) translate(0,0);
+ /*transform: scale(0.5) translate(-50%,-50%);*/
+ height: 150%;
+ width: 150%;
}
</style>
--
Gitblit v1.9.1