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 6d25615..01a407b 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 @@ -365,10 +365,10 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi saveProduceSnMcRecord4FinalInspection(params); - doRestoreBusiData(params); - saveProduceSn4FinalInspection(params); + doRestoreBusiData(params); + insertProduceSnTravel4ProcessMerge(params); } @@ -433,8 +433,6 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi doRestoreRepairTask(params); - doRestoreProductData(params); - } private void doRestoreProdBindRecord(JxProdBusiStrategyParamsBuilder params) { @@ -532,16 +530,23 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi private void doRestoreProductData(JxProdBusiStrategyParamsBuilder params) { - if (null == params.getProduceSnMcRecordDb()) return; + String workCellCode2Pd = ((StationRequestBean) params.getObj()).getWcpcMap().get(MesPcnExtConstWords.RESTORE_PD_FLAG); + if (StringUtils.isEmpty(workCellCode2Pd)) 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()}); + new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.PRODUCT_SN}, + new Object[]{params.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), params.getProductSn()}); + + if (CollectionUtils.isEmpty(productDataList)) return; for (MesProductData item : productDataList) { if (null == item) continue; - if (!StringUtils.isEmpty(item.getProductSn())) continue; - item.setProductSn(params.getProduceSnMcRecordDb().getProductSn()); + if (!StringUtils.isEmpty(item.getWorkCenterCode())) continue; + item.setWorkCenterCode(params.getWorkCenterCode()); + item.setWorkCellCode(workCellCode2Pd); + item.setPartNo(params.getOrderModel().getPartNo()); + item.setPartDesc(params.getOrderModel().getPartNameRdd()); + item.setOrderNo(params.getOrderModel().getOrderNo()); item.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()); ConvertBean.serviceModelUpdate(item, params.getUserInfo()); productDataRepository.save(item); @@ -757,6 +762,8 @@ public class JxProdBusiStrategyCommonService implements IJxProdBusiStrategyServi saveLineOffRecord(params); + doRestoreProductData(params); + return stepResult; } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 4a529a0..7c89c29 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -1050,6 +1050,8 @@ public class MesPcnExtConstWords { //下线箱包二检工位参数配置 public static final String KEY_PART_RECHECK = "KEY_PART_RECHECK"; + //是否补录采集数据缺失属性工位参数配置 + public static final String RESTORE_PD_FLAG = "RESTORE_PD_FLAG"; public static final String DEFAULT_STRATEGY = "defaultStrategy"; public static final String SERIAL_NUMBER_ARR_FIELD = "serialNumberArrField";