hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -1,6 +1,7 @@ package com.mes.uppattenusage.controller; import com.mes.uppattenusage.entity.OptimizeUpPattenUsage; import com.mes.uppattenusage.entity.UpPattenUsage; import com.mes.uppattenusage.service.UpPattenUsageService; import com.mes.utils.Result; @@ -39,9 +40,10 @@ @ApiOperation("点击选择工程保存后进行调用,传入工程号") @GetMapping("/saveUpPattenUsage") //查询现在上片机的玻璃信息 public Result<Integer> saveUpPattenUsage(@RequestBody String engineeringId) { //List<OptimizeUpPattenUsage> glass = upPattenUsageService.saveUpPattenUsage(engineeringId); log.info("显示工位上的玻璃信息:{}", 200); public Result<Integer> saveUpPattenUsage(String engineeringId) { List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineeringId); log.info("将查询出的UpPattenUsage数据保存到数据库表里:{}", 200); upPattenUsageService.saveUpPattenUsage(upPattenUsages); return Result.build(200, "", 200); } } hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/entity/OptimizeUpPattenUsage.java
@@ -1,7 +1,17 @@ package com.mes.uppattenusage.entity; import lombok.Getter; import lombok.Setter; /** * @author SNG-010 */ @Setter @Getter public class OptimizeUpPattenUsage { // Getter methods // Setter methods /** * 工程号 */ @@ -36,63 +46,5 @@ * 状态 */ private Integer state; // Getter methods public String getProjectNo() { return projectNo; } public String getGlassType() { return glassType; } public Double getWidth() { return width; } public Double getHeight() { return height; } public Double getGlassThickness() { return glassThickness; } public Integer getHeatLayoutSort() { return heatLayoutSort; } public Integer getState() { return state; } // Setter methods public void setProjectNo(String projectNo) { this.projectNo = projectNo; } public void setGlassType(String glassType) { this.glassType = glassType; } public void setWidth(Double width) { this.width = width; } public void setHeight(Double height) { this.height = height; } public void setGlassThickness(Double glassThickness) { this.glassThickness = glassThickness; } public void setHeatLayoutSort(Integer heatLayoutSort) { this.heatLayoutSort = heatLayoutSort; } public void setState(Integer state) { this.state = state; } } hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -16,6 +16,8 @@ public interface UpPattenUsageService extends MPJBaseService<UpPattenUsage> { List<UpPattenUsage> prioritylist(int state); List<Map> saveUpPattenUsage(String engineeringId); List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId); void saveUpPattenUsage(List<UpPattenUsage> upPattenUsages); }
@@ -14,9 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.*; /** * <p> @@ -43,16 +41,49 @@ @Override @DS("pp") public List<Map> saveUpPattenUsage(String engineeringId) { public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) { List<OptimizeUpPattenUsage> upPattenUsageList = null; if (engineeringId != null) { List<Map> upPattenUsageList=optimizeProjectMapper.selectJoinList(Map.class,new MPJQueryWrapper<OptimizeProject>() upPattenUsageList = optimizeProjectMapper.selectJoinList(OptimizeUpPattenUsage.class, new MPJQueryWrapper<OptimizeProject>() .select("t.project_no,t.glass_type,b.width,b.height,REGEXP_REPLACE(t.glass_thickness,'\\D','')as glass_thickness,b.heat_layout_sort") .leftJoin("optimize_layout b on t.project_no=b.project_no") .eq("b.project_no",engineeringId)); .eq("b.project_no", engineeringId)); } return Collections.emptyList(); // 创建一个 List 用于保存映射后的实体对象 List<UpPattenUsage> resultList = new ArrayList<>(); // 遍历查询结果中的每个 Map 对象 if (upPattenUsageList != null) { for (OptimizeUpPattenUsage map : upPattenUsageList) { // 创建一个新的 OptimizeProject 对象 UpPattenUsage optimizeProject = new UpPattenUsage(); // 将 Map 中的每个键值对映射到 OptimizeProject 对象的相应字段上 optimizeProject.setEngineeringId((String) map.getProjectNo()); optimizeProject.setFilmsId((String) map.getGlassType()); optimizeProject.setWidth((Double) map.getWidth()); optimizeProject.setHeight((Double) map.getHeight()); optimizeProject.setThickness((Double)map.getHeight()); optimizeProject.setLayoutSequence((Integer) map.getHeatLayoutSort()); optimizeProject.setState(0); // 将映射后的对象添加到结果列表中 resultList.add(optimizeProject); } } log.info("查询出上片顺序集合保存到实体类{}",resultList); return resultList; } @Override public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) { this.saveBatch(upPattenUsage); //保存原片使用详情表 } //@Override public void selectSaveGlassinfo(String engineeringId) { //保存玻璃信息表 //optimizeProjectMapper.selectJoinList(); }
@@ -20,6 +20,7 @@ //开始/暂停任务 @Override public boolean changeTask(String projectId, Integer state) { //使用projectId作为条件修改state字段 LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper()); wrapper.set(Engineering::getState,state); wrapper.eq(Engineering::getEngineerId,projectId); hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
@@ -18,7 +18,7 @@ //判断优先吸片位置后发送出片任务 public UpWorkSequence selectPriority(); UpWorkSequence selectPriority(); //查询正在进行的工程
@@ -2,12 +2,16 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.uppattenusage.entity.UpPattenUsage; import com.mes.uppattenusage.mapper.UpPattenUsageMapper; import com.mes.workstation.entity.UpWorkSequence; import com.mes.workstation.entity.UpWorkstation; import com.mes.workstation.mapper.UpWorkstationMapper; import com.mes.workstation.service.UpWorkstationService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; /** * <p> @@ -19,8 +23,10 @@ */ @Service @Slf4j public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService { public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService { @Resource UpPattenUsageMapper upPattenUsageMapper; public static final String DB_100_10 = "DB_100_10"; //判断是否可以吸片进行任务 @@ -33,12 +39,17 @@ //判断优先吸片位置后发送出片任务 public UpWorkSequence selectPriority() { UpWorkSequence upwork= this.baseMapper.selectPriority(1); String start = "吸片信号";//plcmes.getPlcParameter("吸片信号").getValue(); if(upwork!=null&&start.equals("1")){ String start = "1";//plcmes.getPlcParameter("吸片信号").getValue(); UpPattenUsage uplist=new UpPattenUsage(); if(start.equals("1")){ //发送出片任务 //plcmes.getPlcParameter("出片信号").setValue("1"); UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("state",1).last("LIMIT 1"); uplist= upPattenUsageMapper.selectOne(updateWrapper); log.info("查询出本次出片的玻璃信息[]",uplist); } return upwork; } hangzhoumesParent/moduleService/LoadGlassModule/src/test/java/com/mes/LoadGlassModuleApplicationTest.java
@@ -2,6 +2,7 @@ import com.mes.pp.mapper.OptimizeProjectMapper; import com.mes.uppattenusage.entity.OptimizeUpPattenUsage; import com.mes.uppattenusage.entity.UpPattenUsage; import com.mes.uppattenusage.service.impl.UpPattenUsageServiceImpl; import lombok.extern.slf4j.Slf4j; import org.junit.Test; @@ -44,7 +45,7 @@ @Test public void testFindPa() { List<Map> glass = upPattenUsageService.saveUpPattenUsage("P24032204"); List<UpPattenUsage> glass = upPattenUsageService.selectSaveUpPattenUsage("P24032204"); log.info("完整路径：{}", Arrays.asList(glass)); } } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -4,45 +4,47 @@ import com.mes.temperingglass.service.TemperingOverService; import com.mes.temperingglass.service.TemperingService; 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; import org.springframework.web.bind.annotation.*; import java.util.List; /** * @author SNG-010 */ @RestController @RequestMapping("/temperingGlassInfo") @Slf4j // TidyUpGlassModule 钢化模块 public class TemperingGlassInfoController { @Autowired TemperingService temperingService; @Autowired private TemperingOverService temperingOverService; @PostMapping("/SelectWaitingGlass") // 查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中 @ResponseBody public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) { List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass(); System.out.println(glass); @ApiOperation("查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中") @GetMapping("/selectWaitingGlass") // 查询钢化等片中的版图信息,状态为1的为已到,状态为0的为等待中 public Result <List<TemperingGlassInfo>> selectWaitingGlass() { List<TemperingGlassInfo> glass = temperingService.selectWaitingGlass(); log.info("等待中的玻璃信息{}",glass); return Result.build(200, "", glass); } @GetMapping("/SelectIntoGlass") // 查询进炉中的钢化等片中的版图信息,状态全为1的为已到。 @ResponseBody public Result SelectIntoGlass(String ProcessId) { @ApiOperation("查询进炉中的钢化等片中的版图信息,状态全为1的为已到。") @GetMapping("/selectIntoGlass") // 查询进炉中的钢化等片中的版图信息,状态全为1的为已到。 public Result <List<TemperingGlassInfo>> selectIntoGlass() { List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass(); System.out.println(glass); log.info("进炉中的玻璃版图信息{}",glass); return Result.build(200, "", glass); } @GetMapping("/SelectOutGlass") //钢化后显示出炉的版图信息 @ResponseBody public Result SelectOutGlass(String ProcessId) { @ApiOperation("//钢化后显示出炉的版图信息。") @GetMapping("/selectOutGlass") //钢化后显示出炉的版图信息 public Result <List<TemperingGlassInfo>> selectOutGlass() { List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass(); System.out.println(glass); log.info("钢化出炉后的玻璃信息{}",glass); return Result.build(200, "", glass); }
@@ -50,7 +50,7 @@ } //显示等待中的版图 public List<TemperingGlassInfo> SelectWaitingGlass() { public List<TemperingGlassInfo> selectWaitingGlass() { List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass(); return WaitingGlass; }
