From 24fb51443ddd4d65b21b3fc9e6aa012530cc8669 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 13 十一月 2024 09:48:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 1
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 89 ++++++++++++++++++++++++--------------------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 9 ++--
3 files changed, 55 insertions(+), 44 deletions(-)
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 026f4f8..015ac46 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -349,44 +349,53 @@
log.error(staProtocol.getStaNo()+"绔欑偣锛岀┖妗讹紝闈炴硶鐩爣绔欙紒锛侊紒锛侊紒锛�"+staProtocol.getStaNoEnd().toString());
continue;
}
- Integer workNo1 = commonService.getWorkNo(3);
- Date now = new Date();
- // 淇濆瓨宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo1);
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鍒濆
- wrkMast.setIoType(199); // 鍏ュ嚭搴撶姸鎬侊細 199.杞Щ
- wrkMast.setIoPri(15D);
- wrkMast.setCrnNo(0);
- wrkMast.setSourceStaNo(staProtocol.getStaNo().intValue()); // 婧愮珯
- wrkMast.setStaNo(staProtocol.getStaNoEnd().intValue()); // 鐩爣绔�
- wrkMast.setFullPlt("N"); // 婊℃澘
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("Y"); // 绌烘澘
- wrkMast.setBarcode("KB888888"); // 鎵樼洏鐮�
- wrkMast.setLinkMis("N");
- wrkMast.setCtnNo("Y"); // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- int res = wrkMastMapper.insert(wrkMast);
- if (res == 0) {
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing()
+ && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk()
+ && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
+ && staProtocol.isPakMk()) {
+ Integer workNo1 = commonService.getWorkNo(3);
+ Date now = new Date();
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo1);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(101L); // 宸ヤ綔鐘舵�侊細101.鍒濆
+ wrkMast.setIoType(199); // 鍏ュ嚭搴撶姸鎬侊細 199.杞Щ
+ wrkMast.setIoPri(15D);
+ wrkMast.setCrnNo(0);
+ wrkMast.setSourceStaNo(staProtocol.getStaNo().intValue()); // 婧愮珯
+ wrkMast.setStaNo(staProtocol.getStaNoEnd().intValue()); // 鐩爣绔�
+ wrkMast.setFullPlt("N"); // 婊℃澘
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setBarcode("KB888888"); // 鎵樼洏鐮�
+ wrkMast.setLinkMis("N");
+ wrkMast.setCtnNo("Y"); // 鍏ュ簱闃诲搴撲綅绉昏浆鏍囪
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ int res = wrkMastMapper.insert(wrkMast);
+ if (res == 0) {
// throw new CoolException("");
- log.error(staProtocol.getStaNo()+"绔欑偣锛岀┖妗讹紝淇濆瓨宸ヤ綔妗ｄ富妗ｅけ璐ワ紒锛侊紒锛侊紒锛�"+now.toString());
- continue;
- }
- LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
+ log.error(staProtocol.getStaNo()+"绔欑偣锛岀┖妗讹紝淇濆瓨宸ヤ綔妗ｄ富妗ｅけ璐ワ紒锛侊紒锛侊紒锛�"+now.toString());
+ continue;
+ }
+ LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
// StaProtocol staProtocol1 = new StaProtocol();
- staProtocol.setWorkNo(workNo1.shortValue());
- staProtocol.setStaNo((short)3001);
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- ledThread.errorReset();
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (!result) {
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ staProtocol.setWorkNo(workNo1.shortValue());
+ staProtocol.setStaNo((short)3001);
+ devpThread.setPakMk(staProtocol.getSiteId(), false);
+ ledThread.errorReset();
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
}
+
continue;
}
@@ -2817,7 +2826,7 @@
sta1 = Utils.getRgvEndStaNo(rgvSlave.getId(),wrkMast.getStaNo());
Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
BasDevp devp = basDevpService.selectById(staNo);
- if (devp.getWrkNo()!=0 || devp.getLoading().equals("Y")){
+ if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
continue;
}
work1 = true;
@@ -2846,7 +2855,7 @@
}
Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
BasDevp devp = basDevpService.selectById(staNo);
- if (devp.getWrkNo()!=0 || devp.getLoading().equals("Y")){
+ if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
continue;
}
workNo1 = commonService.getWorkNo(3);
@@ -2891,7 +2900,7 @@
}
Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta1);
BasDevp devp = basDevpService.selectById(staNo);
- if (devp.getWrkNo()!=0 || devp.getLoading().equals("Y")){
+ if (devp.getWrkNo()!=0 || Cools.isEmpty(devp.getLoading()) || devp.getLoading().equals("Y")){
continue;
}
work1 = true;
@@ -2944,7 +2953,7 @@
sta2 = Utils.getRgvEndStaNo(rgvSlave.getId(),wrkMast.getStaNo());
Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
BasDevp devp2 = basDevpService.selectById(staNo);
- if (devp2.getWrkNo()!=0 || devp2.getLoading().equals("Y")){
+ if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
continue;
}
@@ -2972,7 +2981,7 @@
}
Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
BasDevp devp2 = basDevpService.selectById(staNo);
- if (devp2.getWrkNo()!=0 || devp2.getLoading().equals("Y")){
+ if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
continue;
}
workNo2 = commonService.getWorkNo(3);
@@ -3018,7 +3027,7 @@
}
Integer staNo = Utils.getStaNo(rgvSlave.getId(), (int) sta2);
BasDevp devp2 = basDevpService.selectById(staNo);
- if (devp2.getWrkNo()!=0 || devp2.getLoading().equals("Y")){
+ if (devp2.getWrkNo()!=0 || Cools.isEmpty(devp2.getLoading()) || devp2.getLoading().equals("Y")){
continue;
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 0ce21f2..88fd1d1 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -83,6 +83,7 @@
rgv3Map.put(3007,3001);rgv3Map.put(3012,3001);
rgv3Map.put(1022,2402);rgv3Map.put(1025,2402);
rgv3Map.put(1016,2402);rgv3Map.put(1019,2402);
+ rgv3Map.put(2001,2402);
switch (rgvNo){
case 1:
return getRgvStaNo(rgvNo,rgv1Map.get(staNo));
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 48702f7..7d0195b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -418,12 +418,13 @@
StaProtocol staProtocol06 = station.get(3006);
short a11171 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 0);
short a11172 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 2);
- staProtocol11.setStaNoEnd(a11171);
- staProtocol11.setBan(a11172==1);
+
short a11173 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 4);
short a11174 = siemensS7Net.getByteTransform().TransInt16(result37new.Content, 6);
- staProtocol06.setStaNoEnd(a11173);
- staProtocol06.setBan(a11174==1);
+ staProtocol11.setStaNoEnd(a11173);
+ staProtocol11.setBan(a11171==1);
+ staProtocol06.setStaNoEnd(a11174);
+ staProtocol06.setBan(a11172==1);
}
}
--
Gitblit v1.9.1