Merge remote-tracking branch 'origin/master'

zhoushihao

2 天以前 4e3b8155722b66e25df3c6fd42cc586b68dea391

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java

@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
@@ -29,8 +28,8 @@
    public int judgeTasktype(String plcFeedReqLine){
        LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
        edgGlassTaskInfoWrapper
                .eq(EdgGlassTaskInfo::getLine,plcFeedReqLine)
                .orderByDesc(EdgGlassTaskInfo::getTime);
                .eq(EdgGlassTaskInfo::getLine, plcFeedReqLine)
                .orderByDesc(EdgGlassTaskInfo::getCreateTime);
        EdgGlassTaskInfo edgGlassTaskInfo=baseMapper.selectOne(edgGlassTaskInfoWrapper);
        double width=bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine);
        if(edgGlassTaskInfo.getWidth()<width){
@@ -48,8 +47,8 @@

        LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassTaskInfoWrapper=new LambdaQueryWrapper<>();
        edgGlassTaskInfoWrapper
                .eq(EdgGlassTaskInfo::getLine,1)
                .orderByDesc(EdgGlassTaskInfo::getTime);
                .eq(EdgGlassTaskInfo::getLine, 1)
                .orderByDesc(EdgGlassTaskInfo::getCreateTime);
        List<EdgGlassTaskInfo> edgGlassTaskInfoList1=baseMapper.selectList(edgGlassTaskInfoWrapper);
        int i=0;
        for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList1
@@ -64,8 +63,8 @@
        }

        edgGlassTaskInfoWrapper
                .eq(EdgGlassTaskInfo::getLine,2)
                .orderByDesc(EdgGlassTaskInfo::getTime);
                .eq(EdgGlassTaskInfo::getLine, 2)
                .orderByDesc(EdgGlassTaskInfo::getCreateTime);
        List<EdgGlassTaskInfo> edgGlassTaskInfoList2=baseMapper.selectList(edgGlassTaskInfoWrapper);
        i=0;
        for (EdgGlassTaskInfo edgGlassTaskInfo:edgGlassTaskInfoList2