From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase，仅需要有脚本变动的时候开启在执行，避免启动报错 3、原片仓储新增入库请求、出库情况，调整整体逻辑，增加格子号架子号，任务表、详情表、工位表都需要记录架子信息，用于任务执行过程中，架子在执行过程中可返回架子对应的工位上，避免架子乱放后格子架子号不对应的情况发生。
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 617 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 356 insertions(+), 261 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
index 0bf747d..c02be86 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
@@ -10,7 +10,6 @@
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
-import com.mes.rawglassstation.entity.RawGlassStorageStation;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
@@ -23,10 +22,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -51,45 +47,253 @@
@Resource
private UpPattenUsageMapper upPattenUsageMapper;
- @Autowired
+ @Autowired(required = false)
private MiloService miloService;
- private static final List<String> LIFTING_STATION = Arrays.asList("4");
+ private static final List<Integer> LIFTING_STATION = Arrays.asList(4);
private static final List<String> LOAD_STATION_01 = Arrays.asList("101", "102");
private static final List<String> LOAD_STATION_02 = Arrays.asList("103", "104");
private static final List<Integer> LOAD_STATION_MAX = Arrays.asList(102, 104);
+
+ @Scheduled(fixedDelay = 1000)
+ public void rawStorageTask() throws Exception {
+ ReadWriteEntity requestWord = miloService.readFromOpcUa("storage-device.dev.Task Request");
+ ReadWriteEntity confireWord = miloService.readFromOpcUa("storage-device.dev.Task Confirmation Word");
+ ReadWriteEntity taskWord = miloService.readFromOpcUa("storage-device.dev.Task sending word");
+ String requestValue = requestWord.getValue() + "";
+ if ("0".equals(requestValue)) {
+ if ("1".equals(confireWord.getValue() + "")) {
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task Confirmation Word", 0));
+ miloService.writeToOpcWord(list);
+ }
+ if ("1".equals(taskWord.getValue() + "")) {
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 0));
+ list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 0));
+ list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", 0));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", 0));
+ miloService.writeToOpcWord(list);
+ }
+ return;
+ }
+ if (!"1".equals(requestValue)) {
+ log.info("鏃犺姹�");
+ return;
+ }
+ //鏄惁鏈夋鍦ㄦ墽琛岀殑浠诲姟
+ boolean flag = isHasRunningTask();
+ if (flag) {
+ log.info("鏈夋湭瀹屾垚鐨勪换鍔★紝缁撴潫");
+ return;
+ }
+ //todo:浼樺厛杩涗笂鐗囨満浣�
+ flag = rawGlassDispatchTask();
+ if (flag) {
+ log.info("鎵ц璋冨害浠诲姟锛岀粨鏉�");
+ return;
+ }
+ flag = outboundTask();
+ if (flag) {
+ log.info("鎵ц鍑哄簱浠诲姟锛岀粨鏉�");
+ return;
+ }
+ flag = warehouseTask();
+ if (flag) {
+ log.info("鎵ц鍏ュ簱浠诲姟");
+ return;
+ }
+ log.info("鏃犱换鍔℃墽琛岋紝缁撴潫");
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void rawStorageInCar() throws Exception {
+ ReadWriteEntity entity = miloService.readFromOpcUa("storage-device.dev.Loading rack");
+ String value = entity.getValue() + "";
+ if (!"1".equals(value)) {
+ log.info("澶ц溅蹇欑");
+ return;
+ }
+ //鏌ヨ浠诲姟
+ RawGlassStorageDetails one = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+ if (one == null) {
+ return;
+ }
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getId, one.getId())
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void rawStorageFinish() throws Exception {
+ ReadWriteEntity entity = miloService.readFromOpcUa("storage-device.dev.Task report letter");
+ String value = entity.getValue() + "";
+ if ("0".equals(value)) {
+ log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
+ return;
+ }
+ RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ if (null == details) {
+ log.info("鏃犳墽琛屼腑鐨勪换鍔�");
+ return;
+ }
+ RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
+ .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
+ RawGlassStorageDetails targetDetails = generateDetails(details, task.getEndSlot());
+ Integer taskType = task.getTaskType();
+ if ("1".equals(value)) {
+ switch (taskType) {
+ case 1:
+ log.info("杩涚墖浠诲姟");
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ //todo:鐢熸垚鍏ュ簱璇︽儏琛細鍏朵粬淇℃伅涓嶅彉锛�
+ rawGlassStorageDetailsService.save(targetDetails);
+ break;
+ case 2:
+ log.info("鍑虹墖浠诲姟");
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ targetDetails = new RawGlassStorageDetails();
+ targetDetails.setSlot(task.getEndSlot());
+ targetDetails.setShelf(task.getStartSlot());
+ targetDetails.setState(Const.RAW_GLASS_STATE_IN);
+ rawGlassStorageDetailsService.save(targetDetails);
+ break;
+ case 3:
+ log.info("璋冨害浠诲姟");
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ rawGlassStorageDetailsService.save(targetDetails);
+ break;
+ default:
+ break;
+ }
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
+ } else {
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ }
+
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task Confirmation Word", 1));
+ miloService.writeToOpcWord(list);
+ }
+
+ private boolean isHasRunningTask() {
+ RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
+ .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
+ return task == null ? Boolean.FALSE : Boolean.TRUE;
+ }
+
+ /**
+ * 鍘熺墖璋冨害锛�1銆佹煡璇㈠伐绋嬪師鐗囪〃锛屾寜鐓ч『搴忓皢鍘熺墖鏀惧叆涓婄墖1鍙蜂綅锛屽悗缁師鐗囨斁涓婄墖2鍙蜂綅锛屽嚭鐜板昂瀵告浛鎹紝鍒ゆ柇鍘熶笂鐗囦綅鏄惁鏈夌幓鐠冿紝鏈� 鍏堝嚭鍚庤繘锛屾棤 鐩存帴杩涚墖
+ */
+ public boolean rawGlassDispatchTask() throws Exception {
+ //鏌ヨ褰撳墠绯荤粺姝ｅ湪鎵ц鐨勮鍗�
+ List<Engineering> engineeringList = engineeringMapper.selectList(new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getState, Const.ENGINEERING_RUNNING).last("order by id"));
+ if (CollectionUtils.isEmpty(engineeringList)) {
+ log.info("娌℃湁姝ｅ湪鎵ц鐨勫伐绋�");
+ return false;
+ }
+ for (Engineering engineering : engineeringList) {
+ boolean flag = rawGlassDispatchByEngineering(engineering.getStationCell(), engineering.getEngineerId());
+ if (flag) {
+ return flag;
+ }
+ }
+ return Boolean.FALSE;
+
+
+ }
+
+ /**
+ * 鍑哄簱浠诲姟锛�1銆佺偣鍑哄簱锛岀珛椹敓鎴愬嚭鐗囦换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负寰呭嚭搴擄紝瀹氭椂浠诲姟鎵弿鐢熸垚鍑哄簱浠诲姟
+ */
+ public boolean outboundTask() throws Exception {
+ List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT));
+// .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
+ if (CollectionUtil.isEmpty(rawGlassList)) {
+ log.info("绯荤粺娌℃湁闇�瑕佸嚭搴撶殑鍘熺墖淇℃伅");
+ return Boolean.FALSE;
+ }
+ //鑾峰彇宸ヤ綅涓婃槸鍚︽湁鏋跺瓙锛�
+ List<RawGlassStorageDetails> emptyLeftingList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL)
+ .in(RawGlassStorageDetails::getSlot, 98, 99));
+ if (CollectionUtil.isNotEmpty(emptyLeftingList) && emptyLeftingList.size() >= 2) {
+ log.info("鍚婅浣嶅綋鍓嶉兘鏈夋灦瀛愶紝缁撴潫鍑虹墖浠诲姟");
+ return Boolean.FALSE;
+ }
+ //鑾峰彇闇�瑕佽惤鏋剁殑
+ //鐢熸垚鍑哄簱浠诲姟
+ rawGlassStorageDetailsService.generateTask(rawGlassList.get(0).getSlot(), 98, rawGlassList.get(0).getSlot(),
+ rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
+
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", rawGlassList.get(0).getSlot()));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", 98));
+ miloService.writeToOpcWord(list);
+
+ //淇敼鍑虹墖浠诲姟鐘舵��
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+ return Boolean.TRUE;
+ }
/**
* 鍏ュ簱浠诲姟锛氬悐瑁呬綅鏈夌幓鐠冿紝鍏堝幓宸ヤ綅琛ㄦ煡璇㈢┖鏍煎瓙锛岀敓鎴愬叆搴撲换鍔′粠鍚婅浣嶅埌鐩爣鏍煎瓙
*
* @throws Exception
*/
- @Scheduled(fixedDelay = 1000)
- public void warehouseTask() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValue() + "";
- if (!"1".equals(value)) {
- log.info("澶ц溅蹇欑");
- return;
- }
+ public boolean warehouseTask() throws Exception {
List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
.eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
- .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
+ .gt(RawGlassStorageDetails::getRemainQuantity, 0)
+ .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4")
+ .inSql(RawGlassStorageDetails::getShelf, "select slot from raw_glass_storage_station where enable_state = 1 "));
if (CollectionUtil.isEmpty(rawGlassList)) {
- log.info("鍚婅浣嶈绂佺敤鎴栨病鏈夌幓鐠�");
- return;
+ log.info("鍚婅浣嶈绂佺敤/鏋跺瓙鎵�鍦ㄥ伐浣嶈绂佺敤/鏃犲師鐗囦俊鎭�");
+ return Boolean.FALSE;
}
- //鏌ヨ宸ヤ綅淇℃伅鏄惁鏈�
- List<RawGlassStorageStation> stationList = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>().notInSql(RawGlassStorageStation::getSlot, "select slot from raw_glass_storage_details where " +
- "state in('100','102','103')")
- .eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON));
- if (CollectionUtil.isEmpty(stationList)) {
- log.info("娌℃湁绌虹殑宸ヤ綅");
- return;
- }
+ //鑾峰彇鍚婅浣嶆灦瀛愪俊鎭�
+// List<Integer> shelfList = rawGlassList.stream().map(RawGlassStorageDetails::getShelf).collect(Collectors.toList());
+// List<RawGlassStorageStation> stationList = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>().notInSql(RawGlassStorageStation::getSlot, "select slot from raw_glass_storage_details where " +
+// "state in('100','102','103')")
+// .eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON)
+// .in(RawGlassStorageStation::getDeviceId, Const.RAW_GLASS_DEVICE));
+// if (CollectionUtil.isEmpty(stationList)) {
+// log.info("娌℃湁绌虹殑宸ヤ綅");
+// return Boolean.FALSE;
+// }
//鐢熸垚杩涚浠诲姟
- generateTask(rawGlassList.get(0).getSlot(), stationList.get(0).getSlot(),
- rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_STATE_RUNNING);
+ RawGlassStorageDetails details = rawGlassList.get(0);
+ rawGlassStorageDetailsService.generateTask(details.getSlot(), details.getShelf(), details.getShelf(),
+ details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", details.getSlot()));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", details.getShelf()));
+ miloService.writeToOpcWord(list);
//鐢熸垚宸ヤ綅浠诲姟锛屽皢鍚婅浣嶇殑鐜荤拑鐘舵�佹敼浣嶈繘绗间腑
// 淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负103 鍑虹墖涓�
//淇敼鍑虹墖浠诲姟鐘舵��
@@ -97,267 +301,158 @@
.eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
.eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
-// RawGlassStorageDetails details = new RawGlassStorageDetails();
-// BeanUtils.copyProperties(rawGlassList.get(0), details);
+ return Boolean.TRUE;
}
-
- /**
- * 鍑哄簱浠诲姟锛�1銆佺偣鍑哄簱锛岀珛椹敓鎴愬嚭鐗囦换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负寰呭嚭搴擄紝瀹氭椂浠诲姟鎵弿鐢熸垚鍑哄簱浠诲姟
- */
- @Scheduled(fixedDelay = 1000)
- public void outboundTask() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValue() + "";
- if (!"2".equals(value)) {
- log.info("澶ц溅蹇欑");
- return;
- }
- List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT));
-// .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
- if (CollectionUtil.isEmpty(rawGlassList)) {
- log.info("绯荤粺娌℃湁闇�瑕佸嚭搴撶殑鍘熺墖淇℃伅");
- return;
- }
- List<Integer> emptyLeftingList = rawGlassStorageDetailsService.listBySlotState(LIFTING_STATION, Arrays.asList(Const.RAW_GLASS_STATE_IN, Const.RAW_GLASS_STATE_RUNNING));
- if (CollectionUtil.isEmpty(emptyLeftingList)) {
- log.info("鍚婅浣嶅綋鍓嶉兘鏈夊師鐗囷紝缁撴潫鍑虹墖浠诲姟");
- return;
- }
- //鐢熸垚鍑哄簱浠诲姟
- generateTask(rawGlassList.get(0).getSlot(), emptyLeftingList.get(0),
- rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
- //淇敼鍑虹墖浠诲姟鐘舵��
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- }
-
- /**
- * 鍘熺墖璋冨害锛�1銆佹煡璇㈠伐绋嬪師鐗囪〃锛屾寜鐓ч『搴忓皢鍘熺墖鏀惧叆涓婄墖1鍙蜂綅锛屽悗缁師鐗囨斁涓婄墖2鍙蜂綅锛屽嚭鐜板昂瀵告浛鎹紝鍒ゆ柇鍘熶笂鐗囦綅鏄惁鏈夌幓鐠冿紝鏈� 鍏堝嚭鍚庤繘锛屾棤 鐩存帴杩涚墖
- */
- @Scheduled(fixedDelay = 1000)
- public void rawGlassDispatchTask() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValue() + "";
- if (!"2".equals(value)) {
- log.info("澶ц溅蹇欑");
- return;
- }
- //鏌ヨ褰撳墠绯荤粺姝ｅ湪鎵ц鐨勮鍗�
- List<Engineering> engineeringList = engineeringMapper.selectList(new LambdaQueryWrapper<Engineering>()
- .eq(Engineering::getState, Const.ENGINEERING_RUNNING).last("order by id"));
- if (CollectionUtils.isEmpty(engineeringList)) {
- log.info("娌℃湁姝ｅ湪鎵ц鐨勫伐绋�");
- return;
- }
- //绾胯矾 + 宸ョ▼鍚�
- //todo:鎸夌収璺嚎鍙婂伐绋嬪彿锛岃繘琛屽嚭鐗囦换鍔�
- String stationCell = engineeringList.get(0).getStationCell();
- String enginneerId = engineeringList.get(0).getEngineerId();
-
+ private boolean rawGlassDispatchByEngineering(String stationCell, String enginneerId) throws Exception {
//褰撳墠灏哄闇�瑕佷笂鐗囩殑鏁伴噺
List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(enginneerId);
if (CollectionUtils.isEmpty(pattenUsageList)) {
log.info("姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囨棤鍙笂鐗囩殑鍘熺墖淇℃伅");
- return;
+ return Boolean.FALSE;
}
Map<String, List<UpPattenUsageVO>> upListMap = pattenUsageList.stream()
.collect(Collectors.groupingBy(UpPattenUsageVO::getGroupNumber));
- //todo:鎸夌収宸ョ▼鍙锋寜鐓у伐绋嬩笅鏈畬鎴愮殑灏哄鐨勯『搴忥紝褰�1鍙蜂笂鐗囦綅鏋跺瓙涓婄殑褰撳墠灏哄鐜荤拑灏戜簬3鐗囦笖2鍙蜂笂鐗囦綅鏃犲師鐗囩幓鐠冿紝鍒欏皢鍘昏皟搴︾幓鐠冨幓2鍙蜂笂鐗囦綅锛�
- //todo:褰撲竴鍙蜂笂鐗囦綅鏋跺瓙涓婄殑鐜荤拑浣嶇┖鎴栬�呭綋鍓嶅昂瀵哥敤瀹屾椂鏃讹紝灏�2鍙凤紙鏈夌幓鐠冿級涓婄墖浣嶈皟搴﹀埌1鍙蜂笂鐗囦綅
- //1銆佹煡璇�4涓笂鐗囩殑鍘熺墖璇︽儏
+ //1銆佹煡璇�2涓笂鐗囩殑鍘熺墖璇︽儏
List<RawGlassStorageDetails> rawGlassDetailsList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN).in(RawGlassStorageDetails::getSlot, LOAD_STATION_01));
+ .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN).in(RawGlassStorageDetails::getDeviceId, stationCell)
+ .orderByAsc(RawGlassStorageDetails::getSlot));
+ List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
+ UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
if (CollectionUtils.isEmpty(rawGlassDetailsList)) {
- //琛ㄧず1涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
+ //琛ㄧず1涓婄墖浣嶆病鏈夋灦瀛愶紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旇矾绾跨殑1鍙蜂笂鐗囦綅
RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
- .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
- .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
- .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
- .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
+ .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
+ .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
+ .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
+ .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+// .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
+ .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
+ .last("limit 1")
);
- generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟
- }
- Map<Integer, List<RawGlassStorageDetails>> listMap = rawGlassDetailsList.stream().collect(Collectors.groupingBy(RawGlassStorageDetails::getSlot));
- RawGlassStorageDetails rawGlass03Details = listMap.get(3).get(0);
- RawGlassStorageDetails rawGlass04Details = listMap.get(4).get(0);
-// RawGlassStorageDetails rawGlass05Details = listMap.get(5).get(0);
-// RawGlassStorageDetails rawGlass06Details = listMap.get(6).get(0);
- //todo:涓婄墖1鍙蜂綅2绉嶆竻绌烘柟寮忥細鏂瑰紡涓�锛氬師鐗囩敤瀹� 鏂瑰紡浜岋細褰撳墠灏哄鐢ㄥ畬
- if (null == rawGlass03Details) {
- if (null == rawGlass04Details) {
- //琛ㄧず1涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
- RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
- .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
- .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
- .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
- .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
- );
- generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟
- } else {
- //灏�2鍙蜂笂鐗囦綅鐨勫師鐗囨斁鍏�1鍙蜂笂鐗囦綅
- generateTask(2, 1, rawGlass04Details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟
- }
- } else {
- if (null == rawGlass04Details) {
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("2");
- if (CollectionUtils.isEmpty(upPattenUsage01VOS)) {
- return;
- }
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
- RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
- .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
- .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
- .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
- .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
- );
- generateTask(details.getSlot(), 2, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- }
- }
+ rawGlassStorageDetailsService.generateTask(details.getSlot(), rawGlassDetailsList.get(0).getSlot(), details.getSlot(), details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
-
- }
-
- private boolean queryDispatchTask(String stationCell, String enginneerId) {
- //todo:鎸夌収宸ョ▼鍙锋寜鐓у伐绋嬩笅鏈畬鎴愮殑灏哄鐨勯『搴忥紝褰�1鍙蜂笂鐗囦綅鏋跺瓙涓婄殑褰撳墠灏哄鐜荤拑灏戜簬3鐗囦笖2鍙蜂笂鐗囦綅鏃犲師鐗囩幓鐠冿紝鍒欏皢鍘昏皟搴︾幓鐠冨幓2鍙蜂笂鐗囦綅锛�
- //todo:褰撲竴鍙蜂笂鐗囦綅鏋跺瓙涓婄殑鐜荤拑浣嶇┖鎴栬�呭綋鍓嶅昂瀵哥敤瀹屾椂鏃讹紝灏�2鍙凤紙鏈夌幓鐠冿級涓婄墖浣嶈皟搴﹀埌1鍙蜂笂鐗囦綅
- //1銆佹煡璇笂鐗囩嚎璺搴斿伐浣嶇殑鍘熺墖淇℃伅
- LambdaQueryWrapper<RawGlassStorageDetails> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN);
- if ("1".equals(stationCell)) {
- wrapper.in(RawGlassStorageDetails::getSlot, LOAD_STATION_01);
- } else {
- wrapper.in(RawGlassStorageDetails::getSlot, LOAD_STATION_02);
- }
- List<RawGlassStorageDetails> rawGlassDetailsList = rawGlassStorageDetailsService.list(wrapper);
- if (CollectionUtils.isEmpty(rawGlassDetailsList)) {
- //鐩存帴鐢熸垚璋冨害浠诲姟
- generateTask(1, 2, 34, 4);
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", details.getSlot()));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", rawGlassDetailsList.get(0).getSlot()));
+ miloService.writeToOpcWord(list);
+ //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getShelf, details.getShelf()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
return Boolean.TRUE;
}
if (rawGlassDetailsList.size() == 2) {
- return Boolean.FALSE;
- }
- int maxStationSlot = rawGlassDetailsList.stream().mapToInt(RawGlassStorageDetails::getSlot).max().orElse(0);
- if (LOAD_STATION_MAX.contains(maxStationSlot)) {
- return Boolean.FALSE;
- }
- //浜屽彿涓婄墖锛氱洿鎺ョ敓鎴愯皟搴︿换鍔�
- generateTask(1, 2, 34, 4);
- return Boolean.TRUE;
-
-
- //褰撳墠灏哄闇�瑕佷笂鐗囩殑鏁伴噺
- List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(enginneerId);
- if (CollectionUtils.isEmpty(pattenUsageList)) {
- log.info("姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囨棤鍙笂鐗囩殑鍘熺墖淇℃伅");
- return Boolean.FALSE;
- }
- Map<String, List<UpPattenUsageVO>> upListMap = pattenUsageList.stream()
- .collect(Collectors.groupingBy(UpPattenUsageVO::getGroupNumber));
-
-
- if (CollectionUtils.isEmpty(rawGlassDetailsList)) {
- //琛ㄧず1涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
- RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
- .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
- .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
- .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
- .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
- );
- generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟
- }
- Map<Integer, List<RawGlassStorageDetails>> listMap = rawGlassDetailsList.stream().collect(Collectors.groupingBy(RawGlassStorageDetails::getSlot));
- RawGlassStorageDetails rawGlass03Details = listMap.get(3).get(0);
- RawGlassStorageDetails rawGlass04Details = listMap.get(4).get(0);
-// RawGlassStorageDetails rawGlass05Details = listMap.get(5).get(0);
-// RawGlassStorageDetails rawGlass06Details = listMap.get(6).get(0);
- //todo:涓婄墖1鍙蜂綅2绉嶆竻绌烘柟寮忥細鏂瑰紡涓�锛氬師鐗囩敤瀹� 鏂瑰紡浜岋細褰撳墠灏哄鐢ㄥ畬
- if (null == rawGlass03Details) {
- if (null == rawGlass04Details) {
- //琛ㄧず1涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
- RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
- .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
- .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
- .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
- .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
- );
- generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟
- } else {
- //灏�2鍙蜂笂鐗囦綅鐨勫師鐗囨斁鍏�1鍙蜂笂鐗囦綅
- generateTask(2, 1, rawGlass04Details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟
- }
- } else {
- if (null == rawGlass04Details) {
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("2");
- if (CollectionUtils.isEmpty(upPattenUsage01VOS)) {
- return;
+ RawGlassStorageDetails glassStorageDetails = rawGlassDetailsList.get(0);
+ if (usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
+ usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId())) {
+ if (glassStorageDetails.getRemainQuantity() == 0) {
+ //灏嗘灦瀛愭斁鍥炲師宸ヤ綅涓�
+ rawGlassStorageDetailsService.generateTask(glassStorageDetails.getSlot(), glassStorageDetails.getShelf(), glassStorageDetails.getShelf(), glassStorageDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", glassStorageDetails.getSlot()));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", glassStorageDetails.getShelf()));
+ miloService.writeToOpcWord(list);
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, glassStorageDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
+ return Boolean.TRUE;
}
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
- RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ }
+ log.info("涓婄墖浣嶉兘鏈夋灦瀛愶紝缁撴潫鏈潯绾縶}鐨勮皟搴︿换鍔�", stationCell);
+ return Boolean.FALSE;
+ }
+ RawGlassStorageDetails glassStorageDetails = rawGlassDetailsList.get(0);
+ if (LOAD_STATION_MAX.contains(glassStorageDetails.getSlot())) {
+ log.info("涓婄墖浣�2鍙锋湁鏋跺瓙锛岀粨鏉熸湰鏉＄嚎{}鐨勮皟搴︿换鍔�", stationCell);
+ return Boolean.FALSE;
+ }
+ //姣旇緝褰撳墠1鍙锋灦瀛愪笂鐨勭幓鐠冨墿浣欐暟閲忔槸鍚︿负0鎴栬�呭凡鐢ㄥ畬
+ if (usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
+ usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId())) {
+ RawGlassStorageDetails details = null;
+ if (upPattenUsage01VOS.size() > glassStorageDetails.getRemainQuantity()) {
+ //2鍙蜂綅涓婄墖锛氱户缁綋鍓嶅昂瀵哥殑鍘熺墖
+ details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
.eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
.eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
.eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
.eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
.gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
.orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
- );
- generateTask(details.getSlot(), 2, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ .last("limit 1"));
+ } else {
+ //2鍙蜂綅涓婄墖锛氳幏鍙栫浜岀灏哄鐨勫師鐗�
+ List<UpPattenUsageVO> upPattenUsage02VOS = upListMap.get("2");
+ if (CollectionUtils.isEmpty(upPattenUsage01VOS)) {
+ return Boolean.FALSE;
+ }
+ usageVO = upPattenUsage02VOS.get(0);
+ details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
+ .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
+ .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
+ .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+ .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
+ .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
+ .last("limit 1"));
}
- }
+ //灏嗗伐浣嶇殑鏋跺瓙浼犻�佸埌涓婄墖浣�
+ rawGlassStorageDetailsService.generateTask(details.getShelf(), glassStorageDetails.getSlot(), details.getShelf(), details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, glassStorageDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", glassStorageDetails.getShelf()));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", glassStorageDetails.getSlot()));
+ miloService.writeToOpcWord(list);
+
+ return Boolean.TRUE;
+ } else {
+ //灏嗘灦瀛愭斁鍥炲師宸ヤ綅涓�
+ rawGlassStorageDetailsService.generateTask(0, glassStorageDetails.getShelf(), glassStorageDetails.getShelf(), glassStorageDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, glassStorageDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
+
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
+ list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", glassStorageDetails.getShelf()));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", glassStorageDetails.getSlot()));
+ miloService.writeToOpcWord(list);
+ return Boolean.TRUE;
+ }
}
+ private RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {
- /**
- * 鐢熸垚鍘熺墖浠撳偍浠诲姟
- *
- * @param startSlot
- * @param endSlot
- * @param patternQuantity
- * @param taskType
- * @return
- */
- private boolean generateTask(int startSlot, int endSlot, Integer patternQuantity, int taskType) {
- RawGlassStorageTask task = RawGlassStorageTask.builder()
- .startSlot(startSlot)
- .endSlot(endSlot)
- .patternQuantity(patternQuantity)
- .taskType(taskType)
- .createTime(new Date()).build();
- return rawGlassStorageTaskService.save(task);
+ RawGlassStorageDetails targetDetails = new RawGlassStorageDetails();
+// details.setDeviceId();
+ targetDetails.setSlot(targetSlot);
+ targetDetails.setShelf(details.getShelf());
+ targetDetails.setPatternWidth(details.getPatternWidth());
+ targetDetails.setPatternHeight(details.getPatternHeight());
+ targetDetails.setPatternThickness(details.getPatternThickness());
+ targetDetails.setFilmsId(details.getFilmsId());
+ targetDetails.setRemainQuantity(details.getRemainQuantity());
+ targetDetails.setCreateTime(new Date());
+ targetDetails.setState(Const.RAW_GLASS_STATE_IN);
+ return targetDetails;
+ }
+
+ private ReadWriteEntity generateReadWriteEntity(String identifier, int value) {
+ ReadWriteEntity readWriteEntity = new ReadWriteEntity();
+ readWriteEntity.setIdentifier(identifier);
+ readWriteEntity.setValue(value);
+ return readWriteEntity;
}
}
+
--
Gitblit v1.8.0