CacheGlassModule/.vs/CacheVerticalGlassModule/v16/.suoBinary files differ
CacheGlassModule/.vs/ProjectSettings.json
File was deleted CacheGlassModule/.vs/VSWorkspaceState.json
File was deleted CacheGlassModule/.vs/slnx.sqliteBinary files differ
CacheGlassModule/MES-Module.iml
File was deleted CacheGlassModule/effective-pom.xml
File was deleted CacheGlassModule/pom.xml
File was deleted CacheGlassModule/src/main/java/com/mes/MesApplication.java
File was deleted CacheGlassModule/src/main/java/com/mes/common/CacheUtil.java
File was deleted CacheGlassModule/src/main/java/com/mes/common/Constants.java
File was deleted CacheGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
File was deleted CacheGlassModule/src/main/java/com/mes/common/PlcTools/S7object.java
File was deleted CacheGlassModule/src/main/java/com/mes/common/PlcTools/S7object2.java
File was deleted CacheGlassModule/src/main/java/com/mes/common/Result.java
File was deleted CacheGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
File was deleted CacheGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
File was deleted CacheGlassModule/src/main/java/com/mes/config/InterceptorConfig.java
File was deleted CacheGlassModule/src/main/java/com/mes/config/MyCorsConfig.java
File was deleted CacheGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java
File was deleted CacheGlassModule/src/main/java/com/mes/config/SwaggerConfig.java
File was deleted CacheGlassModule/src/main/java/com/mes/config/WebSocketConfig.java
File was deleted CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java
File was deleted CacheGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java
File was deleted CacheGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
File was deleted CacheGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java
File was deleted CacheGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/Engineering.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/GlassFilms.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/GlassInfo.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/TaskCache.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/Tempered.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/Tempering.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/device/InitUtil.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/device/PLCAutoMes.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java
File was deleted CacheGlassModule/src/main/java/com/mes/entity/userInfo/User.java
File was deleted CacheGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java
File was deleted CacheGlassModule/src/main/java/com/mes/exception/ServiceException.java
File was deleted CacheGlassModule/src/main/java/com/mes/mapper/HangzhouMesMapper.java
File was deleted CacheGlassModule/src/main/java/com/mes/mapper/PpMapper.java
File was deleted CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java
File was deleted CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
File was deleted CacheGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java
File was deleted CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
File was deleted CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/LogicService.java
File was deleted CacheGlassModule/src/main/java/com/mes/service/pp/PpService.java
File was deleted CacheGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
File was deleted CacheGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
File was deleted CacheGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
File was deleted CacheGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
File was deleted CacheGlassModule/src/main/java/com/mes/tools/TokenTools.java
File was deleted CacheGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
File was deleted CacheGlassModule/src/main/resources/application.yml
File was deleted CacheGlassModule/src/main/resources/banner.txt
File was deleted CacheGlassModule/src/test/java/com/mes/MesApplicationTests.java
File was deleted CacheGlassModule/target/classes/application.yml
File was deleted hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/mapper/SysMenuMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.menu.entity.SysMenu; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -13,6 +14,7 @@ * @author zhoush * @since 2024-04-11 */ @Mapper public interface SysMenuMapper extends BaseMapper<SysMenu> { List<String> selectPermsByUserId(long parseLong); hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/SysRoleMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.role.entity.SysRole; import org.apache.ibatis.annotations.Mapper; /** * <p> @@ -11,6 +12,7 @@ * @author zhoush * @since 2024-04-11 */ @Mapper public interface SysRoleMapper extends BaseMapper<SysRole> { } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/mapper/SysRoleMenuMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.role.entity.SysRoleMenu; import org.apache.ibatis.annotations.Mapper; /** * <p> @@ -11,6 +12,7 @@ * @author zhoush * @since 2024-04-11 */ @Mapper public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> { } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.userinfo.entity.SysUser; import org.apache.ibatis.annotations.Mapper; /** * <p> @@ -11,6 +12,7 @@ * @author zhoush * @since 2024-04-11 */ @Mapper public interface SysUserMapper extends BaseMapper<SysUser> { } hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/mapper/SysUserRoleMapper.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.userinfo.entity.SysUserRole; import org.apache.ibatis.annotations.Mapper; /** * <p> @@ -11,6 +12,7 @@ * @author zhoush * @since 2024-04-11 */ @Mapper public interface SysUserRoleMapper extends BaseMapper<SysUserRole> { } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -18,20 +18,20 @@ public interface EdgStorageCageService extends IService<EdgStorageCage> { //查询笼内空格 public List<EdgStorageCage> selectCacheEmpty(); List<EdgStorageCage> selectCacheEmpty(); //查询笼内出片顺序详情 public List<EdgStorageCage> selectCacheOut(); List<EdgStorageCage> selectCacheOut(); //查询笼内详情 public List<Map> selectCacheInfos(); List<Map> selectCacheInfos(); //添加理片笼信息 传入glassid public boolean insertCacheInfo(String glassid); boolean insertCacheInfo(String glassid); //修改理片笼内信息 public boolean updateCacheInfo(String cacheId); boolean updateCacheInfo(String cacheId); //删除理片笼内信息 public boolean deleteCacheInfo(String cacheId); boolean deleteCacheInfo(String cacheId); } hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -2,10 +2,15 @@ port: 8081 spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false username: root password: beibo.123/ dynamic: primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver cloud: nacos: discovery: hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -24,14 +24,14 @@ @Resource private BigStorageCageMapper bigStorageCageMapper; @Override // @Override public boolean getTemperingGlass() { //获取笼子内所有版图号 List<String> temperingIdList = bigStorageCageMapper.selectTemperingId(); for (String temperingId : temperingIdList ) { } // //获取笼子内所有版图号 // List<String> temperingIdList = bigStorageCageMapper.selectTemperingId(); // for (String temperingId : temperingIdList // ) { // // } return true; } } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -2,7 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.common.S7object; //import com.mes.common.S7object; import com.mes.workstation.entity.UpWorkSequence; import com.mes.workstation.entity.UpWorkstation; import com.mes.workstation.mapper.UpWorkstationMapper; @@ -38,20 +38,20 @@ UpWorkSequence loadid1 = this.baseMapper.selectPriority(1).get(0); UpWorkSequence loadid2 = this.baseMapper.selectPriority(2).get(0); //判断一二号工位哪边的顺序更先 if(loadid1.getSequence()>loadid2.getSequence()) { S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2); }else if(loadid1.getSequence()==loadid2.getSequence()){ //当两个工位上的玻璃数相同时，判断哪个工位上的玻璃数更少,优先清空一个架子 int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue()); int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue()); if(glassnum1>glassnum2){ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2); }else{ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1); } }else{ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1); } // if(loadid1.getSequence()>loadid2.getSequence()) { // S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2); // }else if(loadid1.getSequence()==loadid2.getSequence()){ // //当两个工位上的玻璃数相同时，判断哪个工位上的玻璃数更少,优先清空一个架子 // int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue()); // int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue()); // if(glassnum1>glassnum2){ // S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2); // }else{ // S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1); // } // }else{ // S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1); // } } /** hangzhoumesParent/moduleService/pom.xml
@@ -37,11 +37,11 @@ </dependency> <!--依赖服务的工具类--> <dependency> <groupId>com.mes</groupId> <artifactId>common</artifactId> <version>1.0-SNAPSHOT</version> </dependency> <!-- <dependency>--> <!-- <groupId>com.mes</groupId>--> <!-- <artifactId>common</artifactId>--> <!-- <version>1.0-SNAPSHOT</version>--> <!-- </dependency>--> <dependency> <artifactId>servicebase</artifactId>
