From 697d0933ae797b2edbe29c1b7bbcd948b6cf9ff4 Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Mon, 26 Aug 2024 15:23:25 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E4=BA=A7=E5=93=81=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java
index ca22f8a..4e452f1 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProductionRecordService.java
@@ -106,7 +106,7 @@ public class MesProductionRecordService implements IMesProductionRecordService {
         if (!CollectionUtils.isEmpty(productionRecordList)) {
             //数据查询
             Map<String, MesCraft> craftMap = getStringMesCraftMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getCraftCode).distinct().collect(Collectors.toList()));
-            Map<String, MesProduceSn> produceSnMap = getStringMesProduceSnMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getSerialNumber).distinct().collect(Collectors.toList()));
+            Map<String, MesProduceSn> produceSnMap = getStringMesProduceSnMap(organizeCode, productSn);
             Map<String, MesWorkCenter> mesWorkCenterMap = getStringMesWorkCenterMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getWorkCenterCode).distinct().collect(Collectors.toList()));
             Map<String, MesWorkCell> workCellMap = getStringMesWorkCellMap(organizeCode, productionRecordList.stream().map(MesProductionRecord::getWorkCellCode).distinct().collect(Collectors.toList()));
             //数据组装
@@ -137,9 +137,9 @@ public class MesProductionRecordService implements IMesProductionRecordService {
         return craftMap;
     }
 
-    private Map<String, MesProduceSn> getStringMesProduceSnMap(String organizeCode, List<String> snList) {
+    private Map<String, MesProduceSn> getStringMesProduceSnMap(String organizeCode, String productSn) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getInPackList(snList, MesPcnExtConstWords.SERIAL_NUMBER,packBean);
+        DdlPreparedPack.getStringEqualPack(productSn, MesPcnExtConstWords.PRODUCT_SN,packBean);
         List<MesProduceSn> mesProduceSns = mesProduceSnRepository.findByHqlWhere(packBean);
         Map<String, MesProduceSn> mesProduceSnMap = new HashMap<>();
         if(!CollectionUtils.isEmpty(mesProduceSns)){