From bd1709073c25581232fc95089c9b6e0046e9ee22 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 原片仓储任务改造
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 152 insertions(+), 24 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 66e13c4..0bf747d 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,11 +2,12 @@
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;
@@ -53,8 +54,10 @@
@Autowired
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<String> 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);
/**
* 鍏ュ簱浠诲姟锛氬悐瑁呬綅鏈夌幓鐠冿紝鍏堝幓宸ヤ綅琛ㄦ煡璇㈢┖鏍煎瓙锛岀敓鎴愬叆搴撲换鍔′粠鍚婅浣嶅埌鐩爣鏍煎瓙
@@ -64,29 +67,38 @@
@Scheduled(fixedDelay = 1000)
public void warehouseTask() throws Exception {
ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValueString();
+ String value = entity.getValue() + "";
if (!"1".equals(value)) {
log.info("澶ц溅蹇欑");
return;
}
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)"));
+ .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
if (CollectionUtil.isEmpty(rawGlassList)) {
log.info("鍚婅浣嶈绂佺敤鎴栨病鏈夌幓鐠�");
return;
}
//鏌ヨ宸ヤ綅淇℃伅鏄惁鏈�
- List<RawGlassStorageStation> stationList = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>().notInSql(RawGlassStorageStation::getSlot, "select slot_id from raw_glass_storage_details where state = '100'")
+ List<RawGlassStorageStation> stationList = rawGlassStorageStationService.list(new LambdaQueryWrapper<RawGlassStorageStation>().notInSql(RawGlassStorageStation::getSlot, "select slot from raw_glass_storage_details where " +
+ "state in('100','102','103')")
.eq(RawGlassStorageStation::getEnableState, Const.SLOT_ON));
if (CollectionUtil.isEmpty(stationList)) {
log.info("娌℃湁绌虹殑宸ヤ綅");
return;
}
//鐢熸垚杩涚浠诲姟
- generateTask(rawGlassList.get(0).getSlotId(), stationList.get(0).getSlot(),
- rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
+ generateTask(rawGlassList.get(0).getSlot(), stationList.get(0).getSlot(),
+ rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_STATE_RUNNING);
//鐢熸垚宸ヤ綅浠诲姟锛屽皢鍚婅浣嶇殑鐜荤拑鐘舵�佹敼浣嶈繘绗间腑
+// 淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负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));
+// RawGlassStorageDetails details = new RawGlassStorageDetails();
+// BeanUtils.copyProperties(rawGlassList.get(0), details);
}
@@ -96,25 +108,31 @@
@Scheduled(fixedDelay = 1000)
public void outboundTask() throws Exception {
ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValueString();
+ String value = entity.getValue() + "";
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)"));
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT));
+// .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1 and device_id = 4"));
if (CollectionUtil.isEmpty(rawGlassList)) {
log.info("绯荤粺娌℃湁闇�瑕佸嚭搴撶殑鍘熺墖淇℃伅");
return;
}
- List<Integer> emptyLeftingList = rawGlassStorageDetailsService.listBySlotState(liftingStation, Arrays.asList(Const.GLASS_STATE_IN));
+ List<Integer> emptyLeftingList = rawGlassStorageDetailsService.listBySlotState(LIFTING_STATION, Arrays.asList(Const.RAW_GLASS_STATE_IN, Const.RAW_GLASS_STATE_RUNNING));
if (CollectionUtil.isEmpty(emptyLeftingList)) {
log.info("鍚婅浣嶅綋鍓嶉兘鏈夊師鐗囷紝缁撴潫鍑虹墖浠诲姟");
+ return;
}
//鐢熸垚鍑哄簱浠诲姟
- generateTask(rawGlassList.get(0).getSlotId(), emptyLeftingList.get(0),
+ generateTask(rawGlassList.get(0).getSlot(), emptyLeftingList.get(0),
rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
+ //淇敼鍑虹墖浠诲姟鐘舵��
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
}
/**
@@ -123,19 +141,25 @@
@Scheduled(fixedDelay = 1000)
public void rawGlassDispatchTask() throws Exception {
ReadWriteEntity entity = miloService.readFromOpcUa("rawglass.device.request");
- String value = entity.getValueString();
+ String value = entity.getValue() + "";
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) {
+ List<Engineering> engineeringList = engineeringMapper.selectList(new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getState, Const.ENGINEERING_RUNNING).last("order by id"));
+ if (CollectionUtils.isEmpty(engineeringList)) {
log.info("娌℃湁姝ｅ湪鎵ц鐨勫伐绋�");
return;
}
+ //绾胯矾 + 宸ョ▼鍚�
+ //todo:鎸夌収璺嚎鍙婂伐绋嬪彿锛岃繘琛屽嚭鐗囦换鍔�
+ String stationCell = engineeringList.get(0).getStationCell();
+ String enginneerId = engineeringList.get(0).getEngineerId();
+
//褰撳墠灏哄闇�瑕佷笂鐗囩殑鏁伴噺
- List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(engineering.getEngineerId());
+ List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(enginneerId);
if (CollectionUtils.isEmpty(pattenUsageList)) {
log.info("姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囨棤鍙笂鐗囩殑鍘熺墖淇℃伅");
return;
@@ -146,7 +170,7 @@
//todo:褰撲竴鍙蜂笂鐗囦綅鏋跺瓙涓婄殑鐜荤拑浣嶇┖鎴栬�呭綋鍓嶅昂瀵哥敤瀹屾椂鏃讹紝灏�2鍙凤紙鏈夌幓鐠冿級涓婄墖浣嶈皟搴﹀埌1鍙蜂笂鐗囦綅
//1銆佹煡璇�4涓笂鐗囩殑鍘熺墖璇︽儏
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::getSlot, LOAD_STATION_01));
if (CollectionUtils.isEmpty(rawGlassDetailsList)) {
//琛ㄧず1涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
@@ -160,10 +184,10 @@
.orderByAsc(RawGlassStorageDetails::getRemainQuantity)
.last("limit 1")
);
- generateTask(details.getSlotId(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
//缁撴潫璋冨害浠诲姟
}
- Map<Integer, List<RawGlassStorageDetails>> listMap = rawGlassDetailsList.stream().collect(Collectors.groupingBy(RawGlassStorageDetails::getSlotId));
+ Map<Integer, List<RawGlassStorageDetails>> listMap = rawGlassDetailsList.stream().collect(Collectors.groupingBy(RawGlassStorageDetails::getSlot));
RawGlassStorageDetails rawGlass03Details = listMap.get(3).get(0);
RawGlassStorageDetails rawGlass04Details = listMap.get(4).get(0);
// RawGlassStorageDetails rawGlass05Details = listMap.get(5).get(0);
@@ -183,7 +207,7 @@
.orderByAsc(RawGlassStorageDetails::getRemainQuantity)
.last("limit 1")
);
- generateTask(details.getSlotId(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
//缁撴潫璋冨害浠诲姟
} else {
//灏�2鍙蜂笂鐗囦綅鐨勫師鐗囨斁鍏�1鍙蜂笂鐗囦綅
@@ -206,10 +230,114 @@
.orderByAsc(RawGlassStorageDetails::getRemainQuantity)
.last("limit 1")
);
- generateTask(details.getSlotId(), 2, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ generateTask(details.getSlot(), 2, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
}
}
+
+ }
+
+ private boolean queryDispatchTask(String stationCell, String enginneerId) {
+ //todo:鎸夌収宸ョ▼鍙锋寜鐓у伐绋嬩笅鏈畬鎴愮殑灏哄鐨勯『搴忥紝褰�1鍙蜂笂鐗囦綅鏋跺瓙涓婄殑褰撳墠灏哄鐜荤拑灏戜簬3鐗囦笖2鍙蜂笂鐗囦綅鏃犲師鐗囩幓鐠冿紝鍒欏皢鍘昏皟搴︾幓鐠冨幓2鍙蜂笂鐗囦綅锛�
+ //todo:褰撲竴鍙蜂笂鐗囦綅鏋跺瓙涓婄殑鐜荤拑浣嶇┖鎴栬�呭綋鍓嶅昂瀵哥敤瀹屾椂鏃讹紝灏�2鍙凤紙鏈夌幓鐠冿級涓婄墖浣嶈皟搴﹀埌1鍙蜂笂鐗囦綅
+ //1銆佹煡璇笂鐗囩嚎璺搴斿伐浣嶇殑鍘熺墖淇℃伅
+ LambdaQueryWrapper<RawGlassStorageDetails> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN);
+ if ("1".equals(stationCell)) {
+ wrapper.in(RawGlassStorageDetails::getSlot, LOAD_STATION_01);
+ } else {
+ wrapper.in(RawGlassStorageDetails::getSlot, LOAD_STATION_02);
+ }
+ List<RawGlassStorageDetails> rawGlassDetailsList = rawGlassStorageDetailsService.list(wrapper);
+ if (CollectionUtils.isEmpty(rawGlassDetailsList)) {
+ //鐩存帴鐢熸垚璋冨害浠诲姟
+ generateTask(1, 2, 34, 4);
+ return Boolean.TRUE;
+ }
+ if (rawGlassDetailsList.size() == 2) {
+ return Boolean.FALSE;
+ }
+ int maxStationSlot = rawGlassDetailsList.stream().mapToInt(RawGlassStorageDetails::getSlot).max().orElse(0);
+ if (LOAD_STATION_MAX.contains(maxStationSlot)) {
+ return Boolean.FALSE;
+ }
+ //浜屽彿涓婄墖锛氱洿鎺ョ敓鎴愯皟搴︿换鍔�
+ generateTask(1, 2, 34, 4);
+ return Boolean.TRUE;
+
+
+ //褰撳墠灏哄闇�瑕佷笂鐗囩殑鏁伴噺
+ List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(enginneerId);
+ if (CollectionUtils.isEmpty(pattenUsageList)) {
+ log.info("姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囨棤鍙笂鐗囩殑鍘熺墖淇℃伅");
+ return Boolean.FALSE;
+ }
+ Map<String, List<UpPattenUsageVO>> upListMap = pattenUsageList.stream()
+ .collect(Collectors.groupingBy(UpPattenUsageVO::getGroupNumber));
+
+
+ if (CollectionUtils.isEmpty(rawGlassDetailsList)) {
+ //琛ㄧず1涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
+ List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
+ UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
+ RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
+ .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
+ .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
+ .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+ .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
+ .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
+ .last("limit 1")
+ );
+ generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ //缁撴潫璋冨害浠诲姟
+ }
+ Map<Integer, List<RawGlassStorageDetails>> listMap = rawGlassDetailsList.stream().collect(Collectors.groupingBy(RawGlassStorageDetails::getSlot));
+ RawGlassStorageDetails rawGlass03Details = listMap.get(3).get(0);
+ RawGlassStorageDetails rawGlass04Details = listMap.get(4).get(0);
+// RawGlassStorageDetails rawGlass05Details = listMap.get(5).get(0);
+// RawGlassStorageDetails rawGlass06Details = listMap.get(6).get(0);
+ //todo:涓婄墖1鍙蜂綅2绉嶆竻绌烘柟寮忥細鏂瑰紡涓�锛氬師鐗囩敤瀹� 鏂瑰紡浜岋細褰撳墠灏哄鐢ㄥ畬
+ if (null == rawGlass03Details) {
+ if (null == rawGlass04Details) {
+ //琛ㄧず1涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
+ List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
+ UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
+ RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
+ .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
+ .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
+ .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+ .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
+ .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
+ .last("limit 1")
+ );
+ generateTask(details.getSlot(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ //缁撴潫璋冨害浠诲姟
+ } else {
+ //灏�2鍙蜂笂鐗囦綅鐨勫師鐗囨斁鍏�1鍙蜂笂鐗囦綅
+ generateTask(2, 1, rawGlass04Details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ //缁撴潫璋冨害浠诲姟
+ }
+ } else {
+ if (null == rawGlass04Details) {
+ List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("2");
+ if (CollectionUtils.isEmpty(upPattenUsage01VOS)) {
+ return;
+ }
+ UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
+ RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
+ .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
+ .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
+ .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+ .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
+ .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
+ .last("limit 1")
+ );
+ generateTask(details.getSlot(), 2, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ }
+ }
}
@@ -225,7 +353,7 @@
*/
private boolean generateTask(int startSlot, int endSlot, Integer patternQuantity, int taskType) {
RawGlassStorageTask task = RawGlassStorageTask.builder()
- .originateSlot(startSlot)
+ .startSlot(startSlot)
.endSlot(endSlot)
.patternQuantity(patternQuantity)
.taskType(taskType)
--
Gitblit v1.8.0