From 094d33f2d84e42472bf83ebfdecc3acadeff68b1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 六月 2024 17:01:17 +0800
Subject: [PATCH] 添加破损表三层架构
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 320 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 218 insertions(+), 102 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 63c5dbb..02228b4 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
@@ -2,31 +2,36 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.BigStorageDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
-import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.common.S7object;
import com.mes.common.config.Const;
import com.mes.device.PlcParameterObject;
+import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
@@ -64,99 +69,138 @@
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
+// @Scheduled(fixedDelay = 5000)
+// public void plcStorageCageTask() throws InterruptedException {
+//
+// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+// try {
+//
+// String plcFeedGlassid = "";
+// String plcFeedReqLine = "0";
+// if ("1".equals(plcParameterObject.getPlcParameter("D01Request").getValue())) {
+// plcFeedReqLine = "1";
+// plcFeedGlassid = plcParameterObject.getPlcParameter("D01ID1").getValue();
+// }
+// if ("1".equals(plcParameterObject.getPlcParameter("D04Request").getValue())) {
+// plcFeedReqLine = "2";
+// plcFeedGlassid = plcParameterObject.getPlcParameter("D04ID1").getValue();
+// }
+// line1Time += 1;
+// line2Time += 1;
+//
+// if (!("0".equals(plcFeedReqLine))) {
+// log.info("1銆丳lc杩涚墖璇锋眰鏃�");
+// BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+// GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
+// log.info("2銆佹牴鎹幓鐠僫d鑾峰彇鐜荤拑淇℃伅" + glassInfo);
+// if (bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine) >= 0) {
+// BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
+// if (slotInfo != null) {
+// int taskType = edgGlassTaskInfoService.judgeTasktype(plcFeedReqLine);
+// log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�" + taskType);
+// bigStorageCageFeedTaskService.addFeedTask(slotInfo, Integer.parseInt(plcFeedReqLine), taskType);
+// log.info("4銆佹坊鍔犱换鍔″埌浠诲姟琛�");
+// bigStorageCageFullAlarm = false;
+// } else {
+// bigStorageCageFullAlarm = true;
+// }
+// } else {
+// log.info("褰撳墠鐜荤拑瀹藉害涓嶅涓婅溅" + glassInfo);
+// if (!("1".equals(plcFeedReqLine))) {
+// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
+// } else {
+// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
+// }
+// }
+// } else {
+// List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.querybigStorageCageFeedTask(1);
+// log.info("5銆佹煡璇换鍔¤〃鏄惁鏈夊凡缁忓畬鎴愮殑杩涚墖浠诲姟" + bigStorageCageFeedTaskList.size());
+// for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskList
+// ) {
+// BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
+// bigStorageCageDetails.setId(bigStorageCageFeedTask.getId());
+// bigStorageCageDetails.setState(1);
+// bigStorageCageDetailsService.updateById(bigStorageCageDetails);
+// log.info("6銆佷慨鏀圭悊鐗囩璇︽儏鐜荤拑鐘舵��");
+// bigStorageCageFeedTaskService.removeById(bigStorageCageFeedTask);
+// log.info("7銆佸垹闄ゅ凡缁忓畬鎴愮殑杩涚墖浠诲姟");
+// }
+// //鍚姩闃堝��
+// if (line1Time >= 300) {
+// if ("0".equals(plcParameterObject.getPlcParameter("D05Go").getValue())) {
+// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
+// }
+// }
+// if (line2Time >= 300) {
+// if ("0".equals(plcParameterObject.getPlcParameter("D02Go").getValue())) {
+// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
+// }
+// }
+// }
+//
+// //鏌ヨ鍑虹墖琛ㄦ槸鍚︽湁浠诲姟鏈畬鎴愮殑浠诲姟
+// List<BigStorageCageOutTask> bigStorageCageOutTask = bigStorageCageOutTaskService.querybigStorageCageOutTask(0);
+// if (bigStorageCageOutTask.size() == 0) {
+// boolean result = bigStorageCageService.outGlass();
+// log.info("8銆佹病鏈夋湭瀹屾垚浠诲姟鏃惰皟鐢ㄥ嚭鐗囨帴鍙�");
+// if (result == false) {
+// temperingGlassInfoService.schedulingTask();
+// }
+// }
+// bigStorageCageOutTaskService.updateOutTask();
+// log.info("9銆佹牴鎹换鍔¤〃鐘舵�佷慨鏀归挗鍖栧皬鐗囪〃浠诲姟鐘舵��");
+//
+// //鏉ヤ笉鍙婇�佹椂鐩存帴璧�
+// String line = Integer.toString(edgGlassTaskInfoService.startTask());
+//
+// if (!(line.equals(plcFeedReqLine))) {
+// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
+// } else {
+// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
+// }
+//
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
@Scheduled(fixedDelay = 5000)
- public void plcStorageCageTask() throws InterruptedException {
-
+ public void plcToHomeEdgScan() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
- try {
-
- String plcFeedGlassid = "";
- String plcFeedReqLine = "0";
- if ("1".equals(plcParameterObject.getPlcParameter("D01Request").getValue())) {
- plcFeedReqLine = "1";
- plcFeedGlassid = plcParameterObject.getPlcParameter("D01ID1").getValue();
- }
- if ("1".equals(plcParameterObject.getPlcParameter("D04Request").getValue())) {
- plcFeedReqLine = "2";
- plcFeedGlassid = plcParameterObject.getPlcParameter("D04ID1").getValue();
- }
- line1Time += 1;
- line2Time += 1;
-
- if (!("0".equals(plcFeedReqLine))) {
- log.info("1銆丳lc杩涚墖璇锋眰鏃�");
- BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
- GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
- log.info("2銆佹牴鎹幓鐠僫d鑾峰彇鐜荤拑淇℃伅" + glassInfo);
- if (bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine) >= 0) {
- BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
- if (slotInfo != null) {
- int taskType = edgGlassTaskInfoService.judgeTasktype(plcFeedReqLine);
- log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�" + taskType);
- bigStorageCageFeedTaskService.addFeedTask(slotInfo, Integer.parseInt(plcFeedReqLine), taskType);
- log.info("4銆佹坊鍔犱换鍔″埌浠诲姟琛�");
- bigStorageCageFullAlarm = false;
- } else {
- bigStorageCageFullAlarm = true;
- }
- } else {
- log.info("褰撳墠鐜荤拑瀹藉害涓嶅涓婅溅" + glassInfo);
- if (!("1".equals(plcFeedReqLine))) {
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
- } else {
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
- }
- }
- } else {
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.querybigStorageCageFeedTask(1);
- log.info("5銆佹煡璇换鍔¤〃鏄惁鏈夊凡缁忓畬鎴愮殑杩涚墖浠诲姟" + bigStorageCageFeedTaskList.size());
- for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskList
- ) {
- BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
- bigStorageCageDetails.setId(bigStorageCageFeedTask.getId());
- bigStorageCageDetails.setState(1);
- bigStorageCageDetailsService.updateById(bigStorageCageDetails);
- log.info("6銆佷慨鏀圭悊鐗囩璇︽儏鐜荤拑鐘舵��");
- bigStorageCageFeedTaskService.removeById(bigStorageCageFeedTask);
- log.info("7銆佸垹闄ゅ凡缁忓畬鎴愮殑杩涚墖浠诲姟");
- }
- //鍚姩闃堝��
- if (line1Time >= 300) {
- if ("0".equals(plcParameterObject.getPlcParameter("D05Go").getValue())) {
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
- }
- }
- if (line2Time >= 300) {
- if ("0".equals(plcParameterObject.getPlcParameter("D02Go").getValue())) {
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
- }
- }
- }
-
- //鏌ヨ鍑虹墖琛ㄦ槸鍚︽湁浠诲姟鏈畬鎴愮殑浠诲姟
- List<BigStorageCageOutTask> bigStorageCageOutTask = bigStorageCageOutTaskService.querybigStorageCageOutTask(0);
- if (bigStorageCageOutTask.size() == 0) {
- boolean result = bigStorageCageService.outGlass();
- log.info("8銆佹病鏈夋湭瀹屾垚浠诲姟鏃惰皟鐢ㄥ嚭鐗囨帴鍙�");
- if (result == false) {
- temperingGlassInfoService.schedulingTask();
- }
- }
- bigStorageCageOutTaskService.updateOutTask();
- log.info("9銆佹牴鎹换鍔¤〃鐘舵�佷慨鏀归挗鍖栧皬鐗囪〃浠诲姟鐘舵��");
-
- //鏉ヤ笉鍙婇�佹椂鐩存帴璧�
- String line = Integer.toString(edgGlassTaskInfoService.startTask());
-
- if (!(line.equals(plcFeedReqLine))) {
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
- } else {
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
- }
-
-
- } catch (Exception e) {
- e.printStackTrace();
+ String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue();
+ String d01ID1 = plcParameterObject.getPlcParameter("D01ID1").getValue();
+ String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue();
+ String d04ID1 = plcParameterObject.getPlcParameter("D04ID1").getValue();
+ log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧d01涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};鑾峰彇鍒扮殑璇锋眰瀛梔04涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};",
+ d01Request, d01ID1, d04Request, d04ID1);
+ if (!"1".equals(d01Request) && !"1".equals(d04Request)) {
+ log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
+ return;
+ }
+ // 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
+ String d02GoAdress = plcParameterObject.getPlcParameter("D02Go").getAddress();
+ // 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
+ String d05GoAdress = plcParameterObject.getPlcParameter("D05Go").getAddress();
+ Boolean flag01 = Boolean.FALSE;
+ Boolean flag04 = Boolean.FALSE;
+ //鎸夌収绾胯矾鍙婄幓鐠僫d鑾峰彇鐩搁偦涓ゅ潡鐜荤拑 鍗ц浆绔嬩笂鐨勭幓鐠�
+ if ("1".equals(d01Request)) {
+ flag01 = judgeGlassTypeStatus(d01ID1, Const.A09_OUT_TARGET_POSITION);
+ }
+ if ("1".equals(d04Request)) {
+ flag04 = judgeGlassTypeStatus(d04ID1, Const.A10_OUT_TARGET_POSITION);
+ }
+ if (flag01 && flag04) {
+ //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
+ Integer startLine = getStartLine();
+ //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+ computeTargetByLine(startLine, d02GoAdress, d05GoAdress);
+ } else if (flag01 || flag04) {
+ Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+ computeTargetByLine(startLine, d02GoAdress, d05GoAdress);
+ } else {
+ log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
}
}
@@ -170,7 +214,6 @@
}
String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue();
String d01ID1 = plcParameterObject.getPlcParameter("D01ID1").getValue();
-// 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue();
String d04ID1 = plcParameterObject.getPlcParameter("D04ID1").getValue();
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧d01涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};鑾峰彇鍒扮殑璇锋眰瀛梔04涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};",
@@ -215,15 +258,75 @@
computeTargetByLine(outLine, d02GoAdress, d05GoAdress);
}
+ @Scheduled(fixedDelay = 5000)
+ public void plcToHomeEdgOutTask() {
+
+ }
+
+
+ /**
+ * 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
+ */
+ public Boolean judgeGlassTypeStatus(String glassId, Integer line) {
+ //1銆佽幏鍙栦换鍔¤〃涓浉閭荤幓鐠�
+ List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .eq(EdgGlassTaskInfo::getLine, line)
+ .apply("time >= (select time from edg_glass_task_info where glass_id = '" + glassId + "')")
+ .orderByAsc(EdgGlassTaskInfo::getTime));
+ Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "璇嗗埆鐜荤拑淇℃伅鏈嚭鐜板湪灏哄琛ㄤ腑,鑾峰彇鐩搁偦涓ゅ潡鐜荤拑澶辫触");
+ //2銆佽幏鍙栧崸杞珛鍓╀綑瀹藉害
+ Map<String, Object> map = bigStorageCageFeedTaskService.getMap(new QueryWrapper<BigStorageCageFeedTask>()
+ .select("cast(5000 - sum(width + 20) as INT)as remainWidth")
+ .eq("line", line).eq("task_state", Const.BIG_STORAGE_IN_UP));
+ Integer remainWidth = null == map ? 5000 : Integer.parseInt(map.get("remainWidth") + "");
+ //2銆佽幏鍙栧崸杞珛
+ Integer widthFirst = edgGlassTaskInfoList.get(0).getWidth();
+ if (edgGlassTaskInfoList.size() == 1) {
+ if (remainWidth >= widthFirst) {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
+ return Boolean.FALSE;
+ } else {
+ //璁板綍鏃犳硶鏀句笅鐜荤拑锛屽悗缁垽鏂惎鍔�
+ return Boolean.TRUE;
+ }
+ }
+ Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth();
+ if (remainWidth >= widthFirst) {
+ if (remainWidth - widthFirst - Const.BIG_STORAGE_GAP >= widthSecond) {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthSecond);
+ } else {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthSecond);
+ }
+ return Boolean.FALSE;
+
+ } else {
+ return Boolean.TRUE;
+ }
+ }
+
+ /**
+ * 娣诲姞浠诲姟淇℃伅
+ */
+ private Boolean addFeedTask(String glassId, Integer line, Integer taskType, Integer width) {
+ BigStorageCageFeedTask bigStorageCageFeedTask = new BigStorageCageFeedTask();
+ bigStorageCageFeedTask.setGlassId(glassId);
+ bigStorageCageFeedTask.setTaskState(Const.BIG_STORAGE_REQUEST_IN);
+ bigStorageCageFeedTask.setLine(line);
+ bigStorageCageFeedTask.setTaskType(taskType);
+ bigStorageCageFeedTask.setWidth(width);
+ bigStorageCageFeedTask.setCreateTime(new Date());
+ return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
+ }
+
/**
* 鑾峰彇闇�瑕佸惎鍔ㄧ殑绾胯矾锛氫袱鏉＄嚎閮藉彲鍚姩 鑾峰彇绗竴鐗囩幓鐠冪増鍥緄d鏈�灏� 鐗堝簭鏈�澶х殑绾胯矾
*
* @return
*/
- private Integer getStartLine() {
+ public Integer getStartLine() {
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
.inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2 group by line"));
- Assert.isTrue(CollectionUtils.isEmpty(taskList), "鍗ц浆绔嬩袱鏉＄嚎閮芥病鏈夌幓鐠冭繘鐗囦换鍔�");
+ Assert.isFalse(CollectionUtils.isEmpty(taskList), "鍗ц浆绔嬩袱鏉＄嚎閮芥病鏈夌幓鐠冭繘鐗囦换鍔�");
Map<String, Integer> taskMap = taskList.stream().collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId,
BigStorageCageFeedTask::getLine));
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
@@ -237,7 +340,7 @@
/**
* 璁＄畻浠诲姟琛ㄨ繘鐗囩嚎璺殑鐩爣鏍煎瓙锛屽苟鍚姩浠诲姟
*/
- private boolean computeTargetByLine(Integer line, String d02GoAdress, String d05GoAdress) {
+ public boolean computeTargetByLine(Integer line, String d02GoAdress, String d05GoAdress) {
//1銆佽幏鍙栦换鍔¤〃涓殑鎵�鏈夌幓鐠冿紙鎸囧畾绾胯矾涓斿凡缁忚繘鍗ц浆绔嬪畬鎴愶級
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, line)
@@ -250,9 +353,13 @@
AtomicReference<Integer> temperingFeedSequenceTemp = new AtomicReference<>(0);
AtomicReference<BigStorageDTO> bigStorageDTO = new AtomicReference<>(new BigStorageDTO());
Map<String, GlassInfo> glassInfoMap = glassInfos.stream().collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
+ List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
+ AtomicBoolean taskFlag = new AtomicBoolean(Boolean.TRUE);
taskList.stream().forEach(e -> {
+ BigStorageCageDetails cageDetails = new BigStorageCageDetails();
//鎸夌収鐗堝浘淇℃伅鑾峰彇杩涚墖绗煎瓙鏍煎瓙鍙�
GlassInfo info = glassInfoMap.get(e.getGlassId());
+ BeanUtils.copyProperties(info, cageDetails);
if (temperingLayoutIdTemp.equals(info.getTemperingLayoutId())
&& temperingFeedSequenceTemp.equals(info.getTemperingFeedSequence() + 1)
&& info.getWidth() <= bigStorageDTO.get().getWidth()) {
@@ -260,16 +367,25 @@
} else {
bigStorageDTO.set(bigStorageCageDetailsService.queryTargetSlotByTempering(info));
}
- e.setTragetSlot(bigStorageDTO.get().getSlot());
+ e.setTargetSlot(bigStorageDTO.get().getSlot());
+ cageDetails.setSlot(bigStorageDTO.get().getSlot());
+ cageDetails.setState(Const.GLASS_STATE_IN);
temperingLayoutIdTemp.set(info.getTemperingLayoutId());
temperingFeedSequenceTemp.set(info.getTemperingFeedSequence());
+ bigStorageCageDetailsList.add(cageDetails);
+ taskFlag.set(bigStorageCageFeedTaskService.updateById(e));
+ if (!taskFlag.get()) {
+ return;
+ }
});
- //3銆佹洿鏂拌繘鐗囦换鍔¤〃
- boolean taskFlag = bigStorageCageFeedTaskService.updateBatchById(taskList);
- if (taskFlag) {
+ //3銆佹洿鏂拌繘鐗囦换鍔¤〃 閬囧埌闂锛氭棤娉曟壒閲忔洿鏂帮紝鎵归噺鏇存柊鏃犳硶璧版寚瀹氫粠搴�
+
+ //4銆佸湪璇︽儏琛ㄤ腑鍔犲叆杩涚墖鐜荤拑淇℃伅
+ bigStorageCageDetailsService.saveBatch(bigStorageCageDetailsList);
+ if (taskFlag.get()) {
String lineAddress = line.equals(Const.A09_OUT_TARGET_POSITION) ? d02GoAdress : d05GoAdress;
- S7object.getinstance().plccontrol.writeWord(lineAddress, (short) 1);
+// S7object.getinstance().plccontrol.writeWord(lineAddress, (short) 1);
}
- return taskFlag;
+ return taskFlag.get();
}
}
\ No newline at end of file
--
Gitblit v1.8.0