hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassInfoController.java
@@ -8,5 +8,4 @@ public class DownGlassInfoController { // Other endpoints can be added for CRUD operations } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java
@@ -15,16 +15,10 @@ * @author zhoush * @since 2024-04-07 */ @Api(tags = "下料任务") @RestController @RequestMapping("/downGlassTask") public class DownGlassTaskController { //todo: 实例代码 待删除 @ApiOperation("测试") @GetMapping("/index") public String index() { return "hello world"; } }
@@ -17,7 +17,7 @@ List<DownGlassTask> getUnloadingTaskState(); void updateTaskStateToZero(String flowCardId); void updateTaskStateToZero(String flowCardId, int state); void deleteTask(String flowCardId);
@@ -32,7 +32,7 @@ } @Override public void updateTaskStateToZero(String flowCardId) { public void updateTaskStateToZero(String flowCardId,int state) { UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>(); updateWrapper.set("task_stauts", 0).eq("flow_card_id", flowCardId); baseMapper.update(null, updateWrapper); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/controller/DownStorageCageDetailsController.java
@@ -3,15 +3,13 @@ import com.mes.downstorage.entity.DownStorageCageDetails; import com.mes.downstorage.service.DownStorageCageDetailsService; import com.mes.downstorage.service.DownStorageCageService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @Api(tags = "缓存") @RestController @RequestMapping("/api/unLoadGlass/downstorage") public class DownStorageCageDetailsController { hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
@@ -30,7 +30,7 @@ @Autowired private DownStorageCageDetailsMapper selectInfo; private GlassInfoService GlassInfoService; private DownStorageCageDetailsService downStorageCageDetailsService; private DownStorageCageService downStorageCageService; private DownGlassTaskService downGlassTaskService; /** @@ -81,6 +81,8 @@ public boolean processInto(String Number) { GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class); downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class); //按id查询玻璃信息表里的玻璃 GlassInfo GlassInfo = GlassInfoService.selectGlassId(Number); PlcParameterObject plcmes = PLCAutoMes.PlcMesObject; @@ -180,16 +182,11 @@ } // 返回结果 return false; } //查询是否绑定架子 // public boolean selectFlowCardId(String FlowCardId){ // // } /** * @param Number hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -113,6 +113,9 @@ @Override public List<Map> getIsExistIntoCacheByLayoutAndSequence(Integer tempering_layout_id, Integer tempering_feed_sequence, double width) { log.info(" 查询可进此片玻璃的栅格号 找到相同版图id并且大于前面的顺序的空格"); List<Map> map = downStorageCageMapper.selectJoinList( Map.class, new MPJQueryWrapper<DownStorageCageDetails>() .select("escd.*") hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -4,6 +4,8 @@ import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.service.DownWorkstationService; import com.mes.glassinfo.service.GlassInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -23,6 +25,7 @@ */ @RestController @Api(tags = "工位") @RequestMapping("/api/unLoadGlass") public class DownWorkstationController { @@ -30,7 +33,7 @@ private DownWorkstationService downWorkstationService; @Autowired private GlassInfoService glassInfoService; @ApiOperation("获取工位信息") @GetMapping("/getone") public ResponseEntity<?> getOneDownWorkstations() { try { @@ -51,27 +54,8 @@ return ResponseEntity.status(500).body(errorResponse); } } @GetMapping("/gettwo") public ResponseEntity<?> gettwoDownWorkstations() { try { List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5); // 构建符合预期格式的响应数据 Map<String, Object> responseData = new HashMap<>(); responseData.put("code", 200); responseData.put("msg", "成功"); responseData.put("data", data); // 返回 ResponseEntity 对象，包含响应数据和状态码 return ResponseEntity.ok(responseData); } catch (Exception e) { e.printStackTrace(); // 如果出现异常，返回错误信息 Map<String, Object> errorResponse = new HashMap<>(); errorResponse.put("code", 500); errorResponse.put("msg", "服务器内部错误"); return ResponseEntity.status(500).body(errorResponse); } } @ApiOperation("获取流程卡号") @GetMapping("/getflowCardId") public ResponseEntity<Map<String, Object>> getflowCardId() { Map<String, Object> responseData = new HashMap<>(); @@ -92,6 +76,7 @@ //绑定架子 @ApiOperation("绑定架子") @PostMapping("/updateFlowCardId") public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) { // 从 requestData 中获取传入的 flowCardId @@ -112,7 +97,7 @@ return ResponseEntity.ok(responseData); } @ApiOperation("清除工位信息") @PostMapping("/clear") public ResponseEntity<Map<String, Object>> clearWorkstationInfo(@RequestBody Map<String, Object> requestData) { // 调用 DownWorkstationService 中的方法清除指定工位ID的信息 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
@@ -21,41 +21,16 @@ @Service public class DownGlassLogic { @Autowired private DownGlassInfo downGlassInfo; private DownWorkstation downWorkstation; private DownGlassInfoMapper downGlassInfoMapper; private DownGlassInfoService downGlassInfoService; private DownGlassTaskService downGlassTaskService; private DownWorkstationMapper downWorkstationMapper; private DownWorkstationService downWorkstationService; private DownWorkstationTaskService downWorkstationTaskService; PlcParameterObject plcread = PLCAutoMes.PlcReadObject; /** * // 机械手1PLC请求字 */ String robot1PLCrequestword = plcread.getPlcParameter("A01Position").getValue(); /** * // 机械手2PLC请求字 */ String robot2PLCrequestword = plcread.getPlcParameter("A01Position").getValue(); /** * // 玻璃id */ String glassID = plcread.getPlcParameter("A01Position").getValue(); String glasswidth = plcread.getPlcParameter("A01Position").getValue(); String glassheight = plcread.getPlcParameter("A01Position").getValue(); // String glassthickness = plcread.getPlcParameter("A01Position").getValue(); String pLcwancheng = plcread.getPlcParameter("A01Position").getValue(); /** * // 存放待处理的玻璃信息 */ private List<DownGlassInfo> glassList; /** * 存放玻璃放置在缓存笼中的详细信息 */ private List<DownStorageCageDetails> cageDetailsList; /** * //当下片任务表状态为1时候将数据插入到下片玻璃信息表 @@ -68,7 +43,6 @@ downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class); downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class); downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class); downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class); downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class); List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState(); // @@ -100,7 +74,7 @@ downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo); //更新下片任务表状态为0 downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId()); downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId(),downGlassInfo.getId()); sequence++; // 递增顺序字段值 @@ -142,14 +116,6 @@ } /** * @param downWorkstation // 满架拉走 清除流程卡信息 */ // public void clearFlowCardId(DownWorkstation downWorkstation) { // // downWorkstationMapper.clearFlowCardId(downWorkstation); // } }
