From c69120c632f60bbbaf7a075d12ee0071b47deccc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 08 十二月 2022 15:42:22 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    9 ++++++++-
 src/main/resources/mapper/LocDetlMapper.xml                 |    2 +-
 src/main/java/com/zy/common/web/WcsController.java          |    4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index f060460..a002055 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -90,7 +90,14 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
+
+        List<String> matnrs = new ArrayList<>();
+        for (FullStoreParam.MatCodeStore matCodeStore : param.getList()) {
+            Mat mat = matService.selectByMatnr(matCodeStore.getMatnr());
+            if (mat != null && !matnrs.contains(mat.getMaktx())) {
+                matnrs.add(mat.getMaktx());
+            }
+        }
         StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = dto.getWorkNo();
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index cc9295a..ce57f66 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -117,7 +117,7 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
         List<Mat> mats = Collections.singletonList(mat);
-        List<String> matnrList = mats.stream().map(Mat::getMatnr).distinct().collect(Collectors.toList());
+        List<String> matnrList = mats.stream().map(Mat::getMaktx).distinct().collect(Collectors.toList());
         StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto,0);
         int workNo = dto.getWorkNo();
         Date now = new Date();
@@ -255,7 +255,7 @@
             throw new CoolException(CodeRes.NONE_DETL_900);
         }
         // 妫�绱㈠簱浣�
-        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMatnr).distinct().collect(Collectors.toList());
+        List<String> matnrList = wrkDetls.stream().map(WrkDetl::getMaktx).distinct().collect(Collectors.toList());
         return commonService.getLocNo(1, ioType - 50, devpNo, matnrList, locTypeDto,0); // 搴撲綅鍙凤紝 鍫嗗灈鏈猴紝鐩爣绔�
     }
 
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index aa3488a..e9c9466 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -314,7 +314,7 @@
             group by loc_no
         ) dual on dual.loc_no = lm.loc_no
         WHERE 1 = 1
-        AND ld.matnr = #{matnr}
+        AND ld.maktx = #{matnr}
         AND (lm.row1 >= #{start} AND lm.row1 &lt;= #{end})
         AND (lm.loc_sts = 'F')
         AND dual.count = 1

--
Gitblit v1.9.1