hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/LoadGlassModuleApplication.java
@@ -19,12 +19,6 @@ @MapperScan(basePackages = "com.mes.*.mapper") public class LoadGlassModuleApplication { public static void main(String[] args) { try { SpringApplication.run(LoadGlassModuleApplication.class, args); } catch (Exception e) { log.error(e.getMessage()); } SpringApplication.run(LoadGlassModuleApplication.class, args); } } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/LoadGlassController.java
File was deleted hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/controller/UpWorkstationController.java
File was deleted hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/LoadGlassMapper.java
File was deleted hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/mapper/UpWorkstationMapper.java
File was deleted hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/LoadGlassService.java
File was deleted hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/UpWorkstationService.java
File was deleted hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/service/impl/UpWorkstationServiceImpl.java
File was deleted hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
New file @@ -0,0 +1,56 @@ package com.mes.workstation.controller; import com.mes.workstation.entity.UpWorkstation; import com.mes.workstation.service.UpWorkstationService; import com.mes.utils.Result; 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; /** * <p> * 前端控制器 * </p> * * @author zhoush * @since 2024-04-07 */ @RestController @RequestMapping("/LoadGlass") @Slf4j public class UpWorkstationController { @Autowired private UpWorkstationService upWorkstationService; @ApiOperation("显示工位上的玻璃信息") @GetMapping("/list") //查询现在上片机的玻璃信息 public Result<List<UpWorkstation>> list() { List<UpWorkstation> glass = upWorkstationService.list(); log.info("显示工位上的玻璃信息:{}", glass); return Result.build(200, "", glass); } @PostMapping("/updateGlassMessage") //修改一条工位信息,接收实例类字段为宽高厚膜系数量工位id @ResponseBody public void updateGlassMessage(@RequestBody UpWorkstation upwork) { upWorkstationService.updateGlassMessage(upwork); } //todo: 和updateGlassMessage类似 // @PostMapping("/deleteGlass") //修改一条工位的玻璃信息，传输工位id将玻璃信息相关字段更改为null // @ResponseBody // public void selectCutTerritory(int upworkid) { // loadGlassService.deleteGlass(upworkid); // } @PostMapping("/selectPriority") //开始上片任务 @ResponseBody public void selectPriority() { upWorkstationService.selectPriority(); } }
File was renamed from hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/upworkstation/entity/UpWorkstation.java @@ -1,4 +1,4 @@ package com.mes.upworkstation.entity; package com.mes.workstation.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/LoadGlassMapper.java
New file @@ -0,0 +1,16 @@ package com.mes.workstation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.Map; import org.apache.ibatis.annotations.*; import com.mes.workstation.entity.UpWorkstation; @Mapper public interface LoadGlassMapper extends BaseMapper<UpWorkstation> { //判断优先工位吸片 @Select("select b.layout_sequence,a.number from up_workstation a left join up_patten_usage b " + "on a.pattern_width=b.width and a.pattern_heigth=b.width " + "and a.pattern_thickness=b.thickness where a.workstation_id=#{id}") Map<String,Object> selectPriority(int id); } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/mapper/UpWorkstationMapper.java
New file @@ -0,0 +1,21 @@ package com.mes.workstation.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.workstation.entity.UpWorkSequence; import com.mes.workstation.entity.UpWorkstation; import io.lettuce.core.dynamic.annotation.Param; import java.util.List; /** * <p> * Mapper 接口 * </p> * * @author zhoush * @since 2024-04-07 */ public interface UpWorkstationMapper extends BaseMapper<UpWorkstation> { List<UpWorkSequence> selectPriority(@Param("id") int id); } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/UpWorkstationService.java
New file @@ -0,0 +1,30 @@ package com.mes.workstation.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.workstation.entity.UpWorkstation; /** * <p> * 服务类 * </p> * * @author zhoush * @since 2024-04-07 */ public interface UpWorkstationService extends IService<UpWorkstation> { //PlcParameterObject plcmes=PLCAutoMes.PlcMesObject; //删除人工搬走的玻璃信息 // public void deleteGlass(int id); //判断是否可以吸片进行任务 //判断优先吸片位置后发送出片任务 public void selectPriority() ; /** * 增加人工输入的工位玻璃信息 * @param upwork */ void updateGlassMessage(UpWorkstation upwork); } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
New file @@ -0,0 +1,68 @@ package com.mes.workstation.service.impl; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.common.S7object; 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 org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author zhoush * @since 2024-04-07 */ @Service public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService { public static final String DB_100_10 = "DB_100_10"; //判断是否可以吸片进行任务 public boolean isCanLoadGlass() { String loadstart="吸片信号";//plcmes.getPlcParameter("吸片信号").getValue(); return "1".equals(loadstart); } //判断优先吸片位置后发送出片任务 public void selectPriority() { //todo:判断是否可以吸片进行任务 // String loadstart="吸片信号";//plcmes.getPlcParameter("吸片信号").getValue(); // if (!"1".equals(loadstart)) { // return; // } UpWorkSequence loadid1 = this.baseMapper.selectPriority(1).get(0); UpWorkSequence loadid2 = this.baseMapper.selectPriority(2).get(0); //判断一二号工位哪边的顺序更先 if(loadid1.getSequence()>loadid2.getSequence()) { S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2); }else if(loadid1.getSequence()==loadid2.getSequence()){ //当两个工位上的玻璃数相同时，判断哪个工位上的玻璃数更少,优先清空一个架子 int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue()); int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("玻璃数").getValue()); if(glassnum1>glassnum2){ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2); }else{ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1); } }else{ S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1); } } /** * 增加人工输入的工位玻璃信息/删除人工搬走的玻璃信息 * @param upwork */ @Override public void updateGlassMessage(UpWorkstation upwork) { UpdateWrapper<UpWorkstation> updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("workstation_id", upwork.getWorkstationId()); int update = this.baseMapper.update(upwork, updateWrapper); } }
