hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -18,12 +18,20 @@ * 磨边清洗前 */ /** * A09出片目标位置 d02卧转立 钢化出片 2001 * A10出片目标位置 d05卧转立 人工出片 2002 * A09出片目标位置 d02卧转立 2001 * A10出片目标位置 d05卧转立 2002 */ public static final Integer A09_OUT_TARGET_POSITION = 2001; public static final Integer A10_OUT_TARGET_POSITION = 2002; /** * A09出片目标位置 d02卧转立 钢化出片 3001 * A10出片目标位置 d05卧转立 人工出片 3002 */ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001; public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002; /** * 卧式理片笼详情表玻璃状态 * 识别后成功状态100 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import java.util.List; @@ -102,7 +103,14 @@ * @return */ private String saveRoleMenu(Long roleId, List<SysMenu> menuList) { log.info("配置角色菜单关心"); log.info("配置角色菜单关系"); if (CollectionUtils.isEmpty(menuList)) { // 先删除原来的记录，再保存新的 sysRoleMenuService.remove(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId)); // 删除缓存 sysUserService.clearUserAuthorityInfoByRoleId(roleId); return "success"; } List<SysRoleMenu> roleMenuList = menuList.stream().map(menu -> { SysRoleMenu roleMenu = new SysRoleMenu(); roleMenu.setRoleId(roleId); @@ -110,12 +118,9 @@ return roleMenu; }).collect(Collectors.toList()); log.info("清空角色权限表中该角色信息"); // 先删除原来的记录，再保存新的 sysRoleMenuService.remove(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId)); sysRoleMenuService.saveBatch(roleMenuList); // 删除缓存 sysUserService.clearUserAuthorityInfoByRoleId(roleId); return "success"; hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/entity/EdgStorageCage.java
@@ -40,7 +40,7 @@ /** * 启用状态 */ private String enableState; private Integer enableState; /** * 剩余 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/common/S7object.java
@@ -14,7 +14,7 @@ public class S7object extends Thread { public S7control plccontrol; // PLC通讯类实例 private EPlcType plcType = EPlcType.S1200; // 西门子PLC类型 private String ip = "192.168.20.100"; // plc ip地址 private String ip = "192.168.20.2"; // plc ip地址 private int port = 102; // plc 端口号
@@ -224,14 +224,14 @@ .orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence)); if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) { log.info("有正在出片的钢化任务"); computeOutGlassInfo(temperingGlassInfoList); computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE); return; } //是否有人工下片任务 有直接出 List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>() .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth)); if (CollectionUtils.isNotEmpty(artificialList)) { computeOutGlassInfo(temperingGlassInfoList); computeOutGlassInfo(temperingGlassInfoList, Boolean.FALSE); return; } //钢化优先：获取理片笼 玻璃小片 破损表 数量 判断笼内版图是否到齐 @@ -248,7 +248,7 @@ .eq(GlassInfo::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId()) .eq(GlassInfo::getEngineerId, temperingLayoutDTO.getEngineerId())); temperingGlassInfoService.saveBatch(temperingGlassInfos); computeOutGlassInfo(temperingGlassInfoList); computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE); return; } //未到齐 执行内部调度任务 @@ -430,7 +430,7 @@ s7control.writeWord(outLine, (short) 1); } private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list) { private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering) { //任务数据 获取车子存放玻璃最大数量 玻璃间隔 List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>(); //打车剩余尺寸 @@ -440,8 +440,14 @@ break; } remainWidth = remainWidth - (int) e.getWidth() - galssGap; bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.A09_OUT_TARGET_POSITION, (int) e.getWidth(), 0, 0, 1)); if (isTempering) { bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION, (int) e.getWidth() * 10, 0, 0, 1)); } else { bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION, (int) e.getWidth() * 10, 0, 0, 1)); } } Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "未获取出片数据，结束出片任务"); log.info("获取出片任务数据{}条，执行保存", bigStorageCageOutTaskList.size()); hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-cz.yml
@@ -15,7 +15,7 @@ password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver salve_hangzhoumes_1: url: jdbc:sqlserver://192.168.20.2:1433;databasename=hangzhoumes url: jdbc:sqlserver://192.168.20.24:1433;databasename=hangzhoumes username: sa password: beibo.123/ cloud: hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml
@@ -14,6 +14,10 @@ username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver salve_hangzhoumes_1: url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes username: sa password: beibo.123/ cloud: nacos: discovery: hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-cz.yml
@@ -4,25 +4,13 @@ primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: # hangzhoumes: # url: jdbc:mysql://192.168.1.199:3306/hangzhoumes?serverTimezone=GMT%2b8 # username: root # password: beibo.123/ # driver-class-name: com.mysql.cj.jdbc.Driver # # salve_hangzhoumes: # url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes # username: sa # password: beibo.123/ # driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 url: jdbc:mysql://192.168.1.199:3306/hangzhoumes?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver salve_hangzhoumes: url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes url: jdbc:sqlserver://192.168.20.24:1433;databasename=hangzhoumes username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/DownStorageCage.java
@@ -50,7 +50,7 @@ */ @ApiModelProperty(value = "启用状态", position = 5) @TableField("enable_state") private String enableState; private Integer enableState; /** * 剩余 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -167,7 +167,7 @@ log.info("无空架子,获取已绑定架子的流程卡信息,查看玻璃信息是否可被对调"); List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationIsIn(Boolean.FALSE); log.info("获取架子上已绑定流程卡落架的数量及未落架的玻璃数据：{}", downGlassInfoDTOList); if (CollectionUtils.isNotEmpty(downGlassInfoDTOList)) { if (CollectionUtils.isEmpty(downGlassInfoDTOList)) { log.info("已绑定流程卡均无未落架玻璃，请及时处理架子上的玻璃，清除流程卡,执行进片任务"); } else { //替换玻璃信息 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-cz.yml
@@ -10,7 +10,7 @@ password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver salve_hangzhoumes: url: jdbc:sqlserver://192.168.10.2:1433;databasename=hangzhoumes url: jdbc:sqlserver://192.168.30.101:1433;databasename=hangzhoumes username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
