| | |
| | | import com.mes.md.entity.Machine; |
| | | import com.mes.md.entity.Tasking; |
| | | import com.mes.md.mapper.MachineMapper; |
| | | import com.mes.md.service.PrimitiveTaskService; |
| | | import com.mes.md.service.TaskingService; |
| | | import com.mes.tools.WebSocketServer; |
| | | import lombok.extern.slf4j.Slf4j; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.scheduling.annotation.Scheduled; |
| | | import org.springframework.stereotype.Component; |
| | | import com.mes.device.PlcParameterObject; |
| | | |
| | |
| | | TaskingService taskingService; |
| | | @Autowired |
| | | MachineMapper machineMapper; |
| | | @Autowired |
| | | PrimitiveTaskService primitiveTaskService; |
| | | //@Scheduled(fixedDelay = 500) |
| | | public void pLCScanQR() { |
| | | //获取当前任务表最新的一块任务状态 |
| | | //扫码线程 |
| | | //电气去根据上一个任务传递下来的状态自己判断需不需要扫码,如果需要扫码直接传输扫码id |
| | | String scanId = plcParameterObject.getPlcParameter("scanId").getValue(); |
| | | if(!Objects.equals(scanId, "")){ |
| | | boolean result = taskingService.insertTaskingPro(scanId); |
| | | boolean result = primitiveTaskService.updateReportCount(scanId); |
| | | if (result){ |
| | | //添加成功时发送过片信号 |
| | | S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("scan").getAddress(), Integer.parseInt("1")); |
| | |
| | | } |
| | | |
| | | } |
| | | // @Scheduled(fixedDelay = 1000) |
| | | @Scheduled(fixedDelay = 1000) |
| | | public void scanQrCode() { |
| | | //获取当前任务表最新的一块任务状态 |
| | | JSONObject jsonObject = new JSONObject(); |
| | |
| | | // //log.info("报警信息:"+warning); |
| | | // jsonObject.append("warning", warning); |
| | | // } |
| | | Machine machine=machineMapper.selectById(25L); |
| | | Machine machine=machineMapper.selectById(23L); |
| | | List<Tasking> taskingList=taskingService.findMachineTask(machine); |
| | | jsonObject.append("taskingList", taskingList); |
| | | jsonObject.append("machine", machine); |