From 82b08fcc9c9daaf0381c3f871e45ae8f89c3e07c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 15:11:29 +0800
Subject: [PATCH] 磨边前大理片：移除无用代码，新增方法注释
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 8a6ecba..dfc2719 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -20,6 +20,8 @@
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.common.S7object;
import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
import com.mes.device.PlcParameterObject;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
@@ -60,6 +62,8 @@
private EdgGlassTaskInfoService edgGlassTaskInfoService;
@Resource
private TemperingGlassInfoService temperingGlassInfoService;
+ @Resource
+ private DamageService damageService;
private static final String REQUEST_WORD = "1";
@@ -314,7 +318,16 @@
.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) {
+ Damage damage = new Damage();
+ damage.setGlassId(bigStorageCageFeedTask.getGlassId());
+ damage.setLine(bigStorageCageFeedTask.getLine());
+ damage.setWorkingProcedure("鍐峰姞宸�");
+ damage.setRemark("杩涚鍓嶅崸杞珛");
+ damage.setStatus(2);
+ damageService.insertDamage(damage);
+ }
}
//鑾峰彇鍑虹墖浠诲姟琛ㄤ腑鐘舵�佷负鐮存崯鐨勬暟鎹�
List<BigStorageCageOutTask> outDamageTaskInfoList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()
@@ -323,7 +336,16 @@
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) {
+ Damage damage = new Damage();
+ damage.setGlassId(bigStorageCageOutTask.getGlassId());
+ damage.setLine(bigStorageCageOutTask.getEndSlot());
+ damage.setWorkingProcedure("鍐峰姞宸�");
+ damage.setRemark("鍑虹墖鍚庡崸杞珛");
+ damage.setStatus(2);
+ damageService.insertDamage(damage);
+ }
}
Date endDate = new Date();
log.info("澶х悊鐗囩鐮存崯鐜荤拑娓呴櫎浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
@@ -355,27 +377,29 @@
Boolean flag = Boolean.TRUE;
//2銆佽幏鍙栧崸杞珛
Integer widthFirst = Math.max(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
+ Integer heightFirst = Math.min(edgGlassTaskInfoList.get(0).getWidth() / 10, edgGlassTaskInfoList.get(0).getHeight() / 10);
if (edgGlassTaskInfoList.size() == 1) {
if (remainWidth >= widthFirst) {
if (glassCount < inCarMaxSize) {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
} else {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
}
} else {
flag = Boolean.FALSE;
}
} else {
Integer widthSecond = Math.max(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
+ Integer heightSecond = Math.min(edgGlassTaskInfoList.get(1).getWidth() / 10, edgGlassTaskInfoList.get(1).getHeight() / 10);
if (remainWidth >= widthFirst) {
if (remainWidth - widthFirst - glassGap >= widthSecond) {
if (glassCount < inCarMaxSize) {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightSecond);
} else {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
}
} else {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
}
} else {
flag = Boolean.FALSE;
@@ -392,13 +416,14 @@
/**
* 娣诲姞浠诲姟淇℃伅
*/
- private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width) {
+ private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width, Integer height) {
BigStorageCageFeedTask bigStorageCageFeedTask = new BigStorageCageFeedTask();
bigStorageCageFeedTask.setGlassId(glassId);
bigStorageCageFeedTask.setTaskState(Const.BIG_STORAGE_IN_NEW);
bigStorageCageFeedTask.setLine(line);
bigStorageCageFeedTask.setTaskType(taskType);
bigStorageCageFeedTask.setWidth(width);
+ bigStorageCageFeedTask.setHeight(height);
bigStorageCageFeedTask.setCreateTime(new Date());
return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
}
@@ -554,6 +579,9 @@
public Boolean computeIsRun(int line, String glassId) {
//鑾峰彇鍗ц浆绔嬪墿浣欏搴�
BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
+ if (sitToUpRemainWidth.getGlassCount() == 0) {
+ return Boolean.FALSE;
+ }
//鑾峰彇鐜荤拑淇℃伅
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
return sitToUpRemainWidth.getWidth() < glassInfo.getWidth();
--
Gitblit v1.8.0