hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -75,6 +75,11 @@ if (!"0".equals(workingProcedure)) { damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure); } List<Damage> damageList = baseMapper.selectList(damageSelectWrapper); for (Damage damage : damageList) { damage.setStatus(2); } return baseMapper.selectList(damageSelectWrapper); } @@ -181,7 +186,7 @@ damage.setLine(deviceId); damage.setType(type); damage.setRemark(remark); damage.setStatus(1); damage.setStatus(0); this.insertDamage(damage); } @@ -211,7 +216,7 @@ glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId()); GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper); BeanUtils.copyProperties(glassInfo, damage); damage.setStatus(1); LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>(); workAssignmentSelectWrapper .eq(WorkAssignment::getLine, damage.getLine()) @@ -312,6 +317,8 @@ log.info("报工数据reportingWork：{}，reportingWorkDetails：{}", reportingWork, reportingWorkDetails); try { // 目标系统的API URL String url1 = ERP_URL + "/reportingWork/mesReportingWork"; String url2 = ERP_URL + "/reportingWork/mesSaveReportingWorkWorn"; String url; @@ -322,6 +329,7 @@ } URL obj = new URL(url); HttpURLConnection con = (HttpURLConnection) obj.openConnection(); // 设置请求方法和请求头 con.setRequestMethod("POST"); con.setRequestProperty("Content-Type", "application/json; utf-8"); @@ -330,7 +338,9 @@ // 创建 JSON 对象 JSONObject result = new JSONObject(); ObjectMapper objectMapper = new ObjectMapper(); // 将 ReportingWork 转换为 JSONObject // 将 ReportingWorkDetail 列表转换为 JSONArray @@ -354,7 +364,7 @@ result.put("qualityInsStatus", 0); // 将 result 对象转换为字符串 String jsonInputString = result.toString(); log.info("jsonInputString :{} ", result); System.out.println("jsonInputString : " + result); // 发送请求 try (OutputStream os = con.getOutputStream()) { byte[] input = jsonInputString.getBytes("utf-8"); @@ -363,7 +373,7 @@ // 获取响应码 int responseCode = con.getResponseCode(); log.info("Response Code :{} ", responseCode); System.out.println("Response Code : " + responseCode); // 获取响应内容 try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))) { hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -1,7 +1,6 @@ package com.mes.glassinfo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; @@ -163,11 +162,6 @@ * 除膜方式 */ private Integer filmRemove; /** * 状态 */ @TableField(exist = false) private Integer status; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/LoadGlassInfo.java
New file @@ -0,0 +1,171 @@ package com.mes.glassinfo.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** * <p> * * </p> * * @author wu * @since 2024-04-29 */ @Data @EqualsAndHashCode(callSuper = false) public class LoadGlassInfo implements Serializable { private static final long serialVersionUID = 1L; /** * 玻璃信息表id */ // @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 流程卡 */ private String flowCardId; /** * 流程卡玻璃类型 */ private Integer glassType; /** * 宽 */ private double width; /** * 高 */ private double height; /** * 厚度 */ private double thickness; /** * 膜系 */ private String filmsid; /** * 层数 */ private int layer; /** * 总层数 */ private int totalLayer; /** * 磨前宽 */ private double edgWidth; /** * 磨前高 */ private double edgHeight; /** * 是否配片 */ private Integer ismultiple; /** * 配片最大宽 */ private double maxWidth; /** * 配片最大高 */ private double maxHeight; /** * 钢化是否接受横放 */ private Integer ishorizontal; /** * 原片顺序 */ private Integer patternSequence; /** * x坐标 */ private Integer xAxis; /** * y坐标 */ private Integer yAxis; /** * 钢化版图id */ private Integer temperingLayoutId; /** * 钢化版图片序 */ private Integer temperingFeedSequence; /** * x坐标 */ private Integer xCoordinate; /** * y坐标 */ private Integer yCoordinate; /** * 旋转角度（逆时针） */ private double angle; /** * 工程号 */ private String engineerId; /** * 生产规则id */ private Integer ruleId; /** * 玻璃ID */ private String glassId; /** * 是否合并 */ private Integer combine; /** * 打标属性 */ private String markIcon; /** * 除膜方式 */ private Integer filmRemove; /** * 状态 */ @TableField(exist = false) private Integer state; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -2,6 +2,7 @@ import com.github.yulichang.base.MPJBaseService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.entity.LoadGlassInfo; import com.mes.temperingglass.entity.TemperingGlassInfo; import java.util.List; @@ -58,5 +59,5 @@ GlassInfo selectTempering(GlassInfo glassInfo); List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo); List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo); } hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -6,6 +6,7 @@ import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.entity.LoadGlassInfo; import com.mes.glassinfo.mapper.GlassInfoMapper; import com.mes.temperingglass.entity.TemperingGlassInfo; import com.mes.temperingglass.mapper.TemperingGlassInfoMapper; @@ -151,10 +152,10 @@ } @Override public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) { List<GlassInfo> glassInfos = null; glassInfos = glassInfoMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>() .select("IFNULL(b.status, 0) AS status,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id") 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" + "ON t.glass_id = b.glass_id") .eq("engineer_id", glassInfo.getEngineerId()) hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -3,6 +3,7 @@ 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.entity.TemperingGlassInfo; import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.utils.Result; @@ -70,8 +71,8 @@ @ApiOperation("//查询当前工程号的钢化版图") @PostMapping("/selectTemperingGlass") //查询当前工程号所有的炉号 public Result<List<GlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) { List<GlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo); public Result<List<LoadGlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) { List<LoadGlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo); return Result.build(200, "查询成功", glass); }
