From bfd82d675c8efcacebc28550f41e79fd4d80e258 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 24 十二月 2025 15:05:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 52 ++++++++++++++++++++++++++++++++++++----------------
src/main/java/com/zy/core/MainProcess.java | 2 +-
src/main/webapp/views/login.html | 2 +-
3 files changed, 38 insertions(+), 18 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 7061c8b..8d1d625 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1173,11 +1173,14 @@
new EntityWrapper<BasCrnp>().eq("crn_no", crnProtocol.getCrnNo())
);
boolean result = true;
- if(crnProtocol.getCrnNo() != 5){
+ if(crnProtocol.getCrnNo() != 3 ){
return;
}
for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+ if(crnStn.getStaNo() == 4001){
+ continue;
+ }
StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo2());
if (staProtocol == null) {
News.infoNoLog(" - 鍫嗗灈鏈哄叆搴撶珯淇℃伅(staProtocol!=null缁х画鎵ц)锛歴taProtocol="+staProtocol);
@@ -1205,10 +1208,6 @@
return;
}
}
- if(crnProtocol.getCrnNo() != 5){
- return;
- }
-
// 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�3,12
if (wrkMastMapper.selectWorking(crnProtocol.getCrnNo()) != null) {
return;
@@ -1671,9 +1670,9 @@
}
if (wrkMast.getIoType() == 107){
int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", wrkMast.getIoType()).eq("wrk_sts", 14));
- if (count >= inventoryNumber) {
- continue;
- }
+// if (count >= inventoryNumber) {
+// continue;
+// }
}
// 宸ヤ綔妗ｇ姸鎬佸垽鏂�
if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
@@ -2435,7 +2434,7 @@
} else {
total = locDetl.getAnfme();
}
- if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
+ if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1 ||wrkMast.getIoType() == 57 || wrkMast.getIoType() == 53) {
ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getOrderNo(), wrkDetl.getBoxType3(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),wrkDetl.getAnfme(),total));
}
if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
@@ -3723,15 +3722,32 @@
rgvThread.setPakMk(false); //灏忚溅鍙屽伐浣嶉攣瀹�
}
+ }
+ }
- RgvThread rgvThread1 = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
- RgvProtocol rgvProtocol1 = rgvThread.getRgvProtocol();
- if (rgvProtocol1 == null) {
+ public synchronized void rgvIoExecuteScheduling() {
+ for (RgvSlave rgv : slaveProperties.getRgv()) {
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null) {
continue;
}
- if(rgvProtocol1.getStatusType1() == RgvStatusType.IDLE &&
- rgvProtocol1.getModeType() == RgvModeType.AUTO && rgvThread1.isPakMk()
- && rgvThread1.isPaking() && basRgv.getPakAll().equals("1")){
+ BasRgv basRgv = basRgvService.selectById(rgv.getId());
+ if (basRgv == null) {
+ log.error("{}鍙稲GV灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�4", rgv.getId());
+ continue;
+ }
+ if(rgvProtocol.getStatusType1() == RgvStatusType.WORKING){
+ rgvThread.setPaking(true);
+ }
+
+ if(rgvProtocol.isLoaded1ing() && rgvProtocol.isLoaded2ing()){
+ basRgv.setPakAll("1");
+ basRgvService.updateById(basRgv);
+ }
+ if(rgvProtocol.getStatusType1() == RgvStatusType.IDLE &&
+ rgvProtocol.getModeType() == RgvModeType.AUTO && rgvThread.isPakMk()
+ && rgvThread.isPaking() && basRgv.getPakAll().equals("1")){
if(basRgv.getPakOut().equals("1") && basRgv.getPakIn().equals("1")){
rgvPreSchedulingIn(rgv, rgvProtocol);//鑻ユ殏鏃犱笅鍙戜换鍔￠璋冨害鎻愬墠鍒板彇璐х偣
if (rgvProtocol.getLastIo().equals("I")) {
@@ -4050,6 +4066,8 @@
//閬嶅巻rgv鍏ュ簱鍙栬揣绔欑偣
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, rgvStn.getDevpPlcId());
StaProtocol staProtocol = devpThread.getStation().get(rgvStn.getStaNo2());
+ StaProtocol staProtocol2 = devpThread.getStation().get(rgvStn.getStaNo());
+
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, (int) rgvProtocol.getRgvNo());
BasRgv basRgv = basRgvService.selectById(slave.getId());
if (basRgv == null) {
@@ -4059,7 +4077,9 @@
if(staProtocol.getWorkNo() == 0){
continue;
}
- StaProtocol staProtocol2 = null;
+ if(staProtocol2.getWorkNo() != 0 ){
+ continue;
+ }
WrkMastSta wrkMastSta3 = null;
// if(rgvStn.getStaNo2()!= null ){
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 61d0842..7402bd7 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -117,9 +117,9 @@
continue;
}
mainService.rgvIoExecute(11);//鍙栬揣
+ mainService.rgvIoExecuteScheduling();
mainService.rgvOutExecute();//鏀捐揣
mainService.rgvTaskComplete();//浠诲姟瀹屾垚
-
} catch (Exception e) {
e.printStackTrace();
log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index aca907d..c78b8b1 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -109,7 +109,7 @@
<div id="login-wrapper" class="animate__animated animate__bounceInDown">
<header>
- <h2>WCS 绯荤粺鐧诲綍</h2>
+ <h2>WCS鑷姩鍖栫珛浣撲粨搴撴帶鍒剁郴缁烿2.0</h2>
</header>
<div class="layui-form layadmin-user-login-body">
<div class="layui-form-item">
--
Gitblit v1.9.1