From d2b2015b9801786fc2df257349bb98027784d887 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 10 十月 2023 16:22:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 e2ec5d0..5110fb1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1377,7 +1377,7 @@
                     continue;
                 }
 
-                boolean step4 = this.locToLocExecuteStep4(wrkMast);//璋冨害杞﹁締鍙栬揣骞惰繍閫佸埌鍑哄簱鍙�
+                boolean step4 = this.locToLocExecuteStep4(wrkMast);//璋冨害杞﹁締鍙栬揣骞惰繍閫佸埌鐩爣搴撲綅
                 if (!step4) {
                     continue;
                 }
@@ -2026,15 +2026,15 @@
                 if (wrkMast == null) {
                     continue;
                 }
-                WrkDetl wrkDetl = wrkDetlService.selectById(wrkMast.getWrkNo());
-                if (wrkDetl == null) {
+                List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
+                if (wrkDetls.isEmpty()) {
                     continue;
                 }
 
                 if (wrkMast.getInvWh() == null) {
                     wrkMast.setInvWh("Y");//鏍囪宸茬粡涓嬪彂鏈烘鑷備换鍔�
                     if (wrkMastMapper.updateById(wrkMast) > 0) {
-                        RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetl.getAnfme().intValue(), "303");
+                        RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetls.size(), "303");
                     }
                 }
             }else if (staProtocol317.isAutoing() && staProtocol317.isLoading() && staProtocol317.getWorkNo() != 0) {
@@ -2044,14 +2044,14 @@
                 if (wrkMast == null) {
                     continue;
                 }
-                WrkDetl wrkDetl = wrkDetlService.selectById(wrkMast.getWrkNo());
-                if (wrkDetl == null) {
+                List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
+                if (wrkDetls.isEmpty()) {
                     continue;
                 }
                 if (wrkMast.getInvWh() == null) {
                     wrkMast.setInvWh("Y");//鏍囪宸茬粡涓嬪彂鏈烘鑷備换鍔�
                     if (wrkMastMapper.updateById(wrkMast) > 0) {
-                        RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetl.getAnfme().intValue(), "317");
+                        RobotUtils.sendTask(staProtocol303.getWorkNo().toString(), wrkDetls.size(), "317");
                     }
                 }
             }

--
Gitblit v1.9.1