hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -186,7 +186,6 @@ damage.setLine(deviceId); damage.setType(type); damage.setRemark(remark); damage.setStatus(0); this.insertDamage(damage); } @@ -233,12 +232,10 @@ if (damage.getType() == null) { damage.setType(1); } if (damage.getType() == 1) { if (submitReport(damage)) { damage.setStatus(3); } else { damage.setStatus(1); } if (damage.getType() == 1 && submitReport(damage)) { damage.setStatus(3); } else { damage.setStatus(1); } baseMapper.insert(damage); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -155,8 +155,8 @@ public List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo) { List<LoadGlassInfo> glassInfos = null; glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>() .select("IFNULL(b.status, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id") .leftJoin("(SELECT glass_id, MAX(status) AS status FROM damage GROUP BY glass_id) b\n" + .select("IFNULL(b.state, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id") .leftJoin("(SELECT glass_id, MAX(type) AS state FROM damage GROUP BY glass_id) b\n" + "ON t.glass_id = b.glass_id") .eq("engineer_id", glassInfo.getEngineerId()) .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())); hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,9 +1,9 @@ package com.mes.temperingglass.controller; import com.mes.damage.entity.Damage; import com.mes.damage.service.DamageService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.entity.LoadGlassInfo; import com.mes.temperingglass.eneity.request.DamageRequest; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.utils.Result; @@ -50,16 +50,20 @@ @ApiOperation("//钢化破损拿走放回") @PostMapping("/updateTemperingState") //钢化后显示出炉的版图信息 public Result <Integer> updateTemperingState(@RequestBody Damage damage) { public Result<List<LoadGlassInfo>> updateTemperingState(@RequestBody DamageRequest damage) { TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo(); temperingGlassInfo.setState(damage.getStatus()); temperingGlassInfo.setState(damage.getState()); temperingGlassInfo.setGlassId(damage.getGlassId()); int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo); if (damage.getStatus() > 5) { if (damage.getState() > 5) { damageService.autoSubmitReport(damage.getGlassId(), damage.getLine() , damage.getWorkingProcedure(), "钢化炉", damage.getStatus()); , damage.getWorkingProcedure(), "钢化炉", damage.getState()); } return Result.build(200, "破损成功", result); GlassInfo glassInfo = new GlassInfo(); glassInfo.setEngineerId(damage.getEngineerId()); glassInfo.setTemperingLayoutId(damage.getTemperingLayoutId()); List<LoadGlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo); return Result.build(200, "破损成功", glass); } @ApiOperation("//查询当前工程号所有的炉号") hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/eneity/request/DamageRequest.java
New file @@ -0,0 +1,42 @@ package com.mes.temperingglass.eneity.request; import lombok.Data; /** * @Author : zhoush * @Date: 2025/2/27 14:53 * @Description: */ @Data public class DamageRequest { /** * 线路 */ private Integer line; /** * 工序 */ private String workingProcedure; /** * 玻璃id */ private String glassId; /** * 状态：8破损 9拿走 */ private Integer state; /** * 工程号 */ private String engineerId; /** * 钢化版图id */ private Integer temperingLayoutId; }
