From 564f7dd6b7a750e518a159a795df6148376e08e0 Mon Sep 17 00:00:00 2001 From: wuyouming666 <2265557248@qq.com> Date: 星期一, 22 四月 2024 16:47:02 +0800 Subject: [PATCH] 将逻辑移动到实现类 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java | 90 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java index 0c44dac..d43d1e2 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java @@ -3,12 +3,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mes.downglassinfo.entity.DownGlassInfo; import com.mes.downglassinfo.entity.DownGlassTask; +import com.mes.downglassinfo.service.DownGlassInfoService; +import com.mes.downglassinfo.service.DownGlassTaskService; import com.mes.downworkstation.entity.DownWorkstation; import com.mes.downworkstation.entity.DownWorkstationTask; import com.mes.downworkstation.mapper.DownWorkstationMapper; import com.mes.downworkstation.mapper.DownWorkstationTaskMapper; import com.mes.downworkstation.service.DownWorkstationService; +import com.mes.downworkstation.service.DownWorkstationTaskService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,9 +25,17 @@ @Autowired private DownWorkstationMapper downWorkstationMapper; + @Autowired private DownWorkstationTaskMapper downWorkstationTaskMapper; + @Autowired + private DownGlassInfoService downGlassInfoService; + @Autowired + private DownGlassTaskService downGlassTaskService; - + @Autowired + private DownWorkstationService downWorkstationService; + @Autowired + private DownWorkstationTaskService downWorkstationTaskService; // @Override // public List<DownWorkstation> gettwoDownWorkstations() { @@ -126,4 +138,80 @@ + + @Override + public void insertdownglassinfo() { + + + + List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState(); +// + + + if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) { + +// + + for (DownGlassTask downGlassInfo : taskdownGlassInf) { + // 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬� + DownGlassInfo newdownGlassInfo = new DownGlassInfo(); + + newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId()); + Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId()); + // 鍒濆鍖栭『搴忓瓧娈靛�� + int sequence = maxSequence != null ? maxSequence + 1 : 1; + + newdownGlassInfo.setWidth(downGlassInfo.getWidth()); + newdownGlassInfo.setHeight(downGlassInfo.getHeight()); + newdownGlassInfo.setThickness(downGlassInfo.getThickness()); + newdownGlassInfo.setFilmsid(downGlassInfo.getFilmsid()); + // 璁剧疆椤哄簭瀛楁鍊� + newdownGlassInfo.setSequence(sequence); + + // 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃 + downGlassInfoService.insertDownGlassInfo(newdownGlassInfo); + //鎻掑叆鏁版嵁鍒版満姊版墜浠诲姟琛� + + downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo); + //鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0 + downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId()); + + sequence++; // 閫掑椤哄簭瀛楁鍊� + + + } + } + + + + + try { + //鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲� + List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate(); + if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) { + //锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰� + for (DownWorkstation downWorkstation : taskdownWorkstation) { + //鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲� + downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1); + //鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0 + downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId()); + + //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰� + downGlassTaskService.deleteTask(downWorkstation.getId()); + + } + } + } catch (Exception e) { + // 鎵撳嵃寮傚父淇℃伅 + e.printStackTrace(); + // 鎴栬�呭彲浠ヨ繘琛屽叾浠栧紓甯稿鐞嗭紝姣斿璁板綍鏃ュ織鎴栬�呰繑鍥炵壒瀹氱殑閿欒淇℃伅 + } + } + + + + + + + } -- Gitblit v1.8.0