From 2801c1b1ce328e27d044f26cdf9609e7c90478d7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 18:37:50 +0800
Subject: [PATCH] #盘点逻辑修改

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 47a376a..0c7350b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -433,7 +433,7 @@
                     //*********************鍚屽簱浣嶇粍鏍¢獙*********************
                     boolean flag = false;
                     String th = "";
-                    List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getLocNo());
+                    List<String> innerLoc = Utils.getGroupInnerLoc(wrkMast.getSourceLocNo());
                     for (String loc : innerLoc) {
                         LocMast locMast = locMastService.selectById(loc);
                         if (locMast == null) {
@@ -465,7 +465,7 @@
                     // 鏇存柊宸ヤ綔妗f暟鎹姸鎬�
                     wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
                     wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵��: 2.璁惧涓婅蛋
-                    wrkMast.setSourceStaNo(pickSta.getStaNo()); // 婧愮珯
+                    wrkMast.setSourceStaNo(pickSta.getBackSta()); // 婧愮珯
 //                            wrkMast.setStaNo(dto.getStaNo()); // 鐩爣绔�
 //                            wrkMast.setCrnNo(dto.getCrnNo());
                     wrkMast.setStaNo(liftStaProtocol.getStaNo());//鐩爣绔�
@@ -488,6 +488,7 @@
                         throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
                     }
 
+                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());//鍐欏叆宸ヤ綔鍙�
                     staProtocol.setStaNo(pickSta.getBackSta().shortValue());//鍐欏叆鐩爣绔�
                     MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                 }

--
Gitblit v1.9.1