From 23f026fbfd81066b1f2e9662bbeff31965dda4d6 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 17:00:16 +0800
Subject: [PATCH] 仓储页面推送数据过滤查询
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 620 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 386 insertions(+), 234 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 18032eb..759df14 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
@@ -3,15 +3,22 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.common.config.Const;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
+import com.mes.opctask.entity.LoadGlassDeviceTask;
+import com.mes.opctask.service.LoadGlassDeviceTaskService;
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;
+import com.mes.s7.entity.S7Data;
+import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.entity.vo.UpPattenUsageVO;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
@@ -38,46 +45,81 @@
@Autowired
private RawGlassStorageTaskService rawGlassStorageTaskService;
+ @Autowired
+ private RawGlassStorageStationService rawGlassStorageStationService;
@Resource
private EngineeringMapper engineeringMapper;
@Resource
private UpPattenUsageMapper upPattenUsageMapper;
+ @Resource
+ private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
+
@Autowired(required = false)
private MiloService miloService;
- 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);
- private static final Integer LEFTING_01 = 98;
- private static final Integer LEFTING_02 = 99;
- private static final Integer LOAD_GLASS_01_01 = 101;
- private static final Integer LOAD_GLASS_01_02 = 102;
- private static final Integer LOAD_GLASS_02_01 = 103;
- private static final Integer LOAD_GLASS_02_02 = 104;
+ @Autowired(required = false)
+ S7Serializer s7Serializer;
+
+
+ private static final String LOAD_GLASS_DEVICE_ONE_TASK = "load_glass_device_one_task";
+
+ private static final String LOAD_GLASS_DEVICE_TWO_TASK = "load_glass_device_two_task";
+
+ private static final List<Integer> LOAD_STATION_01 = Collections.singletonList(101);
+// private static final List<Integer> LOAD_STATION_02 = Arrays.asList(103, 104);
+// private static final List<Integer> LOAD_STATION_ALL = Arrays.asList(101, 102, 103, 104);
+ private static final Integer LEFTING_01 = 99;
+// private static final Integer LEFTING_02 = 99;
+ private static final Integer LOAD_GLASS_ONE_DEVICE = 5;
+ private static final Integer LOAD_GLASS_TWO_DEVICE = 6;
@Scheduled(fixedDelay = 1000)
public void rawStorageTask() throws Exception {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("A01-CC.dev.request");
- ReadWriteEntity confireWord = miloService.readFromOpcUa("A01-CC.dev.confirmationWord");
- ReadWriteEntity reportWord = miloService.readFromOpcUa("A01-CC.dev.reportWord");
- ReadWriteEntity taskWord = miloService.readFromOpcUa("A01-CC.dev.taskWord");
- String requestValue = requestWord.getValue() + "";
+ S7Data S7DataWL1 = s7Serializer.read(S7Data.class);
+// S7Data S7DataWL1 = new S7Data();
+// S7DataWL1.setRequest((short) 1);
+// S7DataWL1.setConfirmation((short) 0);
+// S7DataWL1.setReportWord((short) 0);
+// S7DataWL1.setTaskWord((short) 0);
+// String requestWord = S7DataWL1.getRequest().toString();
+// String confireWord = S7DataWL1.getConfirmation().toString();
+// String reportWord = S7DataWL1.getReportWord().toString();
+// String taskWord = S7DataWL1.getTaskWord().toString();
+
+ String requestWord = S7DataWL1.getRequest().toString();
+ String confireWord = S7DataWL1.getConfirmation().toString();
+ String reportWord = S7DataWL1.getReportWord().toString();
+ String taskWord = S7DataWL1.getTaskWord().toString();
+ String requestValue = requestWord;
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
+// ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
+// ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
+// ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
+// String requestValue = requestWord.getValue() + "";
if ("0".equals(requestValue)) {
- if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("A01-CC.dev.confirmationWord", 0));
- miloService.writeToOpcWord(list);
+ if ("1".equals(confireWord) && "0".equals(reportWord)) {
+// if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
+ S7Data s7Data = new S7Data();
+ s7Data.setConfirmation((short) 0);
+ s7Serializer.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
+// miloService.writeToOpcWord(list);
}
- if ("1".equals(taskWord.getValue() + "")) {
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 0));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 0));
- list.add(generateReadWriteEntity("A01-CC.dev.startSlot", 0));
- list.add(generateReadWriteEntity("A01-CC.dev.endSlot", 0));
- miloService.writeToOpcWord(list);
+ if ("1".equals(taskWord)) {
+// if ("1".equals(taskWord.getValue() + "")) {
+ S7Data s7Data = new S7Data();
+ s7Data.setTaskWord((short) 0);
+ s7Data.setStartSlot((short) 0);
+ s7Data.setEndSlot((short) 0);
+ s7Serializer.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
+// list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
+// list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
+// miloService.writeToOpcWord(list);
}
return;
}
@@ -97,14 +139,19 @@
log.info("鎵ц璋冨害浠诲姟锛岀粨鏉�");
return;
}
- flag = outboundTask();
+ flag = inboundRequestTask();
if (flag) {
- log.info("鎵ц鍑哄簱浠诲姟锛岀粨鏉�");
+ log.info("鎵ц鍚婅浣嶈姹備换鍔�");
return;
}
flag = warehouseTask();
if (flag) {
- log.info("鎵ц鍏ュ簱浠诲姟");
+ log.info("鎵ц鍥炲簱浠诲姟");
+ return;
+ }
+ flag = outboundTask();
+ if (flag) {
+ log.info("鎵ц鍑哄簱浠诲姟锛岀粨鏉�");
return;
}
log.info("鏃犱换鍔℃墽琛岋紝缁撴潫");
@@ -112,8 +159,12 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("A01-CC.dev.inCar");
- String value = entity.getValue() + "";
+ S7Data S7DataWL1 = s7Serializer.read(S7Data.class);
+// S7Data S7DataWL1 = new S7Data();
+// S7DataWL1.setInCar((short) 1);
+ String value = S7DataWL1.getInCar().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
+// String value = entity.getValue() + "";
if (!"1".equals(value)) {
log.info("澶ц溅涓婃病鏈夋灦瀛�");
return;
@@ -127,13 +178,16 @@
}
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("A01-CC.dev.reportWord");
- String value = entity.getValue() + "";
+ S7Data S7DataWL1 = s7Serializer.read(S7Data.class);
+// S7Data S7DataWL1 = new S7Data();
+// S7DataWL1.setReportWord((short) 1);
+ String value = S7DataWL1.getReportWord().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
+// String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
return;
@@ -145,8 +199,9 @@
return;
}
RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
- .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
- RawGlassStorageDetails targetDetails = generateDetails(details, task.getEndSlot());
+ .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING, Const.RAW_GLASS_TASK_NEW));
+ RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
+ int deviceId = details.getDeviceId();
Integer taskType = task.getTaskType();
if ("1".equals(value)) {
log.info("灏嗚鎯呰〃鐨勭姸鎬佹敼涓哄凡鍑哄簱");
@@ -155,10 +210,11 @@
.eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
log.info("浠诲姟鐘舵�佸凡鏇存敼涓猴細宸插畬鎴�");
rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
- .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING)
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
switch (taskType) {
case 1:
+ case 3:
log.info("1銆佸叆搴擄紝3銆佽皟搴︿换鍔°�倇}", taskType);
if (targetDetails.getRemainQuantity() > 0) {
rawGlassStorageDetailsService.save(targetDetails);
@@ -166,9 +222,10 @@
break;
case 2:
case 4:
- log.info("2銆佸嚭鐗�,4銆佸叆搴撹姹傘�倇}", taskType);
+ log.info("2銆佸嚭鐗�,4銆佸悐瑁呬綅璇锋眰銆倇}", taskType);
targetDetails = new RawGlassStorageDetails();
targetDetails.setSlot(task.getEndSlot());
+ targetDetails.setDeviceId(deviceId);
targetDetails.setShelf(task.getStartSlot());
targetDetails.setState(Const.RAW_GLASS_STATE_IN);
rawGlassStorageDetailsService.save(targetDetails);
@@ -189,18 +246,18 @@
.in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING, Const.RAW_GLASS_STATE_CAR));
}
rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
- .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING)
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
}
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("A01-CC.dev.confirmationWord", 1));
- miloService.writeToOpcWord(list);
+ S7Data s7Data = new S7Data();
+ s7Data.setConfirmation((short) 1);
+ s7Serializer.write(s7Data);
}
private boolean isHasRunningTask() {
RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
- .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
+ .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING));
return task == null ? Boolean.FALSE : Boolean.TRUE;
}
@@ -223,47 +280,163 @@
}
return Boolean.FALSE;
+ }
+ /**
+ * 澶勭悊绌烘灦瀛愬悐瑁呬綅璇锋眰浠诲姟锛氬皢浠撳簱鐨勭┖鏋跺瓙閫佸埌鍚婅浣�99锛岀瓑寰呭叆搴�
+ *
+ * @return
+ */
+ public boolean inboundRequestTask() throws Exception {
+ // 姝ラ1锛氭煡璇⑩�滄湭鎵ц鐨勭┖鏋跺瓙鍒板悐瑁呬綅璇锋眰浠诲姟鈥濓紙绫诲瀷IN_REQUEST锛岀姸鎬丯EW锛�
+ RawGlassStorageTask inRequestTask = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskType, Const.RAW_GLASS_TASK_TYPE_IN_REQUEST) // 绌烘灦瀛愬叆搴撹姹傜被鍨�
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .last("limit 1")); // 姣忔澶勭悊涓�涓换鍔★紝閬垮厤鍐茬獊
+
+ if (inRequestTask == null) {
+ log.info("鏃犲緟鎵ц鐨勭┖鏋跺瓙鍚婅浣嶈姹備换鍔�");
+ return Boolean.FALSE;
+ }
+
+ // 姝ラ2锛氭鏌ヤ换鍔″叧鑱旂殑绌烘灦瀛愮姸鎬侊紙闇�涓衡�滃緟鍏ュ簱鈥濓紝涓旂‘瀹炴槸绌烘灦瀛愶級
+ RawGlassStorageDetails emptyShelf = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, inRequestTask.getStartSlot()) // 璧峰浣嶏細浠撳簱绌烘灦瀛愪綅
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING)); // 寰呭叆搴撶姸鎬�);
+
+ if (emptyShelf == null) {
+ log.info("绌烘灦瀛愬埌鍚婅浣嶈姹備换鍔″叧鑱旂殑鏋跺瓙寮傚父锛堥潪绌烘灦瀛愭垨鐘舵�侀敊璇級锛岃烦杩囨墽琛�");
+ return Boolean.FALSE;
+ }
+
+ // 姝ラ3锛氭鏌ョ洰鏍囧悐瑁呬綅99鏄惁绌洪棽
+ List<RawGlassStorageDetails> liftingShelfList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, inRequestTask.getEndSlot()) // 鐩爣浣嶏細鍚婅浣�99
+ .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL));
+
+ if (CollectionUtil.isNotEmpty(liftingShelfList)) {
+ log.info("鍚婅浣峽}宸叉湁鍏宠仈鏋跺瓙锛屾棤娉曟墽琛岀┖鏋跺瓙鍒板悐瑁呬綅璇锋眰", inRequestTask.getEndSlot());
+ return Boolean.FALSE;
+ }
+
+ // 姝ラ4锛氭洿鏂扮┖鏋跺瓙鐘舵�佷负鈥滄墽琛屼腑鈥�
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, emptyShelf.getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+
+ // 姝ラ5锛氭洿鏂颁换鍔＄姸鎬佷负鈥滄墽琛屼腑鈥濓紝閬垮厤閲嶅鎵ц
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getId, inRequestTask.getId())
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING));
+
+ // 姝ラ6锛氬彂閫丳LC鎸囦护锛岄┍鍔ㄧ┖鏋跺瓙浠庝粨搴撯啋鍚婅浣�
+ S7Data s7Data = new S7Data();
+ s7Data.setTaskWord((short) 1); // 浠诲姟瑙﹀彂淇″彿
+ s7Data.setStartSlot((short) inRequestTask.getStartSlot().intValue()); // 璧峰浣嶏細浠撳簱绌烘灦瀛愪綅
+ s7Data.setEndSlot((short) inRequestTask.getEndSlot().intValue()); // 鐩爣浣嶏細鍚婅浣�99
+ s7Serializer.write(s7Data);
+
+ log.info("鎵ц绌烘灦瀛愬埌鍚婅浣嶈姹備换鍔★細浠庝粨搴搟}鍒板悐瑁呬綅{}", inRequestTask.getStartSlot(), inRequestTask.getEndSlot());
+ return Boolean.TRUE;
}
/**
* 鍑哄簱浠诲姟锛�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"));
- if (CollectionUtil.isEmpty(rawGlassList)) {
- log.info("绯荤粺娌℃湁闇�瑕佸嚭搴撶殑鍘熺墖淇℃伅");
+ // 姝ラ1锛氭煡璇㈠凡鐢熸垚鐨勨�滄湭鎵ц鍑哄簱浠诲姟鈥濓紙鐘舵�佷负NEW锛岀被鍨嬩负OUT锛�
+ RawGlassStorageTask outboundTask = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskType, Const.RAW_GLASS_TASK_TYPE_OUT)
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .last("limit 1")); // 姣忔澶勭悊涓�涓换鍔�
+
+ if (outboundTask == null) {
+ log.info("鏃犲緟鎵ц鐨勫嚭搴撲换鍔�");
return Boolean.FALSE;
}
- //鑾峰彇宸ヤ綅涓婃槸鍚︽湁鏋跺瓙锛�
+
+ // 姝ラ2锛氳幏鍙栦换鍔″叧鑱旂殑鏋跺瓙璇︽儏锛屾鏌ョ姸鎬佹槸鍚﹀悎娉曪紙寰呭嚭搴擄級
+ RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, outboundTask.getStartSlot()) // 浠诲姟璧峰浣嶏紙浠撳簱浣嶏級
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT)); // 寰呭嚭搴撶姸鎬�
+ if (details == null) {
+ log.info("鍑哄簱浠诲姟鍏宠仈鐨勬灦瀛愮姸鎬佸紓甯革紝璺宠繃鎵ц");
+ return Boolean.FALSE;
+ }
+
+ // 姝ラ3锛氭鏌ュ悐瑁呬綅99鏄惁绌洪棽锛堟棤鏋跺瓙锛�
List<RawGlassStorageDetails> emptyLeftingList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
.in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL)
.in(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
- if (CollectionUtil.isNotEmpty(emptyLeftingList) && emptyLeftingList.size() > 1) {
- log.info("鍚婅浣嶅綋鍓嶉兘鏈夋灦瀛愶紝缁撴潫鍑虹墖浠诲姟");
+
+ if (CollectionUtil.isNotEmpty(emptyLeftingList)) {
+ log.info("鍚婅浣�99褰撳墠鏈夋灦瀛愶紝鏃犳硶鎵ц鍑哄簱浠诲姟");
return Boolean.FALSE;
}
- //鑾峰彇闇�瑕佽惤鏋剁殑
- List<Integer> leftingList = emptyLeftingList.stream().map(RawGlassStorageDetails::getSlot).collect(Collectors.toList());
- int lefting = CollectionUtil.isEmpty(leftingList) ? LEFTING_01 : leftingList.get(0).equals(LEFTING_01) ? LEFTING_02 : LEFTING_01;
- Integer startSlot = rawGlassList.get(0).getSlot();
- //鐢熸垚鍑哄簱浠诲姟
- rawGlassStorageDetailsService.generateTask(startSlot, lefting, startSlot, rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.startSlot", startSlot));
-// list.add(generateReadWriteEntity("A01-CC.dev.endSlot", lefting));
-// miloService.writeToOpcWord(list);
-
- //淇敼鍑虹墖浠诲姟鐘舵��
+ // 姝ラ4锛氭洿鏂版灦瀛愮姸鎬佷负鈥滄墽琛屼腑鈥�
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
+ .eq(RawGlassStorageDetails::getSlot, details.getSlot())
.eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT)
.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+
+ // 姝ラ5锛氭洿鏂颁换鍔＄姸鎬佷负鈥滄墽琛屼腑鈥濓紙閬垮厤閲嶅鎵ц锛�
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getId, outboundTask.getId())
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING));
+
+
+ S7Data s7Data = new S7Data();
+ s7Data.setTaskWord((short) 1);
+ s7Data.setStartSlot((short) outboundTask.getStartSlot().intValue()); // 浠撳簱瀛樺偍浣嶏紙璧峰浣嶏級
+ s7Data.setEndSlot((short) outboundTask.getEndSlot().intValue()); // 鍚婅浣�99锛堢洰鏍囦綅锛�
+ s7Serializer.write(s7Data);
+
+ return Boolean.TRUE;
+ }
+
+ /**
+ * 澶嶄綅浠诲姟锛�1銆佺偣澶嶄綅锛岀珛椹敓鎴愬浣嶄换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负鏋跺瓙澶嶄綅锛屽畾鏃朵换鍔℃壂鎻忕敓鎴愬浣嶄换鍔�
+ */
+ public boolean shelfResetTask() throws Exception {
+ // 1. 鏌ヨ鈥滃緟澶嶄綅鈥濈殑鏋跺瓙锛堢姸鎬佷负RESET锛屼笖宸ヤ綅鍚敤锛�
+ List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET)
+ .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1"));
+ if (CollectionUtil.isEmpty(rawGlassList)) {
+ log.info("绯荤粺娌℃湁闇�瑕佸浣嶇殑鍘熺墖淇℃伅");
+ return Boolean.FALSE;
+ }
+
+ // 2. 鍙栫涓�鏉″緟澶嶄綅鐨勬灦瀛愶紙姣忔澶勭悊涓�涓級
+ RawGlassStorageDetails details = rawGlassList.get(0);
+ Integer startSlot = details.getSlot(); // 澶嶄綅璧峰浣嶏紙褰撳墠鏋跺瓙鎵�鍦ㄤ綅锛�
+ Integer targetSlot = details.getShelf(); // 澶嶄綅鐩爣浣嶏紙鍒濆浠撳簱瀛樺偍浣嶏級
+
+ // 3. 鐢熸垚澶嶄綅浠诲姟锛堢被鍨嬪缓璁崟鐙畾涔夛細濡侰onst.RAW_GLASS_TASK_TYPE_RESET锛岄伩鍏嶄笌璋冨害浠诲姟娣锋穯锛�
+ rawGlassStorageDetailsService.generateTask(
+ startSlot,
+ targetSlot,
+ targetSlot,
+ details.getRemainQuantity(),
+ Const.RAW_GLASS_TASK_TYPE_DISPATCH
+ );
+
+ // 4. 鏇存柊鏋跺瓙鐘舵�佷负鈥滄墽琛屼腑鈥�
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, startSlot)
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+
+ // 5. 琛ュ厖PLC浜や簰锛氬彂閫佸浣嶆寚浠�
+ S7Data s7Data = new S7Data();
+ s7Data.setTaskWord((short) 1); // 浠诲姟瑙﹀彂淇″彿
+ s7Data.setStartSlot((short) startSlot.intValue()); // 璧峰浣嶏細褰撳墠鏋跺瓙浣�
+ s7Data.setEndSlot((short) targetSlot.intValue()); // 鐩爣浣嶏細鍒濆浠撳簱浣�
+ s7Serializer.write(s7Data);
+
+ log.info("鎵ц鏋跺瓙澶嶄綅浠诲姟锛氫粠{}鍒皗}", startSlot, targetSlot);
return Boolean.TRUE;
}
@@ -273,32 +446,49 @@
* @throws Exception
*/
public boolean warehouseTask() throws Exception {
- List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
- .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 Boolean.FALSE;
+// List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
+// .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
+// .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 Boolean.FALSE;
+// }
+ // 鏌ヨ鍥炲簱浠诲姟
+ RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
+ .in(RawGlassStorageTask::getTaskType, Const.RAW_GLASS_TASK_TYPE_IN)
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .last("limit 1"));
+
+ if (task == null) {
+ log.info("鏃犲緟鎵ц鐨勫洖搴撲换鍔�");
+ return false;
}
- //鐢熸垚杩涚浠诲姟
- RawGlassStorageDetails details = rawGlassList.get(0);
- rawGlassStorageDetailsService.generateTask(details.getSlot(), details.getShelf(), details.getShelf(),
- details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
+ RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()) // 浠诲姟璧峰浣嶏紙鍚婅浣嶏級
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING)); // 宸叉爣璁颁负鎵ц涓�
+ if (details == null) {
+ log.info("浠诲姟鍏宠仈鐨勬灦瀛愮姸鎬佸紓甯革紝璺宠繃鎵ц");
+ return false;
+ }
+
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getId, task.getId())
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING));
+ log.info("鎵ц鍥炲簱浠诲姟锛氫粠{}鍒皗}", task.getStartSlot(), task.getEndSlot());
// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.startSlot", details.getSlot()));
-// list.add(generateReadWriteEntity("A01-CC.dev.endSlot", details.getShelf()));
+// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
+// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
+// list.add(generateReadWriteEntity("CC.CC.startSlot", details.getSlot()));
+// list.add(generateReadWriteEntity("CC.CC.endSlot", details.getShelf()));
// miloService.writeToOpcWord(list);
- //鐢熸垚宸ヤ綅浠诲姟锛屽皢鍚婅浣嶇殑鐜荤拑鐘舵�佹敼浣嶈繘绗间腑
- //淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负103 鍑虹墖涓�
- //淇敼鍑虹墖浠诲姟鐘舵��
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
- .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+
+ S7Data s7Data = new S7Data();
+ s7Data.setTaskWord((short) 1);
+ s7Data.setStartSlot((short) details.getSlot().intValue());
+ s7Data.setEndSlot((short) details.getShelf().intValue());
+ s7Serializer.write(s7Data);
return Boolean.TRUE;
}
@@ -315,161 +505,97 @@
log.info("姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囨棤鍙笂鐗囩殑鍘熺墖淇℃伅");
return Boolean.FALSE;
}
- //鑾峰彇褰撳墠涓婄墖浣�1鍙锋灦瀛愪俊鎭�
- int endSlot = stationCell == LOAD_GLASS_01_01 ? LOAD_GLASS_01_01 : LOAD_GLASS_02_01;
- int endSlot02 = stationCell == LOAD_GLASS_01_02 ? LOAD_GLASS_01_01 : LOAD_GLASS_02_02;
+ //鑾峰彇褰撳墠闇�瑕佷笂鐗囩殑鍘熺墖鏁版嵁
Map<String, List<UpPattenUsageVO>> upListMap = pattenUsageList.stream()
.collect(Collectors.groupingBy(UpPattenUsageVO::getGroupNumber));
- //1銆佹煡璇�2涓笂鐗囩殑鍘熺墖璇︽儏
- List<RawGlassStorageDetails> rawGlassDetailsList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .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涓婄墖浣嶆病鏈夋灦瀛愶紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旇矾绾跨殑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())
- .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1")
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
-// .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
- );
- rawGlassStorageDetailsService.generateTask(details.getSlot(), endSlot, details.getSlot(), details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ List<UpPattenUsageVO> usageVOS = upListMap.get("1");
+ //鑾峰彇褰撳墠涓婄墖浣�1鍙锋灦瀛愪俊鎭�
+ List<Integer> loadStation = LOAD_STATION_01;
+ List<RawGlassStorageStation> stations = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>()
+ .in(RawGlassStorageStation::getSlot, loadStation)
+ .eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON)
+ .orderByAsc(RawGlassStorageStation::getSlot));
+ if (CollectionUtils.isEmpty(stations)) {
+ log.info("101鐨勪笂鐗囦綅涓嶅彲鐢�");
+ return Boolean.FALSE;
+ }
- //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
+ List<RawGlassStorageDetails> loadStationList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1")
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .eq(RawGlassStorageDetails::getDeviceId, stationCell));
+ if (CollectionUtils.isEmpty(loadStationList)) {
+ RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
+ if (rawDetails == null) {
+ log.info("浠撳簱鏃犲尮閰嶈鏍肩殑鍘熺墖锛屾棤娉曡皟搴﹀埌101宸ヤ綅");
+ return Boolean.FALSE;
+ }
+ // 鐢熸垚璋冨害浠诲姟锛氫粨搴撳師鐗囦綅 鈫� 101涓婄墖浣�
+ rawGlassStorageDetailsService.generateTask(
+ rawDetails.getSlot(),
+ stations.get(0).getSlot(),
+ rawDetails.getShelf(),
+ rawDetails.getRemainQuantity(),
+ Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskType, Const.RAW_GLASS_TASK_TYPE_DISPATCH)
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING));
+
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, details.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
+ .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+ S7Data s7Data = new S7Data();
+ s7Data.setTaskWord((short) 1);
+ s7Data.setStartSlot((short) rawDetails.getSlot().intValue()); // 璧峰浣嶏細浠撳簱
+ s7Data.setEndSlot((short) LOAD_STATION_01.get(0).intValue()); // 鐩爣浣嶏細涓婄墖浣�101
+ s7Serializer.write(s7Data); // 鍙戦�佸埌PLC
+
+ log.info("璋冨害浠诲姟宸插彂閫丳LC锛氫粠浠撳簱{}鍒颁笂鐗囦綅{}", rawDetails.getSlot(), LOAD_STATION_01);
return Boolean.TRUE;
}
- RawGlassStorageDetails glassStorageDetails = rawGlassDetailsList.get(0);
- if (rawGlassDetailsList.size() == 2) {
- if (!((usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
- usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId())))
- || ((usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
- usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId()))
- && glassStorageDetails.getRemainQuantity() == 0)) {
- //灏嗘灦瀛愭斁鍥炲師宸ヤ綅涓�
- rawGlassStorageDetailsService.generateTask(endSlot, glassStorageDetails.getShelf(), glassStorageDetails.getShelf(), 0, Const.RAW_GLASS_TASK_TYPE_DISPATCH);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.startSlot", endSlot));
-// list.add(generateReadWriteEntity("A01-CC.dev.endSlot", 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::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
+ // 涓婄墖浣�101鏈夌幓鐠� 鈫� 鍒ゆ柇灏哄鏄惁鍖归厤
+ RawGlassStorageDetails oneLoadStation = loadStationList.get(0);
+ if (oneLoadStation.getRemainQuantity() <= 0 || !compareRawSize(usageVOS.get(0), oneLoadStation)) {
+
+ // 妫�鏌ヤ笂鐗囨満鏄惁姝ｅ湪宸ヤ綔锛岃嫢姝ｅ湪宸ヤ綔鍒欎笉鐢熸垚閫�鍥炰换鍔�
+ if (pattenUsageList.stream().allMatch(vo -> vo.getState() == 101)) {
+ log.warn("涓婄墖鏈簕}姝ｅ湪宸ヤ綔锛屾棤娉曟墽琛岄��鍥炰换鍔�", stationCell);
+ return Boolean.FALSE;
}
+
+ // 鐢熸垚閫�鍥炰换鍔★細101涓婄墖浣� 鈫� 鍘熶粨搴撳瓨鍌ㄤ綅
+ rawGlassStorageDetailsService.generateTask(
+ stations.get(0).getSlot(),
+ oneLoadStation.getShelf(),
+ oneLoadStation.getShelf(),
+ oneLoadStation.getRemainQuantity(),
+ Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskType, Const.RAW_GLASS_TASK_TYPE_DISPATCH)
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING));
+
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, oneLoadStation.getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+ S7Data s7Data = new S7Data();
+ s7Data.setTaskWord((short) 1); // 浠诲姟瑙﹀彂淇″彿
+ s7Data.setStartSlot((short) LOAD_STATION_01.get(0).intValue()); // 璧峰浣嶏細涓婄墖浣�101
+ s7Data.setEndSlot((short) oneLoadStation.getShelf().intValue()); // 鐩爣浣嶏細浠撳簱
+ s7Serializer.write(s7Data); // 鍙戦�佸埌PLC
+
+ log.info("閫�鍥炰换鍔″凡鍙戦�丳LC锛氫粠涓婄墖浣峽}鍒颁粨搴搟}", LOAD_STATION_01, oneLoadStation.getShelf());
return Boolean.FALSE;
}
- //todo:1鏉＄嚎涓斿綋鏉＄嚎涓�2鍙蜂笂鐗囦负
- if (LOAD_STATION_MAX.contains(glassStorageDetails.getSlot())) {
- log.info("涓婄墖浣�2鍙锋湁鏋跺瓙锛岀粨鏉熸湰鏉＄嚎{}鐨勮皟搴︿换鍔�", stationCell);
- if (!((usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
- usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId())))
- || ((usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
- usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId()))
- && glassStorageDetails.getRemainQuantity() == 0)) {
- //灏嗘灦瀛愭斁鍥炲師宸ヤ綅涓�
- rawGlassStorageDetailsService.generateTask(endSlot02, glassStorageDetails.getShelf(), glassStorageDetails.getShelf(), 0, Const.RAW_GLASS_TASK_TYPE_DISPATCH);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.startSlot", endSlot02));
-// list.add(generateReadWriteEntity("A01-CC.dev.endSlot", 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::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- }
- return Boolean.FALSE;
- } else {
- //姣旇緝褰撳墠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"));
- } 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.getSlot(), endSlot02, details.getShelf(), details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, details.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("A01-CC.dev.taskWord", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.startSlot", glassStorageDetails.getShelf()));
-// list.add(generateReadWriteEntity("A01-CC.dev.endSlot", endSlot02));
-// miloService.writeToOpcWord(list);
-
- return Boolean.TRUE;
- } else {
- //灏嗘灦瀛愭斁鍥炲師宸ヤ綅涓�
- rawGlassStorageDetailsService.generateTask(endSlot, glassStorageDetails.getShelf(), glassStorageDetails.getShelf(), glassStorageDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, endSlot).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
-
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("A01-CC.dev.taskWord", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.taskSending", 1));
-// list.add(generateReadWriteEntity("A01-CC.dev.startSlot", endSlot));
-// list.add(generateReadWriteEntity("A01-CC.dev.endSlot", glassStorageDetails.getShelf()));
-// miloService.writeToOpcWord(list);
- return Boolean.TRUE;
- }
- }
+ // 涓婄墖浣�101鐜荤拑灏哄鍖归厤涓旀暟閲忓厖瓒� 鈫� 鏃犻渶璋冨害
+ log.info("101宸ヤ綅鐜荤拑灏哄鍖归厤涓旀暟閲忓厖瓒筹紝鏃犻渶璋冨害");
+ return Boolean.FALSE;
}
-
- private RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {
-
- 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();
@@ -478,5 +604,31 @@
return readWriteEntity;
}
+ private RawGlassStorageDetails getRawGlassStorageDetailsBySize(UpPattenUsageVO usageVO, int remainQuantity) {
+ return 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())
+ .notIn(RawGlassStorageDetails::getSlot, LOAD_STATION_01)
+ .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
+ .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
+ .last("order by abs(t.remain_quantity - " + remainQuantity + ") asc")
+ .last("limit 1"));
+ }
+
+ /**
+ * 灏哄涓�鏍峰苟涓斿師鐗囨暟閲忓ぇ浜�0
+ *
+ * @param upPattenUsage
+ * @param details
+ * @return
+ */
+ private boolean compareRawSize(UpPattenUsage upPattenUsage, RawGlassStorageDetails details) {
+ boolean flag = upPattenUsage.getWidth() == details.getPatternWidth() && upPattenUsage.getHeight() == details.getPatternHeight() &&
+ upPattenUsage.getThickness() == details.getPatternThickness() && upPattenUsage.getFilmsId().equals(details.getFilmsId());
+ return flag;
+ }
+
}
--
Gitblit v1.8.0