义乌项目
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
zhoushihao
2025-03-11 d9d502b669dcbfc8e3aed10014aa99930979cd7a 
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java


@@ -1,13 +1,18 @@


package com.mes.job;




import cn.hutool.json.JSONObject;


import com.github.yulichang.wrapper.MPJLambdaWrapper;


import com.mes.common.S7object;


import com.mes.common.config.Const;


import com.mes.device.PlcParameterObject;


import com.mes.engineering.entity.Engineering;


import com.mes.engineering.service.EngineeringService;


import com.mes.opctask.entity.LoadGlassDeviceTask;


import com.mes.opctask.service.LoadGlassDeviceTaskService;


import com.mes.pp.service.OptimizeProjectService;


import com.mes.rawglassdetails.entity.RawGlassStorageDetails;


import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;


import com.mes.rawglassstation.entity.RawGlassStorageStation;


import com.mes.tools.DateUtil;


import com.mes.tools.WebSocketServer;


import com.mes.uppattenusage.entity.UpPattenUsage;


@@ -24,6 +29,7 @@


import java.text.SimpleDateFormat;


import java.util.ArrayList;


import java.util.List;


import java.util.stream.Collectors;




/**


 * @author SNG-010


@@ -44,6 +50,8 @@


    RedisUtil redisUtil;


    @Resource


    private LoadGlassDeviceTaskService loadGlassDeviceTaskService;


    @Resource


    private RawGlassStorageDetailsService rawGlassStorageDetailsService;




    PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;




@@ -161,9 +169,18 @@


            jsonObject.append("LoadTwoervice", LoadTwoState.getInkageState());




            //工位信息


            List<UpWorkstation> upWorkstations = upWorkstationService.list();


            jsonObject.append("list", upWorkstations);




            MPJLambdaWrapper<RawGlassStorageDetails> wrapper = new MPJLambdaWrapper<>();


            wrapper.select(RawGlassStorageStation::getSlot)


                    .select("ifnull(remain_quantity, 0) as remain_quantity")


                    .rightJoin(RawGlassStorageStation.class, on -> on.eq(RawGlassStorageStation::getSlot, RawGlassStorageDetails::getSlot)


                            .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN))


                    .in(RawGlassStorageStation::getDeviceId, 5, 6)


                    .orderByAsc(RawGlassStorageStation::getSlot);


            List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper);


            List<RawGlassStorageDetails> stationOneList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 5).collect(Collectors.toList());


            List<RawGlassStorageDetails> stationTwoList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 6).collect(Collectors.toList());


            jsonObject.append("stationOne", stationOneList);


            jsonObject.append("stationTwo", stationTwoList);




            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");


            if (sendwServer != null) {


@@ -218,6 +235,7 @@


            }


        }


    }




    @Scheduled(fixedDelay = 1000)


    public void loadGlassIsRun() {


        JSONObject jsonObject = new JSONObject();