From 1844e7fee0f8cab303fbb797f41eb6196552b3ca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十一月 2022 16:19:33 +0800
Subject: [PATCH] Merge branch 'ynwcs' of http://47.97.1.152:5880/r/zy-wcs into ynwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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 15a9e9e..0d330da 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -974,7 +974,7 @@
wrkMastMapper.updateById(wrkMast);
// 鍒ゆ柇鏄惁涓虹┛姊簱
- if (!locMastService.isShuttle(wrkMast.getLocNo())) {
+ if (!locMastService.isShuttle(wrkMast.getSourceLocNo())) {
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
@@ -1327,6 +1327,7 @@
SteProtocol steProtocol = steThread.getSteProtocol();
if (steProtocol == null) { continue; }
if (!steProtocol.isIdle()) { continue; }
+ if (steProtocol.getRow() == 1) { continue; }
String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();
LocMast locMast = locMastService.selectById(locNo);
int lev = locMast.getLev1();
@@ -2788,22 +2789,25 @@
if (Cools.isEmpty(steProtocol, basSte)) {
continue;
}
- // 1鍙峰厖鐢垫々
- if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
+ if (steProtocol.getCharge() < 99) {
continue;
}
- // 2鍙峰厖鐢垫々
- if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
- continue;
- }
- // 3鍙峰厖鐢垫々
- if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
- continue;
- }
- // 灏忚溅鏄惁澶勪簬鍏呯數鐘舵��
- if (steProtocol.getChargeStatus() == 1) {
- continue;
- }
+// // 1鍙峰厖鐢垫々
+// if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
+// continue;
+// }
+// // 2鍙峰厖鐢垫々
+// if (value.equals(SteChargeType.SECOND) && devpThread.charge1) {
+// continue;
+// }
+// // 3鍙峰厖鐢垫々
+// if (value.equals(SteChargeType.THIRD) && devpThread.charge2) {
+// continue;
+// }
+// // 灏忚溅鏄惁澶勪簬鍏呯數鐘舵��
+// if (steProtocol.getChargeStatus() == 1) {
+// continue;
+// }
// case 1 : 鑷姩鍏呯數寮� 棣堢數 脳
// case 2 : 鑷姩鍏呯數寮� 婊＄數 鉁�
// case 3 : 鑷姩鍏呯數鍏� 棣堢數 鉁�
--
Gitblit v1.9.1