1、推送上片工位信息

zhoushihao

2025-03-11 0762328022924dcb72d51c7099b85abb714a18b3

1、推送上片工位信息

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java

@@ -13,6 +13,7 @@
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -51,7 +52,7 @@
    @Resource
    private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
    @Resource
    private RawGlassStorageDetailsService rawGlassStorageDetailsService;
    private RawGlassStorageStationService rawGlassStorageStationService;

    PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;

@@ -169,14 +170,7 @@
            jsonObject.append("LoadTwoervice", LoadTwoState.getInkageState());

            //工位信息
            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> rawGlassStorageDetailList = rawGlassStorageStationService.listRawGlassDetails();
            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);