展示组件

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/MesProductionNoSortModuleService.java

@@ -123,11 +123,12 @@ public class MesProductionNoSortModuleService extends BaseModuleService {
             dataType = MesPcnEnumUtil.STATION_DATA_TYPE.IMAGE.getValue();
             reqJson.put("url", url);
             resultBean.setResultObj(reqJson);
-        } else {
+        }
+
+        if (Objects.equal(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),mesWorkCell.getIsCountFinish())) {
             dataType =  MesPcnEnumUtil.STATION_DATA_TYPE.TEXT.getValue();
             resultBean.setResultList(productionStatisticsContext);
         }
-
         resultBean.setDataType(dataType);
         resultBean.setCustomPageName(MesPcnExtConstWords.CUSTOM_PAGE_NAME_WORK_CELL);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMaterialReadStepService.java

@@ -99,6 +99,9 @@ public class MesMaterialReadStepService extends BaseStepService {
      * @return
      */
     private List<MesRawPartCharging> getListByParentDetailId(Long id){
+        if (id == null) {
+            return null;
+        }
         List<MesRawPartCharging> list = new ArrayList<>();
 
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
@@ -111,7 +114,7 @@ public class MesMaterialReadStepService extends BaseStepService {
         for (MesRawPartCharging mesRawPartCharging : parentList) {
             List<MesRawPartCharging> chilrenList = getListByParentDetailId(mesRawPartCharging.getPackageDetailId());
             if (CollectionUtils.isEmpty(chilrenList)) {
-                list.addAll(parentList);
+                list.add(mesRawPartCharging);
             }
         }
         return list;

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionReocrdGenerateStepService.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdShiftContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
@@ -9,6 +10,7 @@ import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
@@ -22,6 +24,7 @@ import cn.estsh.i3plus.pojo.mes.repository.MesProduceSnRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesProductionRecordRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.hutool.core.date.DateUtil;
+import com.google.common.base.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,6 +62,8 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService {
     public StepResult execute(StationRequestBean reqBean) {
 
         MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue());
+        MesWorkCell mesWorkCell = productionProcessContext.getWorkCell();
+
         List<MesProduceSn> mesProduceSns = mesProductionDispatchContextStepService.getOutProduceSnDataContext(reqBean);
 
         List<MesProductionRecord> mesProductionRecords = new ArrayList<>();
@@ -70,10 +75,10 @@ public class MesProductionReocrdGenerateStepService extends BaseStepService {
         });
 
         mesProductionRecordRepository.saveAll(mesProductionRecords);
-
-        MesProdShiftContext mesProdShiftKvBean = mesProductionDispatchContextStepService.getMesProdShiftKvBean(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode());
-        // 保存班次加工数量上下文
-        mesProductionDispatchContextStepService.addProductionStatisticsContext(reqBean,mesProduceSns.size());
+        if (Objects.equal(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),mesWorkCell.getIsCountFinish())) {
+            // 保存班次加工数量上下文
+            mesProductionDispatchContextStepService.addProductionStatisticsContext(reqBean,mesProduceSns.size());
+        }
 
         return StepResult.getSuccessComplete();
     }