Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

ZengTao

2025-02-21 5ad6234b30f68ae65d6ffc345e874af09c56f4e3

Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java

@@ -1,6 +1,9 @@
package com.mes.temperingglass.service;
import com.mes.temperingglass.entity.TemperingGlassInfo;

import com.github.yulichang.base.MPJBaseService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.temperingglass.entity.TemperingGlassInfo;

import java.util.List;

/**
@@ -53,4 +56,7 @@
     */
    List<TemperingGlassInfo> selectGlassInfoById(Integer id);

    GlassInfo selectTempering(GlassInfo glassInfo);

    List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo);
}

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java

@@ -4,9 +4,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -25,6 +28,8 @@
public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
    @Resource
    TemperingGlassInfoMapper temperingMapper;
    @Autowired
    private GlassInfoMapper glassInfoMapper;

    @Override
    public List<TemperingGlassInfo> selectWaitingGlass() {
@@ -132,4 +137,23 @@
        }
        return result;
    }

    @Override
    public GlassInfo selectTempering(GlassInfo glassInfo) {

        QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
        wrapper.select("max(tempering_layout_id)as id")
                .eq("engineer_id", glassInfo.getEngineerId());

        return glassInfoMapper.selectOne(wrapper);
    }

    @Override
    public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
        QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
        wrapper.eq("engineer_id", glassInfo.getEngineerId())
                .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
                .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
        return glassInfoMapper.selectList(wrapper);
    }
}

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

@@ -9,6 +9,7 @@
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.RedisUtil;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +35,8 @@
    private UpPattenUsageService upPattenUsageService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;

    @Autowired
    RedisUtil redisUtil;

    PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;

@@ -124,10 +126,20 @@
            jsonObject.append("prioritylist", upPattenUsages);
        }
        //查询1号线的任务
        List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
        Engineering request = redisUtil.getCacheObject("loadGlassRequest");
        if (request == null) {
            request = new Engineering();
            request.setStationCell(5);
        }
        List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
        jsonObject.append("loadTask1", upPattenUsages1);
        //查询2号线的任务
        List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
        Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
        if (request2 == null) {
            request2 = new Engineering();
            request2.setStationCell(6);
        }
        List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
        jsonObject.append("loadTask2", upPattenUsages2);
        //查询工位任务
        

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -85,7 +85,14 @@
    @PostMapping("/setUpPattenRequest")
    public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
        log.info("查询上片信息:{}", request);
        return Result.build(200, "查询成功", upPattenUsageService.setRawGlassTaskRequest(request));
        if (request.getStationCell() == 5) {
            return Result.build(200, "查询1号线", upPattenUsageService.setRawGlassTaskRequest(request));
        } else if (request.getStationCell() == 6) {
            return Result.build(200, "查询2号线", upPattenUsageService.setRawGlassTaskRequest2(request));
        } else {
            return Result.build(100, "查询失败", null);
        }

    }
}


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

@@ -66,7 +66,9 @@
      */
     Boolean updateGlassState(UpPattenUsage upPattenUsage);

     List<Engineering> setRawGlassTaskRequest(Engineering request);
     String setRawGlassTaskRequest(Engineering request);

     String setRawGlassTaskRequest2(Engineering request);

//     List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);

@@ -77,7 +79,7 @@
    void deleteTask(String engineerId);


     List<UpPattenUsage> selectLoadTask(Integer i);
     List<UpPattenUsage> selectLoadTask(Engineering engineering);

     /**
      * 拿走:9/破损:8

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

@@ -17,6 +17,7 @@
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,6 +43,8 @@
    EngineeringService engineeringService;
    @Autowired
    DamageService damageService;
    @Autowired
    RedisUtil redisUtil;
    @Override
    public List<UpPattenUsage> prioritylist() {
        //获取正在上片的任务id
@@ -58,13 +61,16 @@
    }

    @Override
    public List<UpPattenUsage> selectLoadTask(Integer cell) {
    public List<UpPattenUsage> selectLoadTask(Engineering cell) {
        //获取正在上片的任务id
        Engineering engineering= engineeringService.selectInitiates(1,cell);
        Engineering engineering = engineeringService.selectInitiates(1, cell.getStationCell());
        //log.info("将参数传入到查询类里{}",engineering);
        if(engineering!=null){
            LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
            if (cell.getState() != null) {
                wrapper.eq(UpPattenUsage::getState, cell.getState());
            }
            return this.list(wrapper);
        } else {
            return null;
@@ -191,10 +197,28 @@
    }

    @Override
    public List<Engineering> setRawGlassTaskRequest(Engineering request) {
        return null;
    public String setRawGlassTaskRequest(Engineering request) {
        // 调用 RedisUtil 保存 loadGlass
        if (request == null) {
            redisUtil.deleteObject("loadGlassRequest");
        } else {
            redisUtil.setCacheObject("loadGlassRequest", request);
        }
        return "success";
    }

    @Override
    public String setRawGlassTaskRequest2(Engineering request) {
        // 调用 RedisUtil 保存 loadGlass
        if (request == null) {
            redisUtil.deleteObject("loadGlassRequest2");
        } else {
            redisUtil.setCacheObject("loadGlassRequest2", request);
        }
        return "success";
    }


    public Object Engineering(Engineering request) {
        return null;
    }

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java

@@ -1,9 +1,12 @@
package com.mes.temperingglass.controller;

import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +18,7 @@
/**
 * @author SNG-010
 */
@Api(tags = "钢化显示")
@RestController
@RequestMapping("/temperingGlassInfo")
@Slf4j
@@ -58,5 +62,19 @@
        return Result.build(200, "破损成功", result);
    }

    @ApiOperation("//查询当前工程号所有的炉号")
    @PostMapping("/selectTempering") //查询当前工程号所有的炉号
    public Result<GlassInfo> selectTempering(@RequestBody GlassInfo glassInfo) {
        GlassInfo glass = temperingGlassInfoService.selectTempering(glassInfo);
        return Result.build(200, "查询成功", glass);
    }

    @ApiOperation("//查询当前工程号的钢化版图")
    @PostMapping("/selectTemperingGlass") //查询当前工程号所有的炉号
    public Result<List<GlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) {
        List<GlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
        return Result.build(200, "查询成功", glass);
    }


}

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        salve_northGlassMes:
          url: jdbc:sqlserver://127.0.0.1:1433;databasename=north_glass_mes
          url: jdbc:sqlserver://10.153.19.150:1433;databasename=north_glass_mes
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver