Merge remote-tracking branch 'origin/dev_temp_xw_202505150000_46970' into uat-temp-wj-chongqingdaqu-prod-temp-publish0415-bak

mes-master yfai-pcn-ext-v3.8
王杰 2 months ago
commit 0cca6a1765

@ -741,6 +741,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
mesProductionAssemblyRepository.update(mesProductionAssembly); mesProductionAssemblyRepository.update(mesProductionAssembly);
// 新装配件记录为已装配 // 新装配件记录为已装配
ConvertBean.serviceModelInitialize(mesProductionRepeatAssembly,requestModel.getUserName()); ConvertBean.serviceModelInitialize(mesProductionRepeatAssembly,requestModel.getUserName());
mesProductionRepeatAssembly.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
MesProductionAssembly productionAssembly = mesProductionAssemblyRepository.insert(mesProductionRepeatAssembly); MesProductionAssembly productionAssembly = mesProductionAssemblyRepository.insert(mesProductionRepeatAssembly);
//唯一性校验数据更新 //唯一性校验数据更新
if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_30.getValue() == mesProductionAssembly.getMatchType()) { if (MesExtEnumUtil.ASSEMBLY_MATCH_TYPE.MATCH_TYPE_30.getValue() == mesProductionAssembly.getMatchType()) {

Loading…
Cancel
Save