代码还原

严智鑫

2024-04-18 d6ab2b87018bb2a820d85869ebea11cd79559798

代码还原

 hangzhoumesParent/moduleService/CacheGlassModule/pom.xml

@@ -21,6 +21,10 @@
            <artifactId>mybatis-plus-join</artifactId>
            <version>1.1.6</version>
        </dependency>
<!--        <dependency>-->
<!--            <groupId>com.github.yulichang</groupId>-->
<!--            <artifactId>mybatis-plus-join-boot-starter</artifactId>-->
<!--        </dependency>-->
    </dependencies>

    <properties>

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java

@@ -16,12 +16,17 @@
 */
public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {

    //识别 破损/拿走
    public boolean identWorn(String glassid,int ControlsId);
    /**
     * 识别 破损/拿走
     * @param glassid
     * @param ControlsId
     * @return
     */
    boolean identWorn(String glassid,int ControlsId);
    //获取 切割当前版图
    public List<Map> selectCutTerritory();
    List<Map> selectCutTerritory();
    //获取 工程下的当前版图
    public List<Map> selectCurrentCutTerritory(String current);
    List<Map> selectCurrentCutTerritory(String current);


}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java

@@ -1,11 +1,9 @@
package com.mes.edgstoragecage.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.mapper.HangzhouMesMapper;
@@ -27,9 +25,8 @@
public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
    //获取全部数据
    @Autowired
    private HangzhouMesMapper hangzhouMesMapper;
    @Autowired
    private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;

    //识别 破损/拿走
    public boolean identWorn(String glassid,int ControlsId){
        List<EdgStorageCageDetails> edgStorageCageDetails=edgStorageCageDetailsMapper.selectList(new QueryWrapper<EdgStorageCageDetails>().eq("glassid",glassid));
@@ -39,6 +36,7 @@
        }
        return false;
    }

    //获取 切割当前版图
    @Override
    public List<Map> selectCutTerritory(){
@@ -52,6 +50,7 @@
        );
        return list;
    }

    //获取 工程下的当前版图
    @Override
    public List<Map> selectCurrentCutTerritory(String current){
@@ -64,7 +63,9 @@
                        .orderByAsc("t.layout_sequence")
        );
        return list;
    };
    }

    ;


}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java

@@ -8,6 +8,8 @@
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Map;
@@ -29,6 +31,8 @@
    EdgStorageCageMapper edgStorageCageMapper;
    @Autowired
    EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
    @Autowired
    UpPattenUsageMapper upPattenUsageMapper;

    @Override
    //查询笼内空格
@@ -45,8 +49,8 @@
    @Override
    //查询笼内出片任务   按钢化版图号+版图内序号
    public List<Map> selectCacheOut(){
        List<Map> list= edgStorageCageMapper.selectJoinList(
                Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
        List<Map> list= upPattenUsageMapper.selectJoinList(
                Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
                        .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
                        .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
                        .isNotNull("escd.slot")

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java

@@ -1,11 +1,10 @@
package com.mes.taskcache.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.taskcache.entity.TaskCache;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,38 +22,47 @@
 */
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {

    @Autowired
    GlassInfoMapper glassInfoMapper;
    @Autowired
    TaskCacheMapper taskCacheMapper;
    //添加理片笼任务
    @Override
    public boolean insertTaskCache(TaskCache taskCache){
        return this.save(taskCache);
        taskCacheMapper.insert(taskCache);
        return true;
    }

    //查询磨边任务
    @Override
    public List<TaskCache> selectEdgInfo(String line){

        return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line));
    }

    //查询理片任务
    //查询待理片工作的任务
    @Override
    public List<TaskCache> selectCacheInfo(){

        return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0));
    }

    //查询全部任务
    @Override
    public List<TaskCache> selectAll(){

        return taskCacheMapper.selectList(null);
    }

    //查询进片任务
    //查询待进片任务
    @Override
    public List<TaskCache> selectInputTaskCache(){

        return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",1));
    }

    //查询出片任务
    //查询待出片任务
    @Override
    public List<TaskCache> selectOutTaskCache(){

        return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("taskstauts",0).eq("tasktype",2));
    }

    //查询  A09  或 A10 最新的一片 出片任务
    @Override
    public List<TaskCache> selectLastOutCacheInfo(String line){

        return taskCacheMapper.selectList(new QueryWrapper<TaskCache>().eq("endcell",line).eq("taskstauts",1).orderByDesc("ID"));
    }
}

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/uppattenusage/mapper/UpPattenUsageMapper.java

@@ -1,6 +1,7 @@
package com.mes.uppattenusage.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.uppattenusage.entity.UpPattenUsage;

/**
@@ -11,6 +12,6 @@
 * @author zhoush
 * @since 2024-04-07
 */
public interface UpPattenUsageMapper extends BaseMapper<UpPattenUsage> {
public interface UpPattenUsageMapper extends MPJBaseMapper<UpPattenUsage> {

}