From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 557 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 351 insertions(+), 206 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 c02be86..62d17e9 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,16 +3,23 @@
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.s7.job.S7Job;
+import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.entity.vo.UpPattenUsageVO;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
@@ -35,45 +42,76 @@
public class RawGlassTask {
@Autowired
- private RawGlassStorageStationService rawGlassStorageStationService;
- @Autowired
private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@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);
+ @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 = 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 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("storage-device.dev.Task Request");
- ReadWriteEntity confireWord = miloService.readFromOpcUa("storage-device.dev.Task Confirmation Word");
- ReadWriteEntity taskWord = miloService.readFromOpcUa("storage-device.dev.Task sending word");
- String requestValue = requestWord.getValue() + "";
+
+ String requestWord = S7Job.S7DataWL1.getRequest().toString();
+ String confireWord = S7Job.S7DataWL1.getConfirmation().toString();
+ String reportWord = S7Job.S7DataWL1.getReportWord().toString();
+ String taskWord = S7Job.S7DataWL1.getTaskWord().toString();
+
+// 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;
+// String requestValue = requestWord.getValue() + "";
if ("0".equals(requestValue)) {
- if ("1".equals(confireWord.getValue() + "")) {
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task Confirmation Word", 0));
- miloService.writeToOpcWord(list);
+ if ("1".equals(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("storage-device.dev.Task sending word", 0));
- list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 0));
- list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", 0));
- list.add(generateReadWriteEntity("storage-device.dev.End shelf number", 0));
- miloService.writeToOpcWord(list);
+ 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;
}
@@ -103,32 +141,39 @@
log.info("鎵ц鍏ュ簱浠诲姟");
return;
}
+ flag = shelfResetTask();
+ if (flag) {
+ log.info("鎵ц澶嶄綅浠诲姟");
+ return;
+ }
log.info("鏃犱换鍔℃墽琛岋紝缁撴潫");
}
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("storage-device.dev.Loading rack");
- String value = entity.getValue() + "";
+ String value = S7Job.S7DataWL1.getInCar().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
+// String value = entity.getValue() + "";
if (!"1".equals(value)) {
- log.info("澶ц溅蹇欑");
+ 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("storage-device.dev.Task report letter");
- String value = entity.getValue() + "";
+ String value = S7Job.S7DataWL1.getReportWord().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
+// String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
return;
@@ -141,55 +186,62 @@
}
RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
.in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
- RawGlassStorageDetails targetDetails = generateDetails(details, task.getEndSlot());
+ RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
+ int deviceId = details.getDeviceId();
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("杩涚墖浠诲姟");
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
- //todo:鐢熸垚鍏ュ簱璇︽儏琛細鍏朵粬淇℃伅涓嶅彉锛�
- rawGlassStorageDetailsService.save(targetDetails);
+ case 3:
+ log.info("1銆佸叆搴擄紝3銆佽皟搴︿换鍔°�倇}", taskType);
+ if (targetDetails.getRemainQuantity() > 0) {
+ rawGlassStorageDetailsService.save(targetDetails);
+ }
break;
case 2:
- log.info("鍑虹墖浠诲姟");
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ case 4:
+ 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);
- break;
- case 3:
- log.info("璋冨害浠诲姟");
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
rawGlassStorageDetailsService.save(targetDetails);
break;
default:
break;
}
- rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
- .eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW)
- .set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_SUCCESS));
} else {
+ 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));
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
- }
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task Confirmation Word", 1));
- miloService.writeToOpcWord(list);
+ }
+ 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() {
@@ -225,8 +277,8 @@
*/
public boolean outboundTask() throws Exception {
List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT));
-// .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
+ .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;
@@ -234,27 +286,60 @@
//鑾峰彇宸ヤ綅涓婃槸鍚︽湁鏋跺瓙锛�
List<RawGlassStorageDetails> emptyLeftingList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
.in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL)
- .in(RawGlassStorageDetails::getSlot, 98, 99));
- if (CollectionUtil.isNotEmpty(emptyLeftingList) && emptyLeftingList.size() >= 2) {
+ .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(rawGlassList.get(0).getSlot(), 98, rawGlassList.get(0).getSlot(),
- rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
+ rawGlassStorageDetailsService.generateTask(startSlot, lefting, startSlot, rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", rawGlassList.get(0).getSlot()));
- list.add(generateReadWriteEntity("storage-device.dev.End shelf number", 98));
- miloService.writeToOpcWord(list);
+// 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);
//淇敼鍑虹墖浠诲姟鐘舵��
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;
+ }
+
+
+ /**
+ * 澶嶄綅浠诲姟锛�1銆佺偣澶嶄綅锛岀珛椹敓鎴愬浣嶄换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负鏋跺瓙澶嶄綅锛屽畾鏃朵换鍔℃壂鎻忕敓鎴愬浣嶄换鍔�
+ */
+ public boolean shelfResetTask() throws Exception {
+ 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;
+ }
+ //鐢熸垚澶嶄綅浠诲姟
+
+// rawGlassStorageDetailsService.generatask(rawGlassList.get(0).getSlot(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+
+// 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);
+
+ //淇敼澶嶄綅浠诲姟鐘舵��
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET)
.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
return Boolean.TRUE;
}
@@ -274,28 +359,18 @@
log.info("鍚婅浣嶈绂佺敤/鏋跺瓙鎵�鍦ㄥ伐浣嶈绂佺敤/鏃犲師鐗囦俊鎭�");
return Boolean.FALSE;
}
- //鑾峰彇鍚婅浣嶆灦瀛愪俊鎭�
-// List<Integer> shelfList = rawGlassList.stream().map(RawGlassStorageDetails::getShelf).collect(Collectors.toList());
-// List<RawGlassStorageStation> stationList = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>().notInSql(RawGlassStorageStation::getSlot, "select slot from raw_glass_storage_details where " +
-// "state in('100','102','103')")
-// .eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON)
-// .in(RawGlassStorageStation::getDeviceId, Const.RAW_GLASS_DEVICE));
-// if (CollectionUtil.isEmpty(stationList)) {
-// log.info("娌℃湁绌虹殑宸ヤ綅");
-// return Boolean.FALSE;
-// }
//鐢熸垚杩涚浠诲姟
RawGlassStorageDetails details = rawGlassList.get(0);
rawGlassStorageDetailsService.generateTask(details.getSlot(), details.getShelf(), details.getShelf(),
details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", details.getSlot()));
- list.add(generateReadWriteEntity("storage-device.dev.End shelf number", details.getShelf()));
- miloService.writeToOpcWord(list);
+// 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 鍑虹墖涓�
+ //淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负103 鍑虹墖涓�
//淇敼鍑虹墖浠诲姟鐘舵��
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
.eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
@@ -304,148 +379,191 @@
return Boolean.TRUE;
}
- private boolean rawGlassDispatchByEngineering(String stationCell, String enginneerId) throws Exception {
+ /**
+ * @param stationCell 璁惧淇℃伅 5 銆� 6
+ * @param enginneerId 鍏变酣鍙�
+ * @return
+ * @throws Exception
+ */
+ private boolean rawGlassDispatchByEngineering(int stationCell, String enginneerId) throws Exception {
//褰撳墠灏哄闇�瑕佷笂鐗囩殑鏁伴噺
List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(enginneerId);
if (CollectionUtils.isEmpty(pattenUsageList)) {
log.info("姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囨棤鍙笂鐗囩殑鍘熺墖淇℃伅");
return Boolean.FALSE;
}
+ //鑾峰彇褰撳墠闇�瑕佷笂鐗囩殑鍘熺墖鏁版嵁
Map<String, List<UpPattenUsageVO>> upListMap = pattenUsageList.stream()
.collect(Collectors.groupingBy(UpPattenUsageVO::getGroupNumber));
- //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())
-// .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1")
- );
- rawGlassStorageDetailsService.generateTask(details.getSlot(), rawGlassDetailsList.get(0).getSlot(), details.getSlot(), details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ List<UpPattenUsageVO> usageVOS = upListMap.get("1");
+ //鑾峰彇褰撳墠涓婄墖浣�1鍙锋灦瀛愪俊鎭�
+ List<Integer> loadStation = LOAD_GLASS_ONE_DEVICE.equals(stationCell) ? LOAD_STATION_01 : LOAD_STATION_02;
+ 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("娌℃湁鍙敤鐨勪笂鐗囦綅");
+ return Boolean.FALSE;
+ }
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", details.getSlot()));
- list.add(generateReadWriteEntity("storage-device.dev.End shelf number", rawGlassDetailsList.get(0).getSlot()));
- miloService.writeToOpcWord(list);
+ 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 (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("浠撳簱鍐呮棤鍖归厤鐨勭幓鐠�");
+ 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::getShelf, details.getShelf()).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));
return Boolean.TRUE;
}
- if (rawGlassDetailsList.size() == 2) {
- RawGlassStorageDetails glassStorageDetails = rawGlassDetailsList.get(0);
- if (usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
- usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId())) {
- if (glassStorageDetails.getRemainQuantity() == 0) {
- //灏嗘灦瀛愭斁鍥炲師宸ヤ綅涓�
- rawGlassStorageDetailsService.generateTask(glassStorageDetails.getSlot(), glassStorageDetails.getShelf(), glassStorageDetails.getShelf(), glassStorageDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", glassStorageDetails.getSlot()));
- list.add(generateReadWriteEntity("storage-device.dev.End shelf number", glassStorageDetails.getShelf()));
- miloService.writeToOpcWord(list);
+ 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, glassStorageDetails.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));
return Boolean.TRUE;
}
- }
- log.info("涓婄墖浣嶉兘鏈夋灦瀛愶紝缁撴潫鏈潯绾縶}鐨勮皟搴︿换鍔�", stationCell);
- return Boolean.FALSE;
- }
- RawGlassStorageDetails glassStorageDetails = rawGlassDetailsList.get(0);
- if (LOAD_STATION_MAX.contains(glassStorageDetails.getSlot())) {
- log.info("涓婄墖浣�2鍙锋湁鏋跺瓙锛岀粨鏉熸湰鏉＄嚎{}鐨勮皟搴︿换鍔�", stationCell);
- return Boolean.FALSE;
- }
- //姣旇緝褰撳墠1鍙锋灦瀛愪笂鐨勭幓鐠冨墿浣欐暟閲忔槸鍚︿负0鎴栬�呭凡鐢ㄥ畬
- if (usageVO.getWidth() == glassStorageDetails.getPatternWidth() && usageVO.getHeight() == glassStorageDetails.getPatternHeight() &&
- usageVO.getThickness() == glassStorageDetails.getPatternThickness() && usageVO.getFilmsId().equals(glassStorageDetails.getFilmsId())) {
- RawGlassStorageDetails details = null;
- if (upPattenUsage01VOS.size() > glassStorageDetails.getRemainQuantity()) {
- //2鍙蜂綅涓婄墖锛氱户缁綋鍓嶅昂瀵哥殑鍘熺墖
- details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
- .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
- .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
- .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
- .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
- .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
- .last("limit 1"));
} 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"));
+// 鐢熸垚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;
}
- //灏嗗伐浣嶇殑鏋跺瓙浼犻�佸埌涓婄墖浣�
- rawGlassStorageDetailsService.generateTask(details.getShelf(), glassStorageDetails.getSlot(), details.getShelf(), details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, glassStorageDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
-
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", glassStorageDetails.getShelf()));
- list.add(generateReadWriteEntity("storage-device.dev.End shelf number", glassStorageDetails.getSlot()));
- miloService.writeToOpcWord(list);
-
- return Boolean.TRUE;
} else {
- //灏嗘灦瀛愭斁鍥炲師宸ヤ綅涓�
- rawGlassStorageDetailsService.generateTask(0, glassStorageDetails.getShelf(), glassStorageDetails.getShelf(), glassStorageDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, glassStorageDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
+ 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());
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("storage-device.dev.Task sending word", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Task distribution", 1));
- list.add(generateReadWriteEntity("storage-device.dev.Starting material rack number", glassStorageDetails.getShelf()));
- list.add(generateReadWriteEntity("storage-device.dev.End shelf number", glassStorageDetails.getSlot()));
- miloService.writeToOpcWord(list);
- return Boolean.TRUE;
+ }
+ 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;
+ }
}
- }
-
- 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) {
@@ -454,5 +572,32 @@
readWriteEntity.setValue(value);
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_ALL)
+ .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