From ed13d4fecbb497c98df3bed3d5d4037d1448124b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 23 十月 2024 20:17:14 +0800
Subject: [PATCH] 1、修改表结构，修改liquibase，在本地启动需要打开liquibase开关，重新执行执行脚本，将最新的结构更新到数据库，之后关闭liquibase开关 2、将各个模块的opc设为关闭状态，可按照实际开发情况在本地开关
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 523 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 402 insertions(+), 121 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 6040484..1c93ee7 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
@@ -2,15 +2,14 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+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.milo.model.ReadWriteEntity;
-import com.mes.milo.service.MiloService;
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.uppattenusage.entity.vo.UpPattenUsageVO;
@@ -22,10 +21,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;
/**
@@ -38,8 +34,6 @@
public class RawGlassTask {
@Autowired
- private RawGlassStorageStationService rawGlassStorageStationService;
- @Autowired
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@Autowired
@@ -50,152 +44,439 @@
@Resource
private UpPattenUsageMapper upPattenUsageMapper;
- @Autowired
+ @Autowired(required = false)
private MiloService miloService;
- private static final List<String> liftingStation = Arrays.asList("1", "2");
- private static final List<String> loadGlassStation = Arrays.asList("3", "4", "5", "6");
+ 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;
+
+ @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() + "";
+ 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(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);
+ }
+ 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("A01-CC.dev.inCar");
+ 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) {
+ log.info("娌℃湁姝ｅ湪鎵ц鐨勪换鍔�");
+ 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("A01-CC.dev.reportWord");
+ 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)) {
+ 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));
+ log.info("浠诲姟鐘舵�佸凡鏇存敼涓猴細宸插畬鎴�");
+ rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
+ .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
+ switch (taskType) {
+ case 1:
+ log.info("1銆佸叆搴擄紝3銆佽皟搴︿换鍔°�倇}", taskType);
+ if (targetDetails.getRemainQuantity() > 0) {
+ rawGlassStorageDetailsService.save(targetDetails);
+ }
+ break;
+ case 2:
+ case 4:
+ log.info("2銆佸嚭鐗�,4銆佸叆搴撹姹傘�倇}", taskType);
+ targetDetails = new RawGlassStorageDetails();
+ targetDetails.setSlot(task.getEndSlot());
+ targetDetails.setShelf(task.getStartSlot());
+ targetDetails.setState(Const.RAW_GLASS_STATE_IN);
+ rawGlassStorageDetailsService.save(targetDetails);
+ break;
+ default:
+ break;
+ }
+ } else {
+ if (taskType.equals(Const.RAW_GLASS_TASK_TYPE_IN_REQUEST)) {
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
+ .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING, Const.RAW_GLASS_STATE_CAR));
+ } else {
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
+ .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)
+ .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
+
+ }
+ List<ReadWriteEntity> list = new ArrayList<>();
+ list.add(generateReadWriteEntity("A01-CC.dev.confirmationWord", 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"));
+ 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, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
+ if (CollectionUtil.isNotEmpty(emptyLeftingList) && emptyLeftingList.size() > 1) {
+ log.info("鍚婅浣嶅綋鍓嶉兘鏈夋灦瀛愶紝缁撴潫鍑虹墖浠诲姟");
+ 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);
+
+ //淇敼鍑虹墖浠诲姟鐘舵��
+ 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.getValueString();
- 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::getSlotId, "select slot from raw_glass_storage_station where enable_state = 1 and slot in (1,2)"));
+ .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;
- }
- //鏌ヨ宸ヤ綅淇℃伅鏄惁鏈�
- List<RawGlassStorageStation> stationList = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>().notInSql(RawGlassStorageStation::getSlot, "select slot_id from raw_glass_storage_details where state = '100'")
- .eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON));
- if (CollectionUtil.isEmpty(stationList)) {
- log.info("娌℃湁绌虹殑宸ヤ綅");
- return;
+ log.info("鍚婅浣嶈绂佺敤/鏋跺瓙鎵�鍦ㄥ伐浣嶈绂佺敤/鏃犲師鐗囦俊鎭�");
+ return Boolean.FALSE;
}
//鐢熸垚杩涚浠诲姟
- generateTask(rawGlassList.get(0).getSlotId(), stationList.get(0).getSlot(),
- rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
+ 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("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()));
+// miloService.writeToOpcWord(list);
//鐢熸垚宸ヤ綅浠诲姟锛屽皢鍚婅浣嶇殑鐜荤拑鐘舵�佹敼浣嶈繘绗间腑
- }
-
-
- /**
- * 鍑哄簱浠诲姟锛�1銆佺偣鍑哄簱锛岀珛椹敓鎴愬嚭鐗囦换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负寰呭嚭搴擄紝瀹氭椂浠诲姟鎵弿鐢熸垚鍑哄簱浠诲姟
- */
- @Scheduled(fixedDelay = 1000)
- public void outboundTask() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValueString();
- if (!"2".equals(value)) {
- log.info("澶ц溅蹇欑");
- return;
- }
- List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_OUT_ING)
- .inSql(RawGlassStorageDetails::getSlotId, "select slot from raw_glass_storage_station where enable_state = 1 and slot not in (1,2)"));
- if (CollectionUtil.isEmpty(rawGlassList)) {
- log.info("绯荤粺娌℃湁闇�瑕佸嚭搴撶殑鍘熺墖淇℃伅");
- return;
- }
- List<Integer> emptyLeftingList = rawGlassStorageDetailsService.listBySlotState(liftingStation, Arrays.asList(Const.GLASS_STATE_IN));
- if (CollectionUtil.isEmpty(emptyLeftingList)) {
- log.info("鍚婅浣嶅綋鍓嶉兘鏈夊師鐗囷紝缁撴潫鍑虹墖浠诲姟");
- }
- //鐢熸垚鍑哄簱浠诲姟
- generateTask(rawGlassList.get(0).getSlotId(), emptyLeftingList.get(0),
- rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
+ //淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负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));
+ return Boolean.TRUE;
}
/**
- * 鍘熺墖璋冨害锛�1銆佹煡璇㈠伐绋嬪師鐗囪〃锛屾寜鐓ч『搴忓皢鍘熺墖鏀惧叆涓婄墖1鍙蜂綅锛屽悗缁師鐗囨斁涓婄墖2鍙蜂綅锛屽嚭鐜板昂瀵告浛鎹紝鍒ゆ柇鍘熶笂鐗囦綅鏄惁鏈夌幓鐠冿紝鏈� 鍏堝嚭鍚庤繘锛屾棤 鐩存帴杩涚墖
+ * @param stationCell 璁惧淇℃伅 5 銆� 6
+ * @param enginneerId 鍏变酣鍙�
+ * @return
+ * @throws Exception
*/
- @Scheduled(fixedDelay = 1000)
- public void rawGlassDispatchTask() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValueString();
- if (!"2".equals(value)) {
- log.info("澶ц溅蹇欑");
- return;
- }
- //鏌ヨ褰撳墠绯荤粺姝ｅ湪鎵ц鐨勮鍗�
- Engineering engineering = engineeringMapper.selectOne(new LambdaQueryWrapper<Engineering>().eq(Engineering::getState, Const.ENGINEERING_RUNNING).last("order by id limit 1"));
- if (null == engineering) {
- log.info("娌℃湁姝ｅ湪鎵ц鐨勫伐绋�");
- return;
- }
+ private boolean rawGlassDispatchByEngineering(int stationCell, String enginneerId) throws Exception {
//褰撳墠灏哄闇�瑕佷笂鐗囩殑鏁伴噺
- List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(engineering.getEngineerId());
+ List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(enginneerId);
+ if (CollectionUtils.isEmpty(pattenUsageList)) {
+ 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));
- //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::getSlotId, loadGlassStation));
+ .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涓婄墖浣嶆病鏈夋灦瀛愶紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旇矾绾跨殑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);
+
+ //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
+ 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));
+ return Boolean.TRUE;
}
- Map<Integer, List<RawGlassStorageDetails>> listMap = rawGlassDetailsList.stream().collect(Collectors.groupingBy(RawGlassStorageDetails::getSlotId));
- 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涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
- //缁撴潫璋冨害浠诲姟
- } else {
- //灏�2鍙蜂笂鐗囦綅鐨勫師鐗囨斁鍏�1鍙蜂笂鐗囦綅
- //缁撴潫璋冨害浠诲姟
+ 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;
}
+ 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 {
- //鍘熺墖鍓╀綑鏁伴噺
- Integer quantity = rawGlass03Details.getRemainQuantity();
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
- if (null == rawGlass04Details) {
- //todo:鍒ゆ柇2鍙蜂笂鐗囦綅闇�瑕佺殑鍘熺墖淇℃伅
- if (quantity < upPattenUsage01VOS.size()) {
- //todo:缁х画涓婁竴鍙蜂笂鐗囦綅褰撳墠鐨勫昂瀵�
+ //姣旇緝褰撳墠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 {
- //todo:鍒囨崲灏哄锛屼笂鍚庣画缁勭殑灏哄
+ //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;
}
}
+ }
+ 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;
}
- /**
- * 鐢熸垚鍘熺墖浠撳偍浠诲姟
- *
- * @param startSlot
- * @param endSlot
- * @param patternQuantity
- * @param taskType
- * @return
- */
- private boolean generateTask(int startSlot, int endSlot, Integer patternQuantity, int taskType) {
- RawGlassStorageTask task = RawGlassStorageTask.builder()
- .originateSlot(startSlot)
- .endSlot(endSlot)
- .patternQuantity(patternQuantity)
- .taskType(taskType)
- .createTime(new Date()).build();
- return rawGlassStorageTaskService.save(task);
+ private ReadWriteEntity generateReadWriteEntity(String identifier, int value) {
+ ReadWriteEntity readWriteEntity = new ReadWriteEntity();
+ readWriteEntity.setIdentifier(identifier);
+ readWriteEntity.setValue(value);
+ return readWriteEntity;
}
+
}
+
--
Gitblit v1.8.0