Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java

@@ -309,6 +309,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
 
                 partInspectionDetailRepository.saveAll(model.getPartInspectionDetailList());
 
+                //若是扫描条码 则判定条码可疑
                 if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
                     MesProduceSn produceSn = checkProduceSn(model.getSn(), org);
                     produceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS.getValue());
@@ -354,7 +355,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
                     throw new ImppBusiException(String.format("【%s】位置不存在，请检查数据", defectTypeNoExitList));
                 }
 
-
+                //若是扫描条码 则判定条码可疑
                 if (model.getSourceType() == MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.SINGLE.getValue()) {
                     MesProduceSn produceSn = checkProduceSn(model.getSn(), org);
                     produceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SUSPICIOUS.getValue());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java

@@ -142,7 +142,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         for (List<Long> tmp : ListUtils.partition(setEquipVariableIdList, MesCommonConstant.MAX_PAGER_SIZE)) {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
             DdlPreparedPack.getInPackList(tmp, "equipVariableId", packBean);
-//            DdlPreparedPack.getNumEqualPack(model.getSpotCheckOrder().getEquipId(), "equipId", packBean);
+            DdlPreparedPack.getNumEqualPack(model.getSpotCheckOrder().getEquipId(), "id", packBean);
             setEquipmentLogList.addAll(equipmentLogRepository.findByHqlWhere(packBean));
         }
         //设定值地址数据Map
@@ -152,7 +152,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService {
         for (List<Long> tmp : ListUtils.partition(realEquipVariableIdList, MesCommonConstant.MAX_PAGER_SIZE)) {
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
             DdlPreparedPack.getInPackList(tmp, "equipVariableId", packBean);
-//            DdlPreparedPack.getNumEqualPack(model.getSpotCheckOrder().getEquipId(), "equipId", packBean);
+            DdlPreparedPack.getNumEqualPack(model.getSpotCheckOrder().getEquipId(), "id", packBean);
             realEquipmentLogList.addAll(equipmentLogRepository.findByHqlWhere(packBean));
         }
         //实际值地址数据Map