Merge branch 'test-temp-wj-250117-pack' into dev

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<String> inspectionList = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : Arrays.asList(buttonDynamicModel.getFunctionValue().split(MesPcnExtConstWords.COMMA));
+        Map<String, Integer> inspectionMap = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : JSONObject.parseObject(buttonDynamicModel.getFunctionValue(), Map.class);
 
         Boolean isSaveFlag = false;
         //获取上下文产出条码数据信息集合
-        if (!CollectionUtils.isEmpty(inspectionList)) {
+        if (!CollectionUtils.isEmpty(inspectionMap)) {
             List<MesProductionPsOutContext> 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;
                 }
                 //保存上下文产出条码数据信息集合