From 03991cb0fed2b67f327f7e242988e7a2a06d8238 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 十一月 2022 16:18:54 +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 |    1 +
 1 files changed, 1 insertions(+), 0 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 c03dcef..3e4bde1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -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();

--
Gitblit v1.9.1