Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

wang

2024-04-23 ecb4007518d3b3fb658dcd3fdcf3d87083874bdf

 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;
    }



@@ -240,16 +254,8 @@

                //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);