|
@@ -1604,6 +1604,26 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
|
|
needUpdate.setProcessworkshop(data.getWorkshopName());
|
|
needUpdate.setProcessworkshop(data.getWorkshopName());
|
|
needUpdate.setPlanstartdate(data.getPlanStartTime());
|
|
needUpdate.setPlanstartdate(data.getPlanStartTime());
|
|
needUpdate.setPlanenddate(DateUtil.offsetSecond(equDo.getPlanenddate(), (int) DateUtil.between(equDo.getPlanstartdate(), data.getPlanStartTime(), DateUnit.SECOND, false)));
|
|
needUpdate.setPlanenddate(DateUtil.offsetSecond(equDo.getPlanenddate(), (int) DateUtil.between(equDo.getPlanstartdate(), data.getPlanStartTime(), DateUnit.SECOND, false)));
|
|
|
|
+ List<String> canChooseDeviceIdList = new LinkedList<>(Arrays.asList(currentProcessOperationDo.getCanchoosedeviceid().split(",")));
|
|
|
|
+ if (!canChooseDeviceIdList.contains(data.getEquId())) {
|
|
|
|
+ ApsProcessOperationEquDo needInsert = new ApsProcessOperationEquDo();
|
|
|
|
+ needInsert.setId(SecurityUtil.getUUID());
|
|
|
|
+ needInsert.setTenantid(CXCommonUtils.getCurrentUserFactoryId(nowWorkUser));
|
|
|
|
+ needInsert.setBlankid(currentProcessOperationDo.getBlankid());
|
|
|
|
+ needInsert.setMainid(currentProcessOperationDo.getId());
|
|
|
|
+ needInsert.setResourcetype("设备");
|
|
|
|
+ needInsert.setResourceid(data.getEquId());
|
|
|
|
+ apsProcessOperationEquService.save(needInsert);
|
|
|
|
+ ApsProcessOperationDo needUpdateProcess = new ApsProcessOperationDo();
|
|
|
|
+ needUpdateProcess.setId(currentProcessOperationDo.getId());
|
|
|
|
+ canChooseDeviceIdList.add(data.getEquId());
|
|
|
|
+ needUpdateProcess.setCanchoosedeviceid(String.join(",", canChooseDeviceIdList));
|
|
|
|
+ String chooseEqu = currentProcessOperationDo.getChooseequ();
|
|
|
|
+ LinkedList<String> chooseEquList = new LinkedList<>(Arrays.asList(chooseEqu.split(",")));
|
|
|
|
+ chooseEquList.add(data.getEquName());
|
|
|
|
+ needUpdateProcess.setChooseequ(String.join(",", chooseEquList));
|
|
|
|
+ apsProcessOperationService.updateById(needUpdateProcess);
|
|
|
|
+ }
|
|
apsProcessOperationProcessEquService.updateById(needUpdate);
|
|
apsProcessOperationProcessEquService.updateById(needUpdate);
|
|
}
|
|
}
|
|
|
|
|