diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java index f8341de..1846ca6 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxProdBusiStrategyCommonService.java @@ -23,13 +23,11 @@ import cn.estsh.i3plus.platform.common.tool.MathOperation; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; -import cn.estsh.i3plus.pojo.mes.bean.MesShift; +import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.model.StationRequestBean; import cn.estsh.i3plus.pojo.mes.model.StepResult; import cn.estsh.i3plus.pojo.mes.repository.MesPackageDetailRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesProductDataRepository; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -81,6 +79,9 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi private MesRepairTaskRepository repairTaskRepository; @Autowired + private MesProductDataRepository productDataRepository; + + @Autowired private IFsmRouteDataService fsmRouteDataService; @Autowired @@ -429,6 +430,8 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi doRestoreRepairTask(params); + doRestoreProductData(params); + } private void doRestoreProdBindRecord(JxProdBusiStrategyParamsBuilder params) { @@ -524,6 +527,25 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi } + private void doRestoreProductData(JxProdBusiStrategyParamsBuilder params) { + + if (null == params.getProduceSnMcRecordDb()) return; + + List productDataList = productDataRepository.findByProperty( + new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.SERIAL_NUMBER}, + new Object[]{params.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), params.getProduceSnMcRecordDb().getSerialNumber()}); + + for (MesProductData item : productDataList) { + if (null == item) continue; + if (!StringUtils.isEmpty(item.getProductSn())) continue; + item.setProductSn(params.getProduceSnMcRecordDb().getProductSn()); + item.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()); + ConvertBean.serviceModelUpdate(item, params.getUserInfo()); + productDataRepository.save(item); + } + + } + @Override public void execFinalInspectionMarkRepair(JxProdBusiStrategyParamsBuilder params) {