更改删除工程逻辑，改为显示未进卧式理片的小片信息

wu

2024-12-16 b2430c5d1b6edf6b608c1fecf25979a4e4ef17fe

更改删除工程逻辑，改为显示未进卧式理片的小片信息

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java

@@ -1,8 +1,10 @@
package com.mes.glassinfo.service;

import com.github.yulichang.base.MPJBaseService;
import com.mes.engineering.entity.Engineering;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO;
import com.mes.uppattenusage.entity.UpPattenUsage;

import java.util.List;
import java.util.Map;
@@ -37,5 +39,7 @@
    List<HollowGlassInfoDTO> listBySize(String engineerId);

    void deleteTask(String engineerId);

    List<GlassInfo> selectEdgGlassInfo(String engineering);
}


 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.engineering.entity.Engineering;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.entity.OptimizeGlassinfo;
import com.mes.glassinfo.entity.dto.HollowGlassInfoDTO;
@@ -11,14 +12,12 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.uppattenusage.entity.UpPattenUsage;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -150,5 +149,18 @@
        baseMapper.delete(queryWrapper);
    }

    @Override
    public List<GlassInfo> selectEdgGlassInfo(String engineeringId) {
        List<GlassInfo> glassInfos = null;
        if (engineeringId != null) {
            glassInfos = baseMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>()
                    .select("t.*")
                    .leftJoin("edg_storage_cage_details b on t.engineer_id=b.engineer_id and t.glass_id=b.glass_id")
                    .isNull("b.glass_id")
                    .eq("t.engineer_id", engineeringId));
        }
        return glassInfos;
    }


}

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java

@@ -102,15 +102,14 @@
    @ResponseBody
    public  Result <Boolean> deleteTask(@RequestBody Engineering engineering) {
        //删除工程表、小片表、上片表，更改优化表状态
        boolean work=engineeringService.deleteTask(engineering.getEngineerId());
        glassInfoService.deleteTask(engineering.getEngineerId());
        upPattenUsageService.deleteTask(engineering.getEngineerId());
        optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
        if (work) {
//        boolean work=engineeringService.deleteTask(engineering.getEngineerId());
//        glassInfoService.deleteTask(engineering.getEngineerId());
//        upPattenUsageService.deleteTask(engineering.getEngineerId());
//        optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
          //查询未上片的小片信息
        List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
            return Result.build(200, "删除成功"+engineering.getEngineerId(), true);
        }else {
            return Result.build(200, "删除失败"+engineering.getEngineerId(), false);
        }


    }


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java

@@ -74,5 +74,7 @@
     UpPattenUsage selectedEngineering(String engineerId);

    void deleteTask(String engineerId);


}


 hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java

@@ -166,6 +166,11 @@
        List<UpPattenUsage> list=upPattenUsageService.selectSaveUpPattenUsage("P24062706");
        System.out.println("工程："+list);
    }

    @Test
    public void test9() {
        //获取未到磨边表的小片信息
        List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo("P24120201");
        System.out.println("工程："+glasslist);
    }

}