From 37dbd9b1e1d47c46a0ad590155d941ddffbd825a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 10 八月 2020 13:10:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 66 +++++++++++++++++++++++++++++---
src/main/java/com/zy/core/MainProcess.java | 20 ++++++++-
src/main/java/com/zy/core/thread/CrnThread.java | 1
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 2
4 files changed, 78 insertions(+), 11 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 f1874dc..ea4177b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4,12 +4,10 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.WaitPakinMapper;
import com.zy.asrs.mapper.WrkMastMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WrkDetlService;
@@ -58,6 +56,8 @@
private LocMastService locMastService;
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private BasCrnpService basCrnpService;
@Autowired
private JdbcTemplate jdbcTemplate;
@@ -270,18 +270,51 @@
}
}
- // 鏇存柊鍫嗗灈鏈轰俊鎭� 涓� 涓嬪彂plc鍛戒护 todo:luxiaotao
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+
+ // 1.澶嶄綅鍫嗗灈鏈� 鏇存柊鍫嗗灈鏈轰俊鎭� 涓� 涓嬪彂plc鍛戒护 todo:luxiaotao
crnProtocol.setStatus(CrnStatusType.IDLE);
crnProtocol.setTaskNo((short)0);
- boolean result = MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task<>(4, crnProtocol));
- if (!result) {
+ if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task<>(4, crnProtocol))) {
throw new CoolException("鏇存柊鍫嗗灈鏈轰俊鎭け璐�");
}
+ // 2.涓嬪彂绔欑偣淇℃伅
+ staProtocol.setWorkNo(wrkMast.getWrkNo());
+ staProtocol.setStaNo(wrkMast.getStaNo());
+ if (!MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task<>(4, staProtocol))) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
}
}
}
}
+
+
+ /**
+ * 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
+ */
+ public void crnStnToLoc(){
+ for (Slave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ if (basCrnp == null) {
+ continue;
+ }
+ // 鍙湁褰撳爢鍨涙満绌洪棽 鎴栬�� 鏃犱换鍔℃椂鎵嶇户缁墽琛�
+ if (crnProtocol.getStatusType() == CrnStatusType.IDLE || crnProtocol.getTaskNo() == 0) {
+
+ }
+
+
+
+
+ }
+ }
+
+
/**
* 鎵ц瀵瑰伐浣滄。鐨勫叆搴撳畬鎴�
@@ -295,4 +328,23 @@
}
}
+ /**
+ * 鏇存柊鍫嗗灈鏈虹Щ鍔ㄦ椂宸ヤ綔妗ｇ姸鎬�
+ */
+ public void updateCrnMove() {
+ for (Slave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ // todo
+ if (crnProtocol.getStatusType() == CrnStatusType.FETCH_POSITION) {
+
+ WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
+
+
+ }
+
+
+ }
+ }
}
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a74c0df..a33376e 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -34,16 +34,30 @@
if (SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- // 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗ｏ紝宸ヤ綔鐘舵��2锛屾棤璁惧鍛戒护涓嬪彂
+ // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick();
- // 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
+
+
+ // 鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鍒板簱浣�
+ mainService.crnStnToLoc();
+
+
+
+
+
+
+
+
+
// 鎵ц瀵瑰伐浣滄。鐨勫叆搴撳畬鎴�
mainService.storeFinished();
-
+ // 鏇存柊鍫嗗灈鏈虹Щ鍔ㄦ椂宸ヤ綔妗ｇ姸鎬�
+ mainService.updateCrnMove();
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 49a760b..ef9d7a0 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -37,7 +37,7 @@
/**
* 浠诲姟鍙�
*/
- public short taskNo;
+ public short taskNo = 0;
/**
* 鍫嗗灈鏈哄綋鍓嶇姸鎬�
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index ad1b865..edc4600 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -47,6 +47,7 @@
break;
case 3:
break;
+ // 澶嶄綅
case 4:
break;
default:
--
Gitblit v1.9.1