From 78d73df2f8e0c6855d65eb1f2c6df08e0f99bab1 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 22 十月 2025 12:45:05 +0800
Subject: [PATCH] 仓储后端接口返回信息国际化处理
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 467 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 249 insertions(+), 218 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 fe3a539..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
@@ -67,17 +67,27 @@
private static final String LOAD_GLASS_DEVICE_TWO_TASK = "load_glass_device_two_task";
- private static final List<Integer> LOAD_STATION_01 = Arrays.asList(101, 102);
- 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 = 98;
- private static final Integer LEFTING_02 = 99;
+ 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 {
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();
@@ -129,19 +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 = shelfResetTask();
+ flag = outboundTask();
if (flag) {
- log.info("鎵ц澶嶄綅浠诲姟");
+ log.info("鎵ц鍑哄簱浠诲姟锛岀粨鏉�");
return;
}
log.info("鏃犱换鍔℃墽琛岋紝缁撴潫");
@@ -150,6 +160,8 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
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() + "";
@@ -171,6 +183,8 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageFinish() throws Exception {
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() + "";
@@ -185,7 +199,7 @@
return;
}
RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
- .in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
+ .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();
@@ -196,7 +210,7 @@
.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:
@@ -208,7 +222,7 @@
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);
@@ -232,21 +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));
}
S7Data s7Data = new S7Data();
s7Data.setConfirmation((short) 1);
s7Serializer.write(s7Data);
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
-// miloService.writeToOpcWord(list);
}
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;
}
@@ -269,55 +280,127 @@
}
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("CC.CC.taskWord", 1));
-// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
-// list.add(generateReadWriteEntity("CC.CC.startSlot", startSlot));
-// list.add(generateReadWriteEntity("CC.CC.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"));
@@ -325,22 +408,35 @@
log.info("绯荤粺娌℃湁闇�瑕佸浣嶇殑鍘熺墖淇℃伅");
return Boolean.FALSE;
}
- //鐢熸垚澶嶄綅浠诲姟
-// rawGlassStorageDetailsService.generatask(rawGlassList.get(0).getSlot(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ // 2. 鍙栫涓�鏉″緟澶嶄綅鐨勬灦瀛愶紙姣忔澶勭悊涓�涓級
+ RawGlassStorageDetails details = rawGlassList.get(0);
+ Integer startSlot = details.getSlot(); // 澶嶄綅璧峰浣嶏紙褰撳墠鏋跺瓙鎵�鍦ㄤ綅锛�
+ Integer targetSlot = details.getShelf(); // 澶嶄綅鐩爣浣嶏紙鍒濆浠撳簱瀛樺偍浣嶏級
-// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
-// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
-// list.add(generateReadWriteEntity("CC.CC.startSlot", startSlot));
-// list.add(generateReadWriteEntity("CC.CC.endSlot", lefting));
-// miloService.writeToOpcWord(list);
+ // 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, rawGlassList.get(0).getSlot())
+ .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;
}
@@ -350,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("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;
}
@@ -397,12 +510,13 @@
.collect(Collectors.groupingBy(UpPattenUsageVO::getGroupNumber));
List<UpPattenUsageVO> usageVOS = upListMap.get("1");
//鑾峰彇褰撳墠涓婄墖浣�1鍙锋灦瀛愪俊鎭�
- List<Integer> loadStation = LOAD_GLASS_ONE_DEVICE.equals(stationCell) ? LOAD_STATION_01 : LOAD_STATION_02;
+ 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));
+ .eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON)
+ .orderByAsc(RawGlassStorageStation::getSlot));
if (CollectionUtils.isEmpty(stations)) {
- log.info("娌℃湁鍙敤鐨勪笂鐗囦綅");
+ log.info("101鐨勪笂鐗囦綅涓嶅彲鐢�");
return Boolean.FALSE;
}
@@ -410,160 +524,77 @@
.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 (stations.size() == 1) {
- if (CollectionUtils.isEmpty(loadStationList)) {
- RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), stations.get(0).getSlot(), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- }
- RawGlassStorageDetails oneLoadStation = loadStationList.get(0);
- if (oneLoadStation.getRemainQuantity() <= 0 || !compareRawSize(usageVOS.get(0), oneLoadStation)) {
- rawGlassStorageDetailsService.generateTask(stations.get(0).getSlot(), oneLoadStation.getShelf(), oneLoadStation.getShelf(), oneLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, oneLoadStation.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.FALSE;
- }
- }
-
- log.info("鑾峰彇{}涓婄墖绾跨殑宸ヤ綅淇℃伅{}", stationCell, loadStationList);
if (CollectionUtils.isEmpty(loadStationList)) {
- log.info("1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- if (CollectionUtils.isEmpty(loadStationList)) {
- log.info("浠撳簱鍐呮棤鍖归厤鐨勭幓鐠�");
+ if (rawDetails == null) {
+ log.info("浠撳簱鏃犲尮閰嶈鏍肩殑鍘熺墖锛屾棤娉曡皟搴﹀埌101宸ヤ綅");
return Boolean.FALSE;
}
- rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
+ // 鐢熸垚璋冨害浠诲姟锛氫粨搴撳師鐗囦綅 鈫� 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, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .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 oneLoadStation = loadStationList.stream().filter(e -> e.getSlot().equals(loadStation.get(0))).findFirst().orElse(null);
- if (null == oneLoadStation) {
- RawGlassStorageDetails twoLoadStation = loadStationList.stream().filter(e -> e.getSlot().equals(loadStation.get(1))).findFirst().orElse(null);
- if (twoLoadStation.getRemainQuantity() > 0) {
- if (compareRawSize(usageVOS.get(0), twoLoadStation)) {
-// 2鍙蜂笂鐗囦綅鐨勫師鐗囦俊鎭簮宸ョ▼淇℃伅涓�鑷达紝鍙笂鐗囨搷浣滐紝缁撴潫鏈浠诲姟
- return Boolean.FALSE;
- } else {
-// 鐢熸垚1鍙蜂綅鍏ュ簱浠诲姟
- log.info("2鍙蜂笂鐗囦綅鐜荤拑灏哄涓嶄竴鑷达紝1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
- //鎸夌収灏哄鍙婃暟閲忚幏鍙栨暟閲忔渶鎺ヨ繎鐨勬牸瀛愪俊鎭�
- RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- if (null == rawDetails) {
- log.info("浠撳簱鍐呮棤闇�瑕佷笂鏋剁殑鐜荤拑");
- return Boolean.FALSE;
- }
- rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- }
- } else {
-// 鐢熸垚1鍙蜂綅鍏ュ簱浠诲姟
- log.info("2鍙蜂笂鐗囦綅浠呭墿绌烘灦瀛愶紝1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
- RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- }
- } else {
- String tableName = stationCell == 5 ? LOAD_GLASS_DEVICE_ONE_TASK : LOAD_GLASS_DEVICE_TWO_TASK;
- if (oneLoadStation.getRemainQuantity() > 0) {
- if (compareRawSize(usageVOS.get(0), oneLoadStation)) {
- //缁撴潫浠撳偍璋冨害锛岀瓑寰呬笂鐗囦换鍔�
- //鍦ㄤ笂鐗囦换鍔℃墽琛岀┖闂茶繃绋嬩腑,鍙墽琛屼簩鍙蜂綅鍑哄叆搴撲换鍔� 浜屽彿鏋跺瓙鐨勪俊鎭槸鍚﹂渶瑕佽皟搴�,涓嶉渶瑕佽皟搴︾洿鎺ユ斁鍥瀎alse
- log.info("鑾峰彇浜屽彿浣嶅師鐗囦俊鎭�");
- RawGlassStorageDetails twoLoadStation = loadStationList.stream().filter(e -> e.getSlot().equals(loadStation.get(1))).findFirst().orElse(null);
- if (null == twoLoadStation) {
- //鎸夌収灏哄鐢熸垚浜屽彿浣嶄笂鐗囦换鍔′俊鎭�
- LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
- RawGlassStorageDetails rawDetails = null;
- if (oneLoadStation.getRemainQuantity() > (loadTask.getTotalCount() + loadTask.getDamageCount())) {
- usageVOS = upListMap.get("2");
- if (CollectionUtils.isEmpty(usageVOS)) {
- log.info("褰撳墠宸ョ▼鐨勫師鐗囧嵆灏嗙敤瀹岋紝缁撴潫鏈璋冨害");
- return Boolean.FALSE;
- }
- rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- } else {
- rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
+ // 涓婄墖浣�101鏈夌幓鐠� 鈫� 鍒ゆ柇灏哄鏄惁鍖归厤
+ RawGlassStorageDetails oneLoadStation = loadStationList.get(0);
+ if (oneLoadStation.getRemainQuantity() <= 0 || !compareRawSize(usageVOS.get(0), oneLoadStation)) {
- }
- if (null == rawDetails) {
- log.info("鍘熺墖浠撳偍娌℃湁鐩稿悓灏哄鐨勭幓鐠�");
- return Boolean.FALSE;
- }
- rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(1), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- } else {
- //todo:褰撲簩鍙蜂负鐨勫昂瀵稿ぇ浜�0鏃讹紝鏄惁鎵ц璋冨害浠诲姟锛屾洿鎹㈠綋鍓嶅師鐗囩殑灏哄锛岀瓑寰呬笅涓�娆′换鍔＄殑鐩存帴鎵ц锛涜繕鏄户缁瓑寰咃紝褰撳昂瀵镐笉涓�鏍凤紝绛夊緟涓�鍙峰伐浣嶇殑杩涘嚭搴撹皟搴︿换鍔°��
- if (twoLoadStation.getRemainQuantity() > 0) {
- LoadGlassDeviceTask loadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
- if (oneLoadStation.getRemainQuantity() > (loadTask.getTotalCount() + loadTask.getDamageCount())) {
- usageVOS = upListMap.get("2");
- if (CollectionUtils.isEmpty(usageVOS)) {
- log.info("褰撳墠宸ョ▼鐨勫師鐗囧嵆灏嗙敤瀹岋紝缁撴潫鏈璋冨害");
- return Boolean.FALSE;
- }
- }
- if (compareRawSize(usageVOS.get(0), twoLoadStation)) {
-// //2鍙蜂笂鐗囦綅鐨勫師鐗囦俊鎭簮宸ョ▼淇℃伅涓�鑷达紝鍙笂鐗囨搷浣滐紝缁撴潫鏈浠诲姟
- return Boolean.FALSE;
- } else {
-// 鐢熸垚1鍙蜂綅鍏ュ簱浠诲姟
- log.info("2鍙蜂笂鐗囦綅鐜荤拑灏哄涓嶄竴鑷达紝2鍙蜂笂鐗囦綅鐢熸垚鍑虹墖璋冨害浠诲姟");
- //鎸夌収灏哄鍙婃暟閲忚幏鍙栨暟閲忔渶鎺ヨ繎鐨勬牸瀛愪俊鎭�
- rawGlassStorageDetailsService.generateTask(loadStation.get(1), twoLoadStation.getShelf(), twoLoadStation.getShelf(), twoLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, loadStation.get(1)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- }
- } else {
- //todo:鐢熸垚鍑哄簱浠诲姟
- rawGlassStorageDetailsService.generateTask(loadStation.get(1), twoLoadStation.getShelf(), twoLoadStation.getShelf(), twoLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, loadStation.get(1)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- }
- }
-// return Boolean.FALSE;
- } else {
- log.info("2鍙蜂笂鐗囦綅浠呭墿绌烘灦瀛愶紝1鍙蜂笂鐗囦綅鐢熸垚鍑哄簱璋冨害浠诲姟");
- rawGlassStorageDetailsService.generateTask(loadStation.get(0), oneLoadStation.getShelf(), oneLoadStation.getShelf(), oneLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, loadStation.get(0)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
- }
- } else {
- log.info("1鍙蜂笂鐗囦綅鐜荤拑灏哄涓嶄竴鑷达紝1鍙蜂笂鐗囦綅鐢熸垚鍑哄簱璋冨害浠诲姟");
- rawGlassStorageDetailsService.generateTask(loadStation.get(0), oneLoadStation.getSlot(), oneLoadStation.getShelf(), oneLoadStation.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, loadStation.get(0)).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
- return Boolean.TRUE;
+ // 妫�鏌ヤ笂鐗囨満鏄惁姝ｅ湪宸ヤ綔锛岃嫢姝ｅ湪宸ヤ綔鍒欎笉鐢熸垚閫�鍥炰换鍔�
+ 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;
}
+ // 涓婄墖浣�101鐜荤拑灏哄鍖归厤涓旀暟閲忓厖瓒� 鈫� 鏃犻渶璋冨害
+ log.info("101宸ヤ綅鐜荤拑灏哄鍖归厤涓旀暟閲忓厖瓒筹紝鏃犻渶璋冨害");
+ return Boolean.FALSE;
}
private ReadWriteEntity generateReadWriteEntity(String identifier, int value) {
@@ -579,7 +610,7 @@
.eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
.eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
.eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
- .notIn(RawGlassStorageDetails::getSlot, LOAD_STATION_ALL)
+ .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")
--
Gitblit v1.8.0