UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -59,11 +59,16 @@ } }; //确认 const handleConfirm = async () => { try { const firstPart = flowCardId.value.split('|')[0].trim(); // const twoPart = flowCardId.value.split('|')[1].trim(); // const response = await request.post('unLoadGlass/downWorkStation/updateFlowCardId', { workstationId: workstationId.value, flowCardId: flowCardId.value flowCardId: firstPart, layer:twoPart }); console.log(response) hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -29,8 +29,7 @@ * A09出片目标位置 d02卧转立 钢化出片 3001 * A10出片目标位置 d05卧转立 人工出片 3002 */ //todo:临时将钢化出片线路改为人工出片 public static final Integer TEMPERING_OUT_TARGET_POSITION = 3002; public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001; public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002; /** hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -121,8 +121,7 @@ List<Map<String, Object>> result = glassInfos.stream() .map(glassInfo -> { Map<String, Object> map = new HashMap<>(); map.put("flow_card_id", glassInfo.getFlowCardId()); map.put("Layer", glassInfo.getLayer()); map.put("flow_card_id", glassInfo.getFlowCardId()+" | "+glassInfo.getLayer()); // 如果还有其他字段需要添加到 map 中，在这里继续添加 return map; }) hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -318,14 +318,13 @@ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE)); if (CollectionUtils.isNotEmpty(inDamageTaskInfoList)) { bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE)); //todo:将破损信息新增入破损表 for (BigStorageCageFeedTask bigStorageCageFeedTask:inDamageTaskInfoList ) { //将破损信息新增入破损表 for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) { Damage damage=new Damage(); damage.setGlassId(bigStorageCageFeedTask.getGlassId()); damage.setLine(bigStorageCageFeedTask.getLine()); damage.setWorkingProcedure("冷加工"); damage.setRemark(""); damage.setRemark("进笼前卧转立"); damage.setStatus(2); damageService.insertDamage(damage); } @@ -337,14 +336,13 @@ bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE)); List<String> glassIdList = outDamageTaskInfoList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList()); temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList)); //todo:将破损信息新增入破损表 for (BigStorageCageOutTask bigStorageCageOutTask:outDamageTaskInfoList ) { //将破损信息新增入破损表 for (BigStorageCageOutTask bigStorageCageOutTask : outDamageTaskInfoList) { Damage damage=new Damage(); damage.setGlassId(bigStorageCageOutTask.getGlassId()); damage.setLine(bigStorageCageOutTask.getEndSlot()); damage.setWorkingProcedure("冷加工"); damage.setRemark(""); damage.setRemark("出片后卧转立"); damage.setStatus(2); damageService.insertDamage(damage); } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -2,6 +2,7 @@ import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.entity.request.DownWorkRequest; import com.mes.downworkstation.service.DownWorkstationService; import com.mes.glassinfo.service.GlassInfoService; import io.swagger.annotations.Api; @@ -74,21 +75,13 @@ } //绑定架子 @ApiOperation("绑定架子") @PostMapping("/updateFlowCardId") public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) { // 从 requestData 中获取传入的 flowCardId String flowCardId = (String) requestData.get("flowCardId"); int workstationId = (int) requestData.get("workstationId"); int layer = (int) requestData.get("layer"); public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody DownWorkRequest request) { // 查询对应 flowCardId 的玻璃信息总数量 int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer); int artificialnumber=0; // 更新 down_workstation 表中的总数量 downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId,artificialnumber); // 绑定架子 downWorkstationService.updateFlowCardIdAndCount(request.getFlowCardId(), request.getWorkstationId(), request.getLayer()); // 构建响应数据 Map<String, Object> responseData = new HashMap<>(); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstation.java
@@ -1,7 +1,6 @@ package com.mes.downworkstation.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; @@ -62,14 +61,16 @@ /** * 总数量 */ @TableField("total_quantity") private Integer totalquantity; private Integer totalQuantity; /** * 落架数量 */ @TableField("racks_number") private Integer Racksnumber; private Integer racksNumber; /** * 人工下片数量 */ private Integer artificialNumber; } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java
@@ -1,7 +1,6 @@ package com.mes.downworkstation.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; @@ -17,8 +16,7 @@ @Data @EqualsAndHashCode(callSuper = false) public class DownWorkstionAndDownGlassinfo { public class DownWorkstionAndDownGlassinfo { /** * 下片工位表id */ @@ -51,14 +49,9 @@ private Integer workState; @TableField("total_quantity") private Integer totalquantity; private Integer totalQuantity; @TableField("racks_number") private Integer Racksnumber; private Integer racksNumber; /** * 顺序 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/request/DownWorkRequest.java
New file @@ -0,0 +1,28 @@ package com.mes.downworkstation.entity.request; import lombok.Data; /** * @Author : zhoush * @Date: 2024/7/10 14:10 * @Description: */ @Data public class DownWorkRequest { /** * 流程卡号 */ private String flowCardId; /** * 工位id */ private int workstationId; /** * 层数 */ private int layer; } hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
@@ -49,11 +49,11 @@ /** * @param flowCardId * @param glassInfoCount * * @param workstationId * @return 更新架子和数量 */ int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId,int artificialnumber); int updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer);
@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.query.MPJQueryWrapper; import com.mes.damage.entity.Damage; import com.mes.damage.service.DamageService; import com.mes.downglassinfo.entity.DownGlassInfo; import com.mes.downglassinfo.entity.DownGlassTask; import com.mes.downglassinfo.mapper.DownGlassInfoMapper; import com.mes.downglassinfo.service.DownGlassInfoService; import com.mes.downglassinfo.service.DownGlassTaskService; @@ -16,6 +17,7 @@ import com.mes.downworkstation.mapper.DownWorkstationTaskMapper; import com.mes.downworkstation.service.DownWorkstationService; import com.mes.downworkstation.service.DownWorkstationTaskService; import com.mes.glassinfo.service.GlassInfoService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,7 +42,10 @@ private DownGlassInfoMapper downGlassInfoMapper; @Autowired private DownGlassTaskService downGlassTaskService; @Autowired private GlassInfoService glassInfoService; @Autowired private DamageService damageservice; @Autowired private DownWorkstationTaskService downWorkstationTaskService; @@ -53,10 +58,10 @@ @Override public int getTotalQuantity(int workstationId) { DownWorkstation result = baseMapper.selectOne(new QueryWrapper<DownWorkstation>().lambda() .select(DownWorkstation::getTotalquantity) .select(DownWorkstation::getTotalQuantity) .eq(DownWorkstation::getWorkstationId, workstationId)); return result != null ? result.getTotalquantity() : 0; return result != null ? result.getTotalQuantity() : 0; } @@ -111,7 +116,7 @@ .eq("workstation_id", workstationId); DownWorkstation result = baseMapper.selectOne(queryWrapper); return result != null ? result.getRacksnumber() : 0; return result != null ? result.getRacksNumber() : 0; } //根据条件获取工位玻璃信息 @@ -136,10 +141,17 @@ @Override public int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId,int artificialnumber) { public int updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer) { int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId,layer); QueryWrapper<Damage> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("process_id", flowCardId); queryWrapper.eq("technology_number", layer); int artificialnumber=damageservice.count(queryWrapper); UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>(); updateWrapper.set("total_quantity", glassInfoCount) .set("flow_card_id", flowCardId) .set("layer", layer) .set("artificial_number", artificialnumber) .eq("workstation_id", workstationId);
@@ -65,7 +65,7 @@ .eq(DownWorkstation::getEnableState, 1)); if (!downWorkstations.stream().anyMatch(workstation -> workstation.getFlowCardId().equals(flowCardId))) { downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, downWorkstation.getWorkstationId(),0); downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, downWorkstation.getWorkstationId()); } @@ -286,7 +286,7 @@ downGlassInfoService.insertDownGlassInfo(newdownGlassInfo); log.info("插入数据到下片玻璃信息表"); DownWorkstation downWorkstation1 = downWorkstationService.selectByFlowCardId(downGlassInfo.getFlowCardId()); downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksnumber() + 1); downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksNumber() + 1); log.info("更新落架数量"); // LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(DownGlassTask::getGlassId, newdownGlassInfo.getGlassId()); hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -480,8 +480,14 @@ return Boolean.FALSE; } //更新落架玻璃数量 if (endCell == 7) { downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId()) .eq("layer", downStorageCageDetails.getLayer()).setSql("artificial_number = artificial_number +1")); } else { downWorkstationService.update(new UpdateWrapper<DownWorkstation>().eq("flow_card_id", downStorageCageDetails.getFlowCardId()) .eq("layer", downStorageCageDetails.getLayer()).setSql("racks_number = racks_number +1")); } //生成任务信息 DownGlassInfo downGlassInfo = new DownGlassInfo(); BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo); hangzhoumesParent/moduleService/UnLoadGlassModule/src/test/java/mes/UnloadGlassModuleApplicationTest.java
@@ -98,7 +98,7 @@ @Test public void testupdateFlowCardIdAndCount() { log.info("绑定流程卡号和数量"); downWorkstationServiceImpl.updateFlowCardIdAndCount("1", 1, 1,0); downWorkstationServiceImpl.updateFlowCardIdAndCount("NG24060401A020", 1, 2); }
