UnLoadGlassModule/MES-Module.iml
File was deleted UnLoadGlassModule/effective-pom.xml
File was deleted UnLoadGlassModule/mockPLCData.properties
File was deleted UnLoadGlassModule/pom.xml
File was deleted UnLoadGlassModule/src/main/java/com/mes/MesApplication.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/CacheUtil.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/Constants.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLC.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/MockS7PLCtwo.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/PlcTools/S7control.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/RabbitMQUtils.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/Result.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/common/interceptor/JwtInterceptor.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/config/InterceptorConfig.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/config/MyCorsConfig.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/config/MybatisPlusConfig.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/config/SwaggerConfig.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/config/WebSocketConfig.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/controller/DownGlassInfoController.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/controller/DownWorkstationController.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/controller/dto/UserDTO.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuController.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/SysMenuItemController.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/controller/userInfo/UserController.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/DownGlassInfo.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCage.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/DownStorageCageDetails.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/DownWorkstation.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/GlassInfo.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/TaskCache.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitInfo.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcBitObject.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterInfo.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/device/PlcParameterObject.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysError.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenu.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/SysMenuItem.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/entity/userInfo/User.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/exception/GlobalExceptionHandle.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/exception/ServiceException.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/DownGlassInfoMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageDetailsMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/DownStorageCageMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/GlassInfoMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysErrorMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/DownGlassCacheLogic.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/DownGlassInfoService.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/DownWorkstationService.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/GlassInfoService.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/ModuleA.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/ModuleB.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/PLCAutoMes.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/Plcaction.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/Plchome.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/ServiceContextHolder.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/ThreadExample.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/tools/Configuration.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/tools/ExcelToJsonConverter.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/tools/InitUtil.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/tools/TokenTools.java
File was deleted UnLoadGlassModule/src/main/java/com/mes/tools/WebSocketServer.java
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/PlcAlarm.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/PlcMes.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/PlcParameter.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/PlcRead.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/PlcSign.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/PlcState.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/PlcTest.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/Plcframe.json
File was deleted UnLoadGlassModule/src/main/resources/JsonFile/alarm.xlsxBinary files differ
UnLoadGlassModule/src/main/resources/JsonFile/sign.xlsxBinary files differ
UnLoadGlassModule/src/main/resources/JsonFile/test.xlsxBinary files differ
UnLoadGlassModule/src/main/resources/application.yml
File was deleted UnLoadGlassModule/src/test/java/com/mes/MesApplicationTests.java
File was deleted UnLoadGlassModule/target/classes/JsonFile/PlcAlarm.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/PlcMes.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/PlcParameter.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/PlcRead.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/PlcSign.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/PlcState.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/PlcTest.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/Plcframe.json
File was deleted UnLoadGlassModule/target/classes/JsonFile/alarm.xlsxBinary files differ
UnLoadGlassModule/target/classes/JsonFile/sign.xlsxBinary files differ
UnLoadGlassModule/target/classes/JsonFile/test.xlsxBinary files differ
UnLoadGlassModule/target/classes/application.yml
File was deleted hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/Plcdownglass.java
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; import java.util.function.Supplier; @Slf4j public class Plcdownglass extends Thread { @@ -27,9 +28,13 @@ @Autowired private DownStorageCageService downStorageCageService; @Autowired private DownWorkstationService downWorkstationService; private DownWorkstationService downWorkstationService; // private final Supplier<DownWorkstationService> plcServiceSupplier; // // public Plcdownglass() { // this.plcServiceSupplier = () -> WebSocketServer.applicationContext.getBean(DownWorkstationService.class); // } @@ -39,10 +44,12 @@ JSONObject jsonObject = new JSONObject(); try { Thread.sleep(100); String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + ""; String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + ""; downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class); downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class); // String result = S7control.getinstance().ReadWord("DB14.0", 1).get(0) + ""; // String number = S7control.getinstance().ReadWord("DB14.2", 1).get(0) + ""; String result ="1"; String number ="1"; // 进片请求 if (RESULT_IN.equals(result)) { downStorageCageService.processInto(number); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/config/AppRunnerConfig.java
@@ -1,5 +1,6 @@ package com.mes.config; import com.mes.common.Plcdownglass; import com.mes.common.Plchome; import com.mes.device.PLCAutoMes; import org.springframework.boot.ApplicationArguments; @@ -18,7 +19,7 @@ // System.out.println("启动完成"); new Plcdownglass().start(); // new PLCAutoMes().start(); // hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/mapper/DownGlassInfoMapper.java
@@ -7,11 +7,6 @@ @Repository public interface DownGlassInfoMapper extends BaseMapper<DownGlassInfo> { // @Select("SELECT MAX(sequence) FROM down_glass_info WHERE flow_card_id = #{flowCardId} LIMIT 1") // Integer getMaxSequenceByFlowCardId(@Param("flowCardId") String flowCardId); //// // @Delete("delete from down_glass_task where flow_card_id = #{flowCardId}") // void deletetask(@Param("flowCardId") String flowCardId); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassTaskService.java
@@ -19,7 +19,7 @@ void updateTaskStateToZero(long id); void deleteTask(long id); void deleteTask(String id); DownGlassTask selectLastOutCacheInfo(String endCell);
@@ -39,9 +39,9 @@ } @Override public void deleteTask(long id) { public void deleteTask(String id) { LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(DownGlassTask::getId, id); queryWrapper.eq(DownGlassTask::getFlowCardId, id); baseMapper.delete(queryWrapper); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/mapper/DownStorageCageDetailsMapper.java
@@ -18,53 +18,5 @@ */ @Mapper public interface DownStorageCageDetailsMapper extends BaseMapper<DownStorageCageDetails> { // // @Select("select * from `glass_info` where id=#{id}") // GlassInfo SelectGlassId(String id); // 查询笼子内空闲 @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot") List<DownStorageCageDetails> SelectCacheLeisure(); // 查询符合工位的出片玻璃 @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN #{start} and #{end} order by escd.tempering_layout_id,escd.tempering_feed_sequence") List<DownStorageCageDetails> SelectCacheOut(int start,int end); //SELECT* from (SELECT DISTINCT escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot left join down_workstation as dw on escd.flow_card_id=dw.flow_card_id WHERE escd.slot IS NOT NULL and dw.workstation_id BETWEEN 1 and 5 order by escd.tempering_layout_id,escd.tempering_feed_sequence) as cc ORDER BY cc.width desc // 查询笼子内信息 @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot") List<DownStorageCageDetails> SelectCachInfo(); // 查询可进此片玻璃的栅格号 找到相同版图id并且大于前面的顺序的空格 @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null and escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence") List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence, double width); // 查询可进此片玻璃的栅格号 @Select("select escd.* from down_storage_cage as esc LEFT JOIN down_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence") List<DownStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width); // // 查询全部任务 // @Select("select * from down_glass_task") // List<DownGlassTask> SelectCacheInfoAll(); // // // 查询进片任务 // @Select("select * from down_glass_task where task_type='1' and task_stauts='0'") // List<DownGlassTask> SelectInputCacheInfo(); // // // 查询出片任务 // @Select("select * from down_glass_task where task_type='2' and task_stauts='0'") // List<DownGlassTask> SelectOutCacheInfo(); // 查询 A06 或 A11 最新的一片 出片任务 // @Select("select * from down_glass_task where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1") // GlassInfo SelectLastOutCacheInfo(String EndCell); // 修改笼子内信息 // @Update("update") // Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id); // 添加下片任务 @Insert("INSERT into down_glass_task VALUES(#{id},#{start},#{end},#{type},0,)") Integer insertCacheTask(String id, String start, String end, String type,double width,double height,Integer filmsId,double thickness,String flowCardId); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -219,6 +219,20 @@ public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell,String taskType ) { DownGlassTask downGlassTask = new DownGlassTask(); downGlassTask.setId(glassInfo.getId()); downGlassTask.setStartCell(startCell); downGlassTask.setTaskType(taskType); downGlassTask.setEndCell(endCell); downGlassTask.setWidth(glassInfo.getWidth()); downGlassTask.setHeight(glassInfo.getHeight()); downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid())); downGlassTask.setThickness(glassInfo.getThickness()); downGlassTask.setFlowCardId(glassInfo.getFlowcardId()); return downGlassTask; } @@ -227,7 +241,7 @@ //按id查询玻璃信息表里的玻璃 GlassInfo GlassInfo = glassInfoService.selectGlassId(Number); PlcParameterObject plcmes = PLCAutoMes.PlcMesObject; PlcParameterObject plcmes = PLCAutoMes.PlcMesObject; //存在此玻璃编号 if (GlassInfo != null) { //同找到同流程卡附近空格 @@ -240,19 +254,11 @@ //selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId()); DownGlassTask downGlassTask = new DownGlassTask(); downGlassTask.setId(GlassInfo.getId()); downGlassTask.setStartCell("0"); downGlassTask.setTaskType("1"); downGlassTask.setEndCell(item.getSlot()+""); downGlassTask.setWidth(GlassInfo.getWidth()); downGlassTask.setHeight(GlassInfo.getHeight()); downGlassTask.setFilmsid(GlassInfo.getFilmsid()+""); downGlassTask.setThickness(GlassInfo.getThickness()); downGlassTask.setFlowCardId(GlassInfo.getFlowcardId()); DownGlassTask downGlassTask = createDownGlassTask(GlassInfo,"0",item.getSlot()+"","1"); downGlassTaskService.insertCacheTask(downGlassTask); S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1); S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1); //完成后插入小片数据到缓存表 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstationTask.java
@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.data.annotation.Id; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; //import javax.persistence.Id; import java.io.Serializable; @@ -25,6 +29,11 @@ * id */ @TableId(value = "id", type = IdType.AUTO) @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; /** hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationMapper.java
@@ -27,50 +27,4 @@ public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> { //查询工位表和任务表中状态为1的流程卡号和已落架数量 @Select("SELECT dwt.flow_card_id,dw.id,dw.racks_number FROM down_workstation_task dwt JOIN down_workstation dw ON dwt.flow_card_id = dw.flow_card_id WHERE dwt.state = 1 LIMIT 1") List<DownWorkstation> selectdownWorkstationstate(); // @Select("SELECT flow_card_id,filmsid,width,height,thickness FROM down_glass_task WHERE task_stauts = 1;") // List<DownGlassTask> selectunloadingtaskstate(); //更新落架数量 // @Update("UPDATE down_workstation SET racks_number = #{racksNumber} " + // "WHERE flow_card_id = #{flowCardId}") // void update_racks_number(@Param("flowCardId") String flowCardId, // @Param("racksNumber") Integer racksNumber); //插入机械任务表 // @Insert("INSERT INTO down_workstation_task (flow_card_id, width, height, thickness, filmsid,state) " + // "VALUES (#{flowCardId}, #{width}, #{height}, #{thickness}, #{filmsid},1)") // void insertdownWorkstationtask(DownGlassInfo downGlassInfo); //根据工位id更新实体类接收的数据 // @Update("UPDATE down_workstation SET width = #{width}, height = #{height}, flow_card_id = #{flowCardId} WHERE workstation_id = #{workstationId}") // void updateFlowCardId(DownWorkstation downWorkstation); // @Update("UPDATE down_workstation_task SET state = 0 WHERE flow_card_id = #{flowCardId}") // void update_task_state_to_zero(@Param("flowCardId") String flowCardId); // @Select("SELECT * FROM down_workstation WHERE workstation_id BETWEEN #{startId} AND #{endId}") // List<DownWorkstation> getDownWorkstationsInRange(@Param("startId") int startId, @Param("endId") int endId); // @Select("SELECT DISTINCT flowcard_id from glass_info") // @ResultType(Map.class) // List<Map<String, Object>> getflowCardId(); // @Update("UPDATE down_workstation SET flow_card_id = NULL, total_quantity = 0, racks_number = 0 WHERE workstation_id = #{workstationId}") // void clearFlowCardInfoByWorkstationId(@Param("workstationId") int workstationId); // 获取总数量 // @Select("SELECT total_quantity FROM down_workstation WHERE workstation_id = #{workstationId}") // int getTotalQuantity(@Param("workstationId") int workstationId); // 获取落架数量 // @Select("SELECT racks_number FROM down_workstation WHERE workstation_id = #{workstationId}") // int getRacksNumber(@Param("workstationId") int workstationId); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/mapper/DownWorkstationTaskMapper.java
@@ -1,5 +1,6 @@ package com.mes.downworkstation.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.entity.DownWorkstationTask; @@ -14,6 +15,7 @@ * @author zhoush * @since 2024-04-07 */ @DS("salve_hangzhoumes") public interface DownWorkstationTaskMapper extends BaseMapper<DownWorkstationTask> { List<DownWorkstationTask> selectList(); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationTaskService.java
@@ -4,6 +4,8 @@ import com.mes.downglassinfo.entity.DownGlassInfo; import com.mes.downworkstation.entity.DownWorkstationTask; import java.util.List; /** * <p> * 服务类 @@ -16,4 +18,6 @@ void insertdownWorkstationtask(DownGlassInfo downGlassInfo); void updateTaskStateToZero(long Id); List<DownWorkstationTask> getTaskState(); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -32,7 +32,7 @@ @Autowired private DownGlassTaskService downGlassTaskService; @Autowired private DownWorkstationTaskService downWorkstationTaskService; @@ -117,6 +117,14 @@ public DownWorkstation selectByFlowCardId(String flowcardid) { QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("flow_card_id", flowcardid); return baseMapper.selectOne(queryWrapper); } @@ -159,7 +167,7 @@ Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId()); // 初始化顺序字段值 int sequence = maxSequence != null ? maxSequence + 1 : 1; // newdownGlassInfo.setId(downGlassInfo.getId()); newdownGlassInfo.setWidth(downGlassInfo.getWidth()); newdownGlassInfo.setHeight(downGlassInfo.getHeight()); newdownGlassInfo.setThickness(downGlassInfo.getThickness()); @@ -174,6 +182,8 @@ downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo); //更新下片任务表状态为0 downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId()); //删除下片任务表中的记录 downGlassTaskService.deleteTask(downGlassInfo.getFlowCardId()); sequence++; // 递增顺序字段值 @@ -186,17 +196,18 @@ try { //查询下片工位表中架子是否绑定了流程卡号 工位表和任务表中状态为1的流程卡号和已落架数量 List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate(); List<DownWorkstationTask> taskdownWorkstation = downWorkstationTaskService.getTaskState(); if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) { //，如果已经绑定则更新已落架数量,并且删除下片任务表中的记录 for (DownWorkstation downWorkstation : taskdownWorkstation) { for (DownWorkstationTask downWorkstation : taskdownWorkstation) { //更新下片工位表中已落架数量 updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1); DownWorkstation downWorkstation1 = selectByFlowCardId(downWorkstation.getFlowCardId()); updateracksnumber(downWorkstation.getFlowCardId(),downWorkstation1.getRacksnumber() + 1); //更新机械任务表中状态为0 downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId()); //删除机械任务表 downWorkstationTaskService.removeById(downWorkstation.getId()); //删除下片任务表中的记录 downGlassTaskService.deleteTask(downWorkstation.getId()); } } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
@@ -1,12 +1,16 @@ package com.mes.downworkstation.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.downglassinfo.entity.DownGlassInfo; import com.mes.downglassinfo.entity.DownGlassTask; import com.mes.downworkstation.entity.DownWorkstationTask; import com.mes.downworkstation.mapper.DownWorkstationTaskMapper; import com.mes.downworkstation.service.DownWorkstationTaskService; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -22,6 +26,12 @@ public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) { DownWorkstationTask entity = new DownWorkstationTask(); // 查询当前最大的 id 值 Long maxId = getMaxId(); // 如果没有记录，则将 id 设置为 1；否则，将 id 设置为当前最大 id 值加 1 Long newId = (maxId == null) ? 1 : maxId + 1; entity.setId(newId); // 设置手动递增的 id entity.setFlowCardId(downGlassInfo.getFlowCardId()); entity.setWidth(downGlassInfo.getWidth()); entity.setHeight(downGlassInfo.getHeight()); @@ -32,6 +42,29 @@ baseMapper.insert(entity); } // 查询最大的 ID private Long getMaxId() { QueryWrapper<DownWorkstationTask> wrapper = new QueryWrapper<>(); wrapper.select("MAX(id) as max_id"); List<Object> list = baseMapper.selectObjs(wrapper); if (list != null && !list.isEmpty()) { Object obj = list.get(0); if (obj != null) { return Long.parseLong(obj.toString()); } } // 如果没有查询到结果，则返回 0 return 0L; } @Override public List<DownWorkstationTask> getTaskState() { QueryWrapper<DownWorkstationTask> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("state", 1); return baseMapper.selectList(queryWrapper); } @Override public void updateTaskStateToZero(long id) { UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>(); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -1,6 +1,7 @@ package com.mes.glassinfo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,6 +31,7 @@ /** * 流程卡 */ @TableField("flow_card_Id") private String flowcardId; /** @@ -120,7 +122,7 @@ /** * 工程号 */ private Integer engineerId; private String engineerId; /** * 生产规则id hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/mapper/GlassInfoMapper.java
@@ -16,10 +16,5 @@ public interface GlassInfoMapper extends BaseMapper<GlassInfo> { // @Select("SELECT COUNT(*) FROM glass_info WHERE flowcard_id = #{flowCardId}") // int getGlassInfoCountByFlowCardId(@Param("flowCardId") String flowCardId); // @Update("UPDATE down_workstation SET total_quantity = #{glassInfoCount},flow_card_id=#{flowCardId} WHERE workstation_id = #{workstationId}") // int updateFlowCardIdAndCount(@Param("flowCardId") String flowCardId, @Param("glassInfoCount") int glassInfoCount,@Param("workstationId")int workstationId); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -47,7 +47,7 @@ @Override public GlassInfo selectGlassId(String id) { QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("id", id); queryWrapper.eq("glass_id", id); return baseMapper.selectOne(queryWrapper); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -4,6 +4,8 @@ import com.mes.downstorage.entity.DownStorageCageDetails; import com.mes.downstorage.service.impl.DownStorageCageServiceImpl; import com.mes.downworkstation.service.DownWorkstationService; import com.mes.downworkstation.service.impl.DownWorkstationServiceImpl; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,6 +29,8 @@ @Autowired DownStorageCageServiceImpl downStorageCageServiceImpl; @Autowired DownWorkstationServiceImpl downWorkstationServiceImpl; @Test public void testFindPath() { @@ -35,20 +39,36 @@ @Test public void testCacheGlass() { List<Map> map= downStorageCageServiceImpl.getCacheInfo(); List<Map> map = downStorageCageServiceImpl.getCacheInfo(); log.info("笼内信息：{}", Arrays.asList(map)); } @Test public void testselectCacheEmpty() { List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheLeisure(); List<DownStorageCageDetails> map = downStorageCageServiceImpl.getCacheLeisure(); log.info("笼内空格：{}", Arrays.asList(map)); } @Test public void testgetCacheOut() { List<DownStorageCageDetails> map= downStorageCageServiceImpl.getCacheOut(1,5); List<DownStorageCageDetails> map = downStorageCageServiceImpl.getCacheOut(1, 5); log.info("根据传入的工位查询符合按照顺序和大小出片的小片：{}", Arrays.asList(map)); } } @Test public void testupdateFlowCardIdAndCount() { log.info("绑定流程卡号和数量"); downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1); } @Test public void testplc() { log.info("测试"); downWorkstationServiceImpl.insertdownglassinfo(); } }
