From 5bfed2ca8e6abc16ed44b7d26b6854dd38e8158e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 23 Jan 2025 16:22:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/MesFunctionDialogElectronicInspectionService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogElectronicInspectionService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogElectronicInspectionService.java index d2df6a7..bcf2b65 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogElectronicInspectionService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionDialogElectronicInspectionService.java @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.mes.model.StationCustomDialogBean; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StationResultBean; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +22,7 @@ import org.springframework.util.StringUtils; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -44,19 +46,19 @@ public class MesFunctionDialogElectronicInspectionService extends BaseSwsService MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT); //functionValue=电子化检验的判断结果 - List inspectionList = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : Arrays.asList(buttonDynamicModel.getFunctionValue().split(MesPcnExtConstWords.COMMA)); + Map inspectionMap = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : JSONObject.parseObject(buttonDynamicModel.getFunctionValue(), Map.class); Boolean isSaveFlag = false; //获取上下文产出条码数据信息集合 - if (!CollectionUtils.isEmpty(inspectionList)) { + if (!CollectionUtils.isEmpty(inspectionMap)) { List productionPsOutContextList = productionDispatchContextStepService.getProductionPsOutContext(reqBean); if (!CollectionUtils.isEmpty(productionPsOutContextList)) { for (MesProductionPsOutContext productionPsOutContext : productionPsOutContextList) { if (null == productionPsOutContext) continue; if (productionPsOutContext.getQcStatus().compareTo(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()) != 0 - || !inspectionList.contains(productionPsOutContext.getProductSn())) continue; + || !inspectionMap.containsKey(productionPsOutContext.getProductSn())) continue; //电子化检验弹框判不合格 - productionPsOutContext.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS.getValue()); + productionPsOutContext.setQcStatus(inspectionMap.get(productionPsOutContext.getProductSn())); isSaveFlag = true; } //保存上下文产出条码数据信息集合