wuyouming666
2024-04-22 b20faff61130884408558a6c8260b82cc9819675
删除无用代码
2个文件已修改
27 ■■■■■ 已修改文件
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -224,8 +224,6 @@
    @Override
    public boolean processInto(String Number) {
        glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
        downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
        //按id查询玻璃信息表里的玻璃
        GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
@@ -233,7 +231,7 @@
        //存在此玻璃编号
        if (GlassInfo != null) {
            //同找到同流程卡附近空格
            List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(),  GlassInfo.getWidth());
            List<DownStorageCageDetails> list = getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(),  GlassInfo.getWidth());
            if (list.size() > 0) {
                //存在空格
                //1.生成任务:  起始位置0   结束位置this.slot  任务类型 1   (进片任务)
@@ -243,15 +241,15 @@
                //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()); // 设置玻璃ID
                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()+""); // 设置膜ID
                downGlassTask.setThickness(GlassInfo.getThickness()); // 设置玻璃厚度
                downGlassTask.setFlowCardId(GlassInfo.getFlowcardId()); // 设置流程卡号
                downGlassTask.setWidth(GlassInfo.getWidth());
                downGlassTask.setHeight(GlassInfo.getHeight());
                downGlassTask.setFilmsid(GlassInfo.getFilmsid()+"");
                downGlassTask.setThickness(GlassInfo.getThickness());
                downGlassTask.setFlowCardId(GlassInfo.getFlowcardId());
                downGlassTaskService.insertCacheTask(downGlassTask);
                S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
@@ -281,9 +279,9 @@
        PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
        List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
        List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
        List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
        List<DownStorageCageDetails> list = getCacheOut(1, 5);
        List<DownStorageCageDetails> list2 = getCacheOut(6, 10);
        List<DownStorageCageDetails> list3 = getCacheOut(1, 10);
        //自动绑定架子
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -32,8 +32,7 @@
    @Autowired
    private DownGlassTaskService downGlassTaskService;
    @Autowired
    private DownWorkstationService downWorkstationService;
    @Autowired
    private DownWorkstationTaskService downWorkstationTaskService;
@@ -192,7 +191,7 @@
                //,如果已经绑定则更新已落架数量,并且删除下片任务表中的记录
                for (DownWorkstation downWorkstation : taskdownWorkstation) {
                    //更新下片工位表中已落架数量
                    downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
                    updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
                    //更新机械任务表中状态为0
                    downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());