hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -30,7 +30,7 @@ * A09出片目标位置 d02卧转立 钢化出片 3001 * A10出片目标位置 d05卧转立 人工出片 3002 */ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001; public static final Integer TEMPERING_OUT_TARGET_POSITION = 3002; public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002; /** hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -36,8 +36,7 @@ QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>(); glassinfo.eq("engineer_id", glass.getEngineerId()) .eq("tempering_layout_id", glass.getTemperingLayoutId()); //return temperingMapper.selectList(glassinfo); return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId()); return temperingMapper.selectList(glassinfo); }else { return null; } @@ -46,13 +45,11 @@ @Override public List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo) { //获取进炉中的玻璃信息 // QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); // wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId()) // .eq("engineer_id", temperingGlassInfo.getEngineerId()) // .orderByAsc("tempering_layout_id","tempering_feed_sequence"); // return temperingMapper.selectList(wrapper); return temperingMapper.selectByEngineerIdAndLayoutId(temperingGlassInfo.getEngineerId(),temperingGlassInfo.getTemperingLayoutId()); QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId()) .eq("engineer_id", temperingGlassInfo.getEngineerId()) .orderByAsc("tempering_layout_id","tempering_feed_sequence"); return temperingMapper.selectList(wrapper); } @Override @@ -63,7 +60,11 @@ TemperingGlassInfo glass=temperingMapper.selectOne(wrap); //根据工程号和版图获取数据 if(glass != null) { return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId()); QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>(); wapper.eq("engineer_id", glass.getEngineerId()) .eq("tempering_layout_id", glass.getTemperingLayoutId()) .orderByAsc("tempering_layout_id", "tempering_feed_sequence"); return temperingMapper.selectList(wapper); } return null; } @@ -79,8 +80,11 @@ if (glassinfo == null) { return null; // 直接返回null,表示没有找到符合条件的记录 } return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(),glassinfo.getTemperingLayoutId()); QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>(); wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId()) .eq("engineer_id",glassinfo.getEngineerId()); return temperingMapper.selectList(wrapper); } @Override @@ -102,7 +106,11 @@ @Override public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) { if (temperingMapper.updateTemperingGlassInfo(temperingGlassInfo) > 0) { UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>(); wrapper.eq("glass_id",temperingGlassInfo.getGlassId()) .lt("state",6) .set("state", temperingGlassInfo.getState());; if (temperingMapper.update(null,wrapper) > 0) { return 200; }else { return 100; hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/EdgGlassInfoRequest.java
New file @@ -0,0 +1,40 @@ package com.mes.edgglasstask.entity.request; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; /** * @Author : zhoush * @Date: 2024/8/7 16:16 * @Description: */ @Data public class EdgGlassInfoRequest { /** * 磨边线 2001 2002 */ private List<Integer> cellList; /** * 状态 0 待处理 1 处理中 2 处理完成 */ private List<Integer> stateList; /** * 开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date beginDate; /** * 结束时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; } hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/entity/request/IdentWornRequest.java
New file @@ -0,0 +1,28 @@ package com.mes.edgglasstask.entity.request; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** * @Author : zhoush * @Date: 2024/8/10 13:34 * @Description: */ @Data public class IdentWornRequest { @NotBlank(message = "玻璃ID不能为空") private String glassId; @NotNull(message = "状态不能为空") private int state; @NotNull(message = "线路不能为空") private int line; @NotBlank(message = "工序不能为空") private String workingProcedure; } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -66,7 +66,27 @@ if (outGlass != null) { jsonObject.append("overGlass", overGlass); } //当前钢化工程的拿走数据 LambdaQueryWrapper<TemperingGlassInfo> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.select(TemperingGlassInfo::getEngineerId) .lt(TemperingGlassInfo::getState, Const.TEMPERING_END) .groupBy(TemperingGlassInfo::getEngineerId); List<String> engineerIds = temperingAgoService.list(queryWrapper) .stream() .map(TemperingGlassInfo::getEngineerId) .distinct() .collect(Collectors.toList()); List<Damage> temperingTakeGlassInfos = damageService.list( new LambdaQueryWrapper<Damage>() .in(Damage::getEngineerId, engineerIds) .eq(Damage::getType, Const.GLASS_STATE_TAKE) .orderByAsc(Damage::getId) ); jsonObject.append("temperingTakeGlassInfos", temperingTakeGlassInfos); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass"); if (sendwServer != null) { @@ -86,6 +106,8 @@ //正在进行的任务 List<TemperingGlassInfo> temperingTaskType = temperingAgoService.selectTaskType(); jsonObject.append("temperingTaskType", temperingTaskType); ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun"); if (sendwServer != null) { for (WebSocketServer webserver : sendwServer) { hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -48,12 +48,10 @@ return Result.build(200, "", glass); } @ApiOperation("//钢化破损拿走放回") @ApiOperation("//钢化破损") @PostMapping("/updateTemperingState") //钢化后显示出炉的版图信息 public Result <Integer> updateTemperingState(@RequestBody Damage damage) { if(damage.getStatus()>5) { damageService.insertDamage(damage); } TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo(); temperingGlassInfo.setState(damage.getStatus()); temperingGlassInfo.setGlassId(damage.getGlassId()); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java
New file @@ -0,0 +1,48 @@ package com.mes.downglassinfo.entity.request; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * <p> * * </p> * * @author zhoush * @since 2024-03-27 */ @Data @EqualsAndHashCode(callSuper = false) public class DownGlassInfoRequest implements Serializable { /** * 工位id */ private Integer workStationId; /** * 工程id */ private String engineerId; /** * 开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") private Date beginDate; /** * 结束时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassInfoServiceImpl.java
@@ -1,24 +1,39 @@ package com.mes.downglassinfo.service.impl; import cn.smallbun.screw.core.util.CollectionUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.common.config.Const; import com.mes.common.utils.RedisUtil; import com.mes.downglassinfo.entity.DownGlassInfo; import com.mes.downglassinfo.entity.request.DownGlassInfoRequest; import com.mes.downglassinfo.mapper.DownGlassInfoMapper; import com.mes.downglassinfo.service.DownGlassInfoService; import com.mes.downstorage.entity.DownStorageCageDetails; import com.mes.downstorage.service.DownStorageCageDetailsService; import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.entity.dto.DownGlassInfoDTO; import com.mes.downworkstation.service.DownWorkstationService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.job.DownLoadCacheGlassTask; import com.mes.pp.service.FlowCardService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @Slf4j @Service public class DownGlassInfoServiceImpl extends ServiceImpl<DownGlassInfoMapper, DownGlassInfo> implements DownGlassInfoService { @@ -27,6 +42,16 @@ @Autowired DownStorageCageDetailsService downStorageCageDetailsService; @Autowired DownWorkstationService downWorkstationService; @Autowired RedisUtil redisUtil; @Autowired FlowCardService flowCardService; /** * 根据流程卡号查询最大序号 @@ -60,8 +85,15 @@ } @Override public List<DownGlassInfoDTO> queryWorkStationIsIn(Boolean isDownload) { return baseMapper.queryWorkStationIsIn(isDownload); public List<DownGlassInfoDTO> queryWorkStationIsIn(List<Integer> workList, Boolean isDownload) { //按照要求获取已落架/未落架的玻璃信息 return baseMapper.queryWorkStationIsIn(workList, isDownload); } @Override public List<DownGlassInfoDTO> queryWorkStationFlowCard(List<Integer> workList) { //获取已绑定流程卡的架子未落玻璃的数据信息 return baseMapper.queryWorkStationFlowCard(workList); } @Override @@ -76,10 +108,179 @@ BeanUtils.copyProperties(details, downGlassInfo); //获取当前流程卡最大片序 downGlassInfo.setSequence(this.getMaxSequenceByFlowCardId(details.getFlowCardId(), details.getLayer()) + 1); downGlassInfo.setWorkStationId(Const.G13_WORK_STATION); this.save(downGlassInfo); //生成任务信息 并向plc发送出片任务 GlassInfo glassInfo = new GlassInfo(); BeanUtils.copyProperties(details, glassInfo); return downLoadCacheGlassTask.initDownGlassTask(glassInfo, details.getSlot(), Const.G13_WORK_STATION, 2); } @Override public String setDownGlassInfoRequest(DownGlassInfoRequest request) { if (request == null) { redisUtil.deleteObject("downGlassRequest"); } else { redisUtil.setCacheObject("downGlassRequest", request); } return "success"; } @Override public List<DownWorkstation> queryWorkStationIsFull() { //查询可以落架的玻璃信息且已绑定流程卡的工位信息 List<DownWorkstation> list = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getEnableState, Const.SLOT_ON) .isNotNull(DownWorkstation::getFlowCardId).ne(DownWorkstation::getFlowCardId, "")); List<DownWorkstation> workstationFull = new ArrayList<>(); if (CollectionUtils.isNotEmpty(list)) { //都有玻璃的工位信息(包括绑定流程卡) List<Integer> workstationList = list.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList()); //按照符合条件的工位获取未落架的流程卡玻璃,如果返回为空,则表明所有都已落架完成 List<DownGlassInfoDTO> downGlassInfoDTOList = queryWorkStationIsIn(workstationList, Boolean.FALSE); //获取工位上的未满的流程卡及层数 List<String> flowCardIdList = downGlassInfoDTOList.stream().map(item -> item.getFlowCardId() + ":" + item.getLayer()).collect(Collectors.toList()); //可以落架的玻璃信息且已绑定流程卡的所有的工位 - 玻璃未满流程卡及层数的工位 = 已满工位 workstationFull = list.stream().filter(item -> !flowCardIdList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList()); //是否需要将已满的工位置为不可落架 if (CollectionUtils.isNotEmpty(workstationFull)) { List<Integer> workstationIds = workstationFull.stream().map(DownWorkstation::getWorkstationId).collect(Collectors.toList()); downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getEnableState, Const.SLOT_OFF) .in(DownWorkstation::getWorkstationId, workstationIds)); } } return workstationFull; } @Override public List<Map<String, List<Map<String, Object>>>> downGlassPrint(DownGlassInfo downGlassInfo) { log.info("打印参数:{}", downGlassInfo); QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query(); queryWrapper.eq("flow_card_id", downGlassInfo.getFlowCardId()) .eq("layer", downGlassInfo.getLayer()) .select("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "COUNT(*) AS quantity") .groupBy("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "id") .orderByAsc("id"); List<Map<String, Object>> resultList = baseMapper.selectMaps(queryWrapper); log.info("MES落架数据:{}", resultList); List<Map<String, Object>> projectInfo = flowCardService.selectProject(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer()); log.info("流程卡头部数据:{}", projectInfo); List<Map<String, Object>> flowCardInfo = flowCardService.selectFlowCard(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer()); log.info("流程卡玻璃数据:{}", flowCardInfo); for (Map<String, Object> row : flowCardInfo) { int order_number = (int) row.get("order_number"); int technology_number = (int) row.get("technology_number"); int quantity1 = 0; for (Map<String, Object> row1 : resultList) { int glass_type = (int) row1.get("glass_type"); int layer = (int) row1.get("layer"); // String child_width = (String) row1.get("child_width"); // Long quantity = (Long) row1.get("quantity"); // BigDecimal total_area = (BigDecimal) row1.get("total_area"); // String separation = (String) row1.get("separation"); // String perimeter = (String) row1.get("perimeter"); // BigDecimal width = (BigDecimal) row1.get("width"); // String other_columns = (String) row1.get("other_columns"); // String remarks = (String) row1.get("remarks"); // BigDecimal height = (BigDecimal) row1.get("height"); if (order_number == glass_type && technology_number == layer) { quantity1+=1; // row.put("quantity", quantity); // row.put("order_number", order_number); // row.put("technology_number", technology_number); // row.put("child_width", child_width); // row.put("total_area", total_area); // row.put("separation", separation); // row.put("perimeter", perimeter); // row.put("width", width); // row.put("other_columns", other_columns); // row.put("remarks", remarks); // row.put("height", height); } } row.put("quantity1", quantity1); } log.info("流程卡玻璃数据2:{}", flowCardInfo); List<Map<String, List<Map<String, Object>>>> listMap = new ArrayList<>(); Map<String, List<Map<String, Object>>> result = new HashMap<>(); result.put("detail", projectInfo); result.put("detailList", flowCardInfo); for (Map<String, Object> row : projectInfo) { String order_number = (String) row.get("process"); String[] processes = order_number.split("->"); List<Map<String, Object>> processList = new ArrayList<>(); for (int i = 0; i < processes.length; i++) { Map<String, Object> processMap = new JSONObject(); processMap.put("process", processes[i]); processMap.put("id", i); processList.add(processMap); } result.put("processList", processList); } listMap.add(result); return listMap; } @Override public List<Map<String, Object>> downGlassLabelPrint(DownGlassInfo downGlassInfo) { //获取下片玻璃的顺序 // QueryWrapper<DownGlassInfo> queryWrapper = Wrappers.query(); // queryWrapper // .eq("flow_card_id", downGlassInfo.getFlowCardId()) // .eq("layer", downGlassInfo.getLayer()) // .select("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "COUNT(*) AS quantity") // .groupBy("flow_card_id", "layer", "width", "height", "filmsid", "thickness", "glass_type", "id") // .orderByAsc("id"); // List<Map<String, Object>> resultList = baseMapper.selectMaps(queryWrapper); List<Map<String, Object>> resultList = baseMapper.downGlassLabelPrint(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer()); log.info("MES落架数据:{}", resultList); //获取ERP标签所需的信息 List<Map<String, Object>> labelInfo = flowCardService.selectLabel(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer()); log.info("标签数据:{}", labelInfo); for (Map<String, Object> row : resultList) { int glass_type = (int) row.get("glass_type"); int layer = (int) row.get("layer"); for (Map<String, Object> row1 : labelInfo) { int orderNumber = (int) row1.get("orderNumber"); int technologyNumber = (int) row1.get("technologyNumber"); if (orderNumber == glass_type && technologyNumber == layer) { String order_id = (String) row1.get("order_id"); String project = (String) row1.get("project"); Long customer_id = (Long) row1.get("customer_id"); BigDecimal width = (BigDecimal) row1.get("width"); BigDecimal height = (BigDecimal) row1.get("height"); Long quantity = (Long) row1.get("quantity"); String glass_child = (String) row1.get("glass_child"); String process = (String) row1.get("process"); String customer_name = (String) row1.get("customer_name"); String processing_note = (String) row1.get("processing_note"); String other_colunmns = (String) row1.get("other_colunmns"); String building_number = (String) row1.get("building_number"); String bend_radius = (String) row1.get("bend_radius"); row.put("orderNumber", orderNumber); row.put("technology_number", technologyNumber); row.put("order_id", order_id); row.put("project", project); row.put("customer_id", customer_id); row.put("width", width); row.put("height", height); row.put("quantity", quantity); row.put("glass_child", glass_child); row.put("process", process); row.put("customer_name", customer_name); row.put("processing_note", processing_note); row.put("other_colunmns", other_colunmns); row.put("building_number", building_number); row.put("bend_radius", bend_radius); } } } return resultList; } } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/entity/request/CacheWornRequest.java
New file @@ -0,0 +1,28 @@ package com.mes.downstorage.entity.request; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; /** * @Author : zhoush * @Date: 2024/8/10 13:34 * @Description: */ @Data public class CacheWornRequest { @NotBlank(message = "玻璃ID不能为空") private String glassId; @NotNull(message = "状态不能为空") private int state; @NotNull(message = "线路不能为空") private int line; @NotBlank(message = "工序不能为空") private String workingProcedure; } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -1,14 +1,18 @@ package com.mes.downstorage.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.mes.common.config.Const; import com.mes.damage.entity.Damage; import com.mes.damage.service.DamageService; import com.mes.downglassinfo.entity.DownGlassTask; import com.mes.downglassinfo.service.DownGlassTaskService; import com.mes.downstorage.entity.DownStorageCage; import com.mes.downstorage.entity.DownStorageCageDetails; import com.mes.downstorage.entity.request.CacheWornRequest; import com.mes.downstorage.mapper.DownStorageCageDetailsMapper; import com.mes.downstorage.mapper.DownStorageCageMapper; import com.mes.downstorage.service.DownStorageCageDetailsService; @@ -46,6 +50,8 @@ private DownStorageCageDetailsService downStorageCageDetailsService; @Autowired private DownStorageCageDetailsMapper downStorageCageDetailsMapper; @Autowired DamageService damageService; @Override public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType) { @@ -128,7 +134,6 @@ } @Override public List<Map<String, Object>> selectDownStorageCages() { return baseMapper.selectJoinMaps(JoinWrappers.lambda(DownStorageCage.class) @@ -190,7 +195,10 @@ if (downItem != null) { //移除 DownStorageCageDetails result = downStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<DownStorageCageDetails>().eq(DownStorageCageDetails::getSlot, downStorageCageId)); DownStorageCageDetails result = downStorageCageDetailsMapper .selectOne(new MPJLambdaWrapper<DownStorageCageDetails>() .eq(DownStorageCageDetails::getSlot, downStorageCageId) ); if (result != null) { result.setSlot(0); downStorageCageDetailsMapper.updateById(result); @@ -200,4 +208,19 @@ return true; } @Override public void deleteDownStorageCage(CacheWornRequest cacheWornRequest) { Damage damage = new Damage(); BeanUtils.copyProperties(cacheWornRequest, damage); damage.setType(cacheWornRequest.getState()); damage.setRemark(""); damage.setStatus(0); damageService.insertDamage(damage); downStorageCageDetailsService.update(new LambdaUpdateWrapper<DownStorageCageDetails>() .set(DownStorageCageDetails::getState, Const.GLASS_STATE_OUT) .eq(DownStorageCageDetails::getGlassId, cacheWornRequest.getGlassId()) .eq(DownStorageCageDetails::getState,Const.GLASS_STATE_IN)); } } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json