From 353417afe917a2314f13bb40c70c02e818306182 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 11 三月 2025 09:41:32 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +-
src/main/java/com/zy/asrs/entity/WrkMast.java | 134 ++++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/core/MainProcess.java | 3
3 files changed, 139 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 82817b4..64f7e78 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -496,6 +496,87 @@
}
}
+ public Integer getStaNoCs(int[] autoZ){
+ switch (staNo){
+ case 114:
+ case 115:
+ case 116:
+ case 117:
+ case 118:
+ return 102;
+ case 120:
+ case 121:
+ case 122:
+ return 104;
+ case 124:
+ case 125:
+ case 126:
+ return 106;
+ case 128:
+ case 129:
+ case 130:
+ return 108;
+ case 133:
+ return 111;
+ case 102:
+ switch (autoZ[0]){
+ case 0:
+ autoZ[0]++;
+ return 114;
+ case 1:
+ autoZ[0]++;
+ return 115;
+ case 2:
+ autoZ[0]++;
+ return 116;
+ case 3:
+ autoZ[0]++;
+ return 117;
+ default:
+ autoZ[0] = 0;
+ return 118;//117
+ }
+ case 104:
+ switch (autoZ[1]){
+ case 0:
+ autoZ[1]++;
+ return 120;
+ case 1:
+ autoZ[1]++;
+ return 121;
+ default:
+ autoZ[1] = 0;
+ return 122;//121
+ }
+ case 106:
+ switch (autoZ[2]){
+ case 0:
+ autoZ[2]++;
+ return 124;
+ case 1:
+ autoZ[2]++;
+ return 125;
+ default:
+ autoZ[2] = 0;
+ return 126;//125
+ }
+ case 108:
+ switch (autoZ[3]){
+ case 0:
+ autoZ[3]++;
+ return 128;
+ case 1:
+ autoZ[3]++;
+ return 129;
+ default:
+ autoZ[3] = 0;
+ return 130;
+ }
+ case 111:
+ return 133;
+ }
+ return 0;
+ }
public Integer getStaNoCs(){
switch (staNo){
case 114:
@@ -522,6 +603,59 @@
return 0;
}
+ public Integer getSourceNoCs(int[] autoZ){
+ switch (sourceStaNo){
+ case 101:
+ switch (autoZ[4]){
+ case 0:
+ autoZ[4]++;
+ return 112;
+ default:
+ autoZ[4] = 0;
+ return 113;
+ }
+ case 103:
+ return 119;
+ case 105:
+ return 123;
+ case 107:
+ return 127;
+ case 109:
+ case 110:
+ case 111:
+ switch (autoZ[5]){
+ case 0:
+ autoZ[5]++;
+ return 131;
+ default:
+ autoZ[5] = 0;
+ return 132;
+ }
+ case 112:
+ case 113:
+ return 101;
+ case 119:
+ return 103;
+ case 123:
+ return 105;
+ case 127:
+ return 107;
+ case 131:
+ case 132:
+ switch (autoZ[6]){
+ case 0:
+ autoZ[6]++;
+ return 109;
+ case 1:
+ autoZ[6]++;
+ return 110;
+ default:
+ autoZ[6] = 0;
+ return 111;
+ }
+ }
+ return 0;
+ }
public Integer getSourceNoCs(){
switch (sourceStaNo){
case 101:
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 fa18b85..37d62dc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -360,7 +360,7 @@
}
//浠诲姟瀹屾垚
- public synchronized void rgvCompleteWrkMastSta() {
+ public synchronized void rgvCompleteWrkMastSta(int[] autoZ) {
try {
for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
@@ -417,8 +417,8 @@
WrkMast wrkMast1 = new WrkMast();
int workNo = commonService.getWorkNo(0);
wrkMast1.setWrkNo((long) workNo);
- wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs());
- wrkMast1.setStaNo(wrkMast.getStaNoCs());
+ wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs(autoZ));
+ wrkMast1.setStaNo(wrkMast.getStaNoCs(autoZ));
wrkMast1.setWrkSts(1L);
wrkMast1.setIoType(1);
wrkMast1.setModiTime(now);
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 5786451..2bca69b 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -29,6 +29,7 @@
private int j = 0;
private int k = 0;
private int l = 0;
+ private int[] autoZ = new int[]{0,0,0,0,0,0,0};
/**
* =====>> 寮�濮嬪伐浣�
@@ -63,7 +64,7 @@
// 浠诲姟涓嬪彂
mainService.DevpTaskNoRun();
// 浠诲姟瀹屾垚
- mainService.rgvCompleteWrkMastSta();
+ mainService.rgvCompleteWrkMastSta(autoZ);
//鏇存柊浣嶇疆淇℃伅
mainService.updateStePosition();
--
Gitblit v1.9.1