From 7606618b32d522da823b5dd11f4ee64761be26dc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 21 十月 2024 13:51:07 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java | 22
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java | 3
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml | 23
UI-Project/config.js | 8
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java | 21
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 2
UI-Project/src/utils/constants.js | 4
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml | 4
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 104 +++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java | 2
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml | 11
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 12
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java | 11
/dev/null | 35 --
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java | 7
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 30 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 26 +
hangzhoumesParent/moduleService/GlassStorageModule/pom.xml | 6
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 521 +++++++++++++++++++++++---------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java | 4
UI-Project/src/views/NewPage.vue | 24
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 4
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql | 68 ++++
24 files changed, 669 insertions(+), 285 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 4fc6899..9a4f798 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,9 +1,9 @@
export default {
-// serverUrl: "10.153.19.150:88/api",
- serverUrl: "192.168.1.199:88/api",
+ serverUrl: "10.153.19.150:88/api",
+// serverUrl: "192.168.1.199:88/api",
// serverUrl: "127.0.0.1:88/api",
- // serverUrl2: "10.153.19.150:88"
- serverUrl2: "192.168.1.199:88"
+ serverUrl2: "10.153.19.150:88"
+ // serverUrl2: "192.168.1.199:88"
// serverUrl2: "127.0.0.1:88"
//serverUrl:"res.abeim.cn"
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index c104075..b551cfb 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
- export const WebSocketHost = "192.168.1.199";
-// export const WebSocketHost = "10.153.19.150";
+// export const WebSocketHost = "192.168.1.199";
+export const WebSocketHost = "10.153.19.150";
// export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/NewPage.vue b/UI-Project/src/views/NewPage.vue
index 1837c20..9b7f1d6 100644
--- a/UI-Project/src/views/NewPage.vue
+++ b/UI-Project/src/views/NewPage.vue
@@ -5,11 +5,11 @@
<el-input v-model="current" style="margin-left: 20px;margin-top: 15px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿" @input="updateUrl"/>
<el-button style="margin-top: 15px;margin-left: 15px;" type="primary" @click="fetchData">鏌ヨ</el-button>
</div>
- <el-card style="flex: 1;margin-left: 150px;margin-top: 50px;margin-right: 10px;width: 1558px;" height="900" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1000px;" height="900" v-loading="loading">
<div v-for="(row, rowIndex) in divsData" :key="rowIndex" class="row">
<div v-for="(rect, colIndex) in row" :key="colIndex" class="div-container">
<div style="text-align: center;">鐐夊彿锛歿{ getAdjustedRectsForRow(rowIndex)[0].layout_id }}</div>
- <el-scrollbar height="430px" width="1516px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="550px" width="958px" style="background-color: #e9e9eb;">
<div style="position: relative;width: 100%;height: 100%;">
<div
v-for="(rect, index) in getAdjustedRectsForRow(rowIndex)"
@@ -99,20 +99,20 @@
if (rawRowData) {
adjustedRectsPerRow.value[rowIndex] = rawRowData.map(rect => {
let adjustedWidth, adjustedHeight,newX;
- if (rect.rotate_angle === 0) {
+ if (rect.rotate_angle === 90) {
newX = rect.olHeight -(rect.y_axis + rect.height);
- adjustedWidth = rect.height * (1516/rect.olHeight);
- adjustedHeight = rect.width * (430/rect.olWidth);
+ adjustedWidth = rect.height * (958/rect.olHeight);
+ adjustedHeight = rect.width * (550/rect.olWidth);
} else {
newX = rect.olHeight -(rect.y_axis + rect.width);
- adjustedWidth = rect.width * (1516/rect.olHeight);
- adjustedHeight = rect.height * (430/rect.olWidth);
+ adjustedWidth = rect.width * (958/rect.olHeight);
+ adjustedHeight = rect.height * (550/rect.olWidth);
}
let adjustedRect = {
...rect,
- y_axis: rect.x_axis * (430/rect.olWidth),
- x_axis: newX * (1516/rect.olHeight),
- // y_axis: rect.x_axis * (430/rect.olWidth),
+ y_axis: rect.x_axis * (550/rect.olWidth),
+ x_axis: newX * (958/rect.olHeight),
+ // y_axis: rect.x_axis * (550/rect.olWidth),
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
@@ -137,10 +137,10 @@
margin-bottom: 20px;
}
.div-container {
-width: 1516px;
+width: 958px;
float: left;
background-color: #f4f4f5;
-height: 430px;
+height: 550px;
box-sizing: border-box;
}
</style>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 46c9d01..2a9f2a9 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -189,6 +189,8 @@
public static final Integer RAW_GLASS_TASK_TYPE_IN = 1;
public static final Integer RAW_GLASS_TASK_TYPE_OUT = 2;
public static final Integer RAW_GLASS_TASK_TYPE_DISPATCH = 3;
+ public static final Integer RAW_GLASS_TASK_TYPE_IN_REQUEST = 4;
+ public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5;
/**
* 鍘熺墖浠撳偍浠诲姟绫诲瀷
@@ -198,5 +200,29 @@
public static final Integer ENGINEERING_NEW = 0;
public static final Integer ENGINEERING_RUNNING = 1;
+ /**
+ * 鍘熺墖浠撳偍浠诲姟绫诲瀷
+ * 鍦ㄧ鍐�100
+ * 鍑虹101
+ * 鍑嗗鍑虹102
+ * 鎵ц涓�103
+ * 鍦ㄨ溅涓�104
+ */
+ public static final Integer RAW_GLASS_STATE_IN = 100;
+ public static final Integer RAW_GLASS_STATE_OUT = 101;
+ public static final Integer RAW_GLASS_STATE_WAIT_OUT = 102;
+ public static final Integer RAW_GLASS_STATE_RUNNING = 103;
+ public static final Integer RAW_GLASS_STATE_CAR = 104;
+ public static final List<Integer> RAW_GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103);
+
+ public static final Integer RAW_GLASS_TASK_NEW = 0;
+ public static final Integer RAW_GLASS_TASK_SUCCESS = 1;
+ public static final Integer RAW_GLASS_TASK_FAILURE = 2;
+
+ /**
+ * 璁惧鍙�
+ */
+ public static final List<Integer> RAW_GLASS_DEVICE = Arrays.asList(1, 2, 3);
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
index c9321fa..b0032a8 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -96,6 +96,10 @@
* 澶囨敞
*/
private String notes;
+ /**
+ * 涓婄墖鏈虹嚎璺�
+ */
+ private String stationCell;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 4a4a439..49869da 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -16,6 +16,7 @@
threshold: 3
ratio: 10
cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
+ cache: # 鍗у紡鐞嗙墖鏈�澶у昂瀵�
cacheWidth: 3600
cacheHeight: 3000
max: # 绗簩鏉＄嚎鐨勬渶澶у昂瀵镐俊鎭�
@@ -33,9 +34,10 @@
kangaroohy:
milo:
enabled: false
+ primary: default
config:
default:
- endpoint: opc.tcp://127.0.0.1:49320
+ endpoint: opc.tcp://zidonghua:49320
security-policy: basic256sha256
username: zsh
password: 1qaz2wsx3edc4rfv
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/pom.xml b/hangzhoumesParent/moduleService/GlassStorageModule/pom.xml
index 3b4c457..d0ed157 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/pom.xml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/pom.xml
@@ -24,6 +24,12 @@
<version>2.8.9</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.mes</groupId>
+ <artifactId>servicebase</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<properties>
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..c02be86 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,14 +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;
@@ -22,10 +22,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;
/**
@@ -50,186 +47,412 @@
@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);
+
+ @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() + "";
+ 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(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);
+ }
+ 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("storage-device.dev.Loading rack");
+ 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) {
+ 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() + "";
+ 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)) {
+ 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);
+ 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));
+ targetDetails = new RawGlassStorageDetails();
+ targetDetails.setSlot(task.getEndSlot());
+ 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 {
+ 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);
+ }
+
+ 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 and device_id = 4"));
+ 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, 98, 99));
+ if (CollectionUtil.isNotEmpty(emptyLeftingList) && emptyLeftingList.size() >= 2) {
+ log.info("鍚婅浣嶅綋鍓嶉兘鏈夋灦瀛愶紝缁撴潫鍑虹墖浠诲姟");
+ return Boolean.FALSE;
+ }
+ //鑾峰彇闇�瑕佽惤鏋剁殑
+ //鐢熸垚鍑哄簱浠诲姟
+ rawGlassStorageDetailsService.generateTask(rawGlassList.get(0).getSlot(), 98, rawGlassList.get(0).getSlot(),
+ 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);
+
+ //淇敼鍑虹墖浠诲姟鐘舵��
+ 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;
+ log.info("鍚婅浣嶈绂佺敤/鏋跺瓙鎵�鍦ㄥ伐浣嶈绂佺敤/鏃犲師鐗囦俊鎭�");
+ return Boolean.FALSE;
}
- //鏌ヨ宸ヤ綅淇℃伅鏄惁鏈�
- 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;
- }
+ //鑾峰彇鍚婅浣嶆灦瀛愪俊鎭�
+// 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;
+// }
//鐢熸垚杩涚浠诲姟
- 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("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);
//鐢熸垚宸ヤ綅浠诲姟锛屽皢鍚婅浣嶇殑鐜荤拑鐘舵�佹敼浣嶈繘绗间腑
+// 淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负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銆佺偣鍑哄簱锛岀珛椹敓鎴愬嚭鐗囦换鍔� 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);
- }
-
- /**
- * 鍘熺墖璋冨害锛�1銆佹煡璇㈠伐绋嬪師鐗囪〃锛屾寜鐓ч『搴忓皢鍘熺墖鏀惧叆涓婄墖1鍙蜂綅锛屽悗缁師鐗囨斁涓婄墖2鍙蜂綅锛屽嚭鐜板昂瀵告浛鎹紝鍒ゆ柇鍘熶笂鐗囦綅鏄惁鏈夌幓鐠冿紝鏈� 鍏堝嚭鍚庤繘锛屾棤 鐩存帴杩涚墖
- */
- @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(String 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;
+ return Boolean.FALSE;
}
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涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
- List<UpPattenUsageVO> upPattenUsage01VOS = upListMap.get("1");
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
+ //琛ㄧず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")
+ .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.getSlotId(), 1, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
- //缁撴潫璋冨害浠诲姟
+ rawGlassStorageDetailsService.generateTask(details.getSlot(), rawGlassDetailsList.get(0).getSlot(), details.getSlot(), details.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", details.getSlot()));
+ list.add(generateReadWriteEntity("storage-device.dev.End shelf number", rawGlassDetailsList.get(0).getSlot()));
+ miloService.writeToOpcWord(list);
+ //缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负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));
+ 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涓婄墖浣嶆病鏈夊師鐗囷紝鐩存帴鎵惧師鐗囨斁鍏ュ搴旂殑涓婄墖浣�
- 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.getSlotId(), 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;
+ 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);
+ 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));
+ return Boolean.TRUE;
}
- UpPattenUsageVO usageVO = upPattenUsage01VOS.get(0);
- RawGlassStorageDetails details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ }
+ 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")
- );
- generateTask(details.getSlotId(), 2, details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+ .last("limit 1"));
+ } else {
+ //2鍙蜂綅涓婄墖锛氳幏鍙栫浜岀灏哄鐨勫師鐗�
+ List<UpPattenUsageVO> upPattenUsage02VOS = upListMap.get("2");
+ if (CollectionUtils.isEmpty(upPattenUsage01VOS)) {
+ return Boolean.FALSE;
+ }
+ usageVO = upPattenUsage02VOS.get(0);
+ details = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getFilmsId, usageVO.getFilmsId())
+ .eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
+ .eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
+ .eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+ .gt(RawGlassStorageDetails::getRemainQuantity, upPattenUsage01VOS.size())
+ .orderByAsc(RawGlassStorageDetails::getRemainQuantity)
+ .last("limit 1"));
}
+ //灏嗗伐浣嶇殑鏋跺瓙浼犻�佸埌涓婄墖浣�
+ rawGlassStorageDetailsService.generateTask(details.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));
+
+ 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;
}
-
-
}
+ private RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {
- /**
- * 鐢熸垚鍘熺墖浠撳偍浠诲姟
- *
- * @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);
+ RawGlassStorageDetails targetDetails = new RawGlassStorageDetails();
+// details.setDeviceId();
+ targetDetails.setSlot(targetSlot);
+ targetDetails.setShelf(details.getShelf());
+ targetDetails.setPatternWidth(details.getPatternWidth());
+ targetDetails.setPatternHeight(details.getPatternHeight());
+ targetDetails.setPatternThickness(details.getPatternThickness());
+ targetDetails.setFilmsId(details.getFilmsId());
+ targetDetails.setRemainQuantity(details.getRemainQuantity());
+ targetDetails.setCreateTime(new Date());
+ targetDetails.setState(Const.RAW_GLASS_STATE_IN);
+ return targetDetails;
+ }
+
+ private ReadWriteEntity generateReadWriteEntity(String identifier, int value) {
+ ReadWriteEntity readWriteEntity = new ReadWriteEntity();
+ readWriteEntity.setIdentifier(identifier);
+ readWriteEntity.setValue(value);
+ return readWriteEntity;
}
}
+
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/controller/LoadPositionController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/controller/LoadPositionController.java
deleted file mode 100644
index ce8fea2..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/controller/LoadPositionController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.mes.loadposition.controller;
-
-import com.mes.loadposition.entity.LoadPosition;
-import com.mes.loadposition.service.LoadPositionService;
-import com.mes.utils.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/loadPosition")
-@Api(tags = " 鎺у埗鍣�")
-public class LoadPositionController {
-
- @Autowired
- private LoadPositionService loadPositionService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody LoadPosition params) {
- List<LoadPosition> result = loadPositionService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- LoadPosition loadPosition = loadPositionService.getBaseMapper().selectById(id);
- return Result.success(loadPosition);
- }
-
- /**
- * 鏂板
- *
- * @param loadPosition
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody LoadPosition loadPosition) {
- boolean result = loadPositionService.save(loadPosition);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param loadPosition
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PutMapping
- public Result update( @RequestBody LoadPosition loadPosition) {
- boolean result = loadPositionService.updateById(loadPosition);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @DeleteMapping("/{id}")
- public Result delete(@PathVariable("id") Long id) {
- int result = loadPositionService.getBaseMapper().deleteById(id);
- return Result.success(result);
- }
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
deleted file mode 100644
index 99f32ec..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/entity/LoadPosition.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.mes.loadposition.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Data
-@Component
-@EqualsAndHashCode(callSuper = false)
-@TableName("load_position")
-@ApiModel(value = "LoadPosition", description = " ")
-public class LoadPosition implements Serializable{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏋跺瓙缂栧彿
- */
- @ApiModelProperty("鏋跺瓙缂栧彿")
- private String number;
-
- /**
- * 鏈哄櫒缂栧彿
- */
- @ApiModelProperty("鏈哄櫒缂栧彿")
- private Long machineId;
-
- /**
- * 鍚敤鏍囪
- */
- @ApiModelProperty("鍚敤鏍囪")
- private String flag;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String state;
-
- /**
- * 浠撳偍浠诲姟缂栧彿
- */
- @ApiModelProperty("浠撳偍浠诲姟缂栧彿")
- private Integer storageTaskId;
-
- /**
- * 涓婄墖浣嶇被鍨�
- */
- @ApiModelProperty("涓婄墖浣嶇被鍨�")
- private Integer typeFlag;
-
- /**
- * 绾胯矾
- */
- @ApiModelProperty("绾胯矾")
- private Integer routeGroup;
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.java
deleted file mode 100644
index ab8c084..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mes.loadposition.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.loadposition.entity.LoadPosition;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-
-public interface LoadPositionMapper extends BaseMapper<LoadPosition> {
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.xml
deleted file mode 100644
index 5c46518..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/mapper/LoadPositionMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.mapper.LoadPositionMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/LoadPositionService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/LoadPositionService.java
deleted file mode 100644
index a1df98c..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/LoadPositionService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.mes.loadposition.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.loadposition.entity.LoadPosition;
-
-
-import java.util.List;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface LoadPositionService extends IService<LoadPosition> {
-
- List<LoadPosition> findList(LoadPosition params);
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/impl/LoadPositionServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/impl/LoadPositionServiceImpl.java
deleted file mode 100644
index 92bae55..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/loadposition/service/impl/LoadPositionServiceImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.mes.loadposition.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.loadposition.entity.LoadPosition;
-
-import com.mes.loadposition.service.LoadPositionService;
-import com.mes.loadposition.mapper.LoadPositionMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-public class LoadPositionServiceImpl extends ServiceImpl<LoadPositionMapper, LoadPosition> implements LoadPositionService {
-
- @Autowired
- private LoadPositionMapper loadPositionMapper;
-
- @Override
- public List<LoadPosition> findList(LoadPosition params){
- LambdaQueryWrapper<LoadPosition> query = Wrappers.lambdaQuery(LoadPosition.class);
- return loadPositionMapper.selectList(query);
- }
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
index d95f7b7..46e7155 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java
@@ -1,16 +1,15 @@
package com.mes.rawglassdetails.controller;
-import com.mes.entity.request.GeneralRequest;
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
-import com.mes.userinfo.entity.vo.SysUserVO;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* 鍓嶇鎺у埗鍣�
@@ -22,14 +21,23 @@
@RequestMapping("/rawGlassStorageDetails")
public class RawGlassStorageDetailsController {
- @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ @Autowired
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+
+ @ApiOperation("鍏ュ簱璇锋眰")
+ @PostMapping("/warehousingRequest")
+ public Result<String> warehousingRequest(int leftingStation) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.warehousingRequest(leftingStation));
+ }
@ApiOperation("鍘熺墖鍏ュ簱")
@PostMapping("/patternWarehousing")
public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
return Result.build(
- 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
}
+
@ApiOperation("鏇存柊鍓╀綑鏁伴噺")
@PostMapping("/updateQuantity")
public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
@@ -46,4 +54,12 @@
public Result<Object> outWarehousing(@RequestBody Long slotId) {
return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
}
+
+
+ @ApiOperation("鍑哄簱璇锋眰")
+ @PostMapping("/outWarehousingRequest")
+ public Result<String> outWarehousingRequest(int leftingStation) {
+ return Result.build(
+ 200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.outWarehousingRequest(leftingStation));
+ }
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
index 2a339bb..62fe8b6 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/RawGlassStorageDetails.java
@@ -10,7 +10,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author wf
@@ -22,54 +22,48 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
-
/**
* 璁惧id
*/
private Integer deviceId;
-
/**
* 鏍煎瓙id
*/
- private Integer slotId;
-
+ private Integer slot;
+ /**
+ * 鏋跺瓙淇℃伅
+ */
+ private Integer shelf;
/**
* 鍘熺墖瀹�
*/
private Double patternWidth;
-
/**
* 鍘熺墖楂�
*/
private Double patternHeight;
-
/**
* 鍘熺墖鍘氬害
*/
private Double patternThickness;
-
/**
* 鑶滅郴
*/
private String filmsId;
-
/**
* 鍒涘缓鏃堕棿
*/
private Date createTime;
-
/**
* 鍓╀綑鏁伴噺
*/
private Integer remainQuantity;
-
-
/**
* 鐘舵��
*/
- private int state;
+ private Integer state;
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java
index 36204b8..48f298b 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/entity/request/RawGlassRequest.java
@@ -1,6 +1,5 @@
package com.mes.rawglassdetails.entity.request;
-import com.mes.userinfo.entity.vo.SysUserVO;
import lombok.Data;
/**
@@ -9,7 +8,7 @@
* @Description:
*/
@Data
-public class RawGlassRequest extends SysUserVO {
+public class RawGlassRequest {
/**
* 鍘熺墖瀹�
@@ -34,10 +33,10 @@
/**
* 鍓╀綑鏁伴噺
*/
- private String remainQuantity;
+ private Integer remainQuantity;
/**
* 鏍呮牸鍙�
*/
- private String slotId;
+ private String slot;
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java
index 46441d4..f61e2c5 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/RawGlassStorageDetailsMapper.java
@@ -23,5 +23,5 @@
* @param state
* @return
*/
- List<Integer> listBySlotState(@Param("leftingStation") List<String> liftingStation, @Param("state") List<Integer> state);
+ List<Integer> listBySlotState(@Param("leftingStation") List<Integer> liftingStation, @Param("state") List<Integer> state);
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageStationMapper.xml
deleted file mode 100644
index ba48273..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageStationMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="glassdetails.mapper.RawGlassStorageStationMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml
deleted file mode 100644
index e057e23..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageTaskMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="glassdetails.mapper.RawGlassStorageTaskMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
index cd7ad71..3fea420 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/RawGlassStorageDetailsService.java
@@ -14,15 +14,12 @@
List<RawGlassStorageDetails> selectDetails();
-
/**
* 鍒犻櫎琛� 鍏堝湪杩欓噷鍒� 鐒跺悗鐐归偅涓浉鍏抽棶棰�
*
* @return boolean
*/
boolean deleteRawGlassStorageDetails(String device_id);
-
-
/**
* 鍘熺墖鍏ュ簱
@@ -38,5 +35,11 @@
String outWarehousing(Long slotId);
- List<Integer> listBySlotState(List<String> liftingStation, List<Integer> state);
+ List<Integer> listBySlotState(List<Integer> liftingStation, List<Integer> state);
+
+ String warehousingRequest(int leftingStation);
+
+ String outWarehousingRequest(int leftingStation);
+
+ boolean generateTask(int startSlot, int endSlot, int shelf, int patternQuantity, int taskType);
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
index e608d50..699cbf6 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -1,5 +1,6 @@
package com.mes.rawglassdetails.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,9 +9,13 @@
import com.mes.rawglassdetails.entity.request.RawGlassRequest;
import com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
@@ -22,6 +27,10 @@
@Service
@Slf4j
public class RawGlassStorageDetailsServiceImpl extends ServiceImpl<RawGlassStorageDetailsMapper, RawGlassStorageDetails> implements RawGlassStorageDetailsService {
+
+ @Autowired
+ RawGlassStorageTaskService rawGlassStorageTaskService;
+
@Override
public boolean deleteRawGlassStorageDetails(String device_id) {
QueryWrapper<RawGlassStorageDetails> queryWrapper = new QueryWrapper<>();
@@ -40,13 +49,42 @@
@Override
- public String patternWarehousing(RawGlassRequest request) {
- //todo:鍘熺墖淇℃伅瀛樺叆璇︽儏琛�
+ public String warehousingRequest(int leftingStation) {
+ RawGlassStorageDetails storageDetails = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .in(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN_ALL));
+ if (null != storageDetails) {
+ log.info("褰撳墠鍚婅浣嶆湁鏋跺瓙锛岀粨鏉熸湰鍦板叆搴撹姹�");
+ return "fail";
+ }
+ List<Integer> shelfList = listBySlotState(Const.RAW_GLASS_DEVICE, Const.RAW_GLASS_STATE_IN_ALL);
+ if (CollectionUtils.isEmpty(shelfList)) {
+ log.info("褰撳墠宸ヤ綅涓嶅瓨鍦ㄥ彲鐢ㄧ殑绌烘灦瀛�");
+ return "fail";
+ }
+ Integer shelf = shelfList.get(0);
+ log.info("鐢熸垚浠诲姟");
+ generateTask(shelf, leftingStation, shelf, 0, Const.RAW_GLASS_TASK_TYPE_IN_REQUEST);
+ //鐢熸垚涓�鏉¤鎯呮暟鎹� 浠呰褰曟灦瀛愮姸鎬�
RawGlassStorageDetails details = new RawGlassStorageDetails();
- BeanUtils.copyProperties(request, details);
- details.setState(Const.GLASS_STATE_IN);
- details.setCreateTime(new Date());
+ details.setSlot(shelf);
+ details.setShelf(shelf);
+ details.setState(Const.RAW_GLASS_STATE_RUNNING);
save(details);
+ return "success";
+ }
+
+ @Override
+ public String patternWarehousing(RawGlassRequest request) {
+ RawGlassStorageDetails glassStorageDetails = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .eq(RawGlassStorageDetails::getSlot, request.getSlot()));
+ if (null == glassStorageDetails) {
+ log.info("褰撳墠鍚婅浣嶆病鏈夋灦瀛�");
+ }
+ //todo:鍘熺墖淇℃伅瀛樺叆璇︽儏琛�
+ BeanUtils.copyProperties(request, glassStorageDetails);
+ log.info("瑕嗙洊鍚庡緱鍒扮殑宸ヤ綅璇︽儏淇℃伅涓猴細{}", glassStorageDetails);
+ updateById(glassStorageDetails);
return "success";
}
@@ -55,27 +93,71 @@
update(
new LambdaUpdateWrapper<RawGlassStorageDetails>()
.set(RawGlassStorageDetails::getRemainQuantity, request.getRemainQuantity())
- .eq(RawGlassStorageDetails::getSlotId, request.getSlotId()));
+ .eq(RawGlassStorageDetails::getSlot, request.getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
return "success";
}
@Override
public String deleteWarehousing(Long slotId) {
- update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlotId, slotId)
- .set(RawGlassStorageDetails::getState, Const.GLASS_STATE_OUT));
+ update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
return "success";
}
@Override
public String outWarehousing(Long slotId) {
- update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlotId, slotId)
- .set(RawGlassStorageDetails::getState, Const.GLASS_STATE_OUT_ING));
+ update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_WAIT_OUT));
+ //鐢熸垚涓�鏉¤鎯呮暟鎹� 浠呰褰曟灦瀛愮姸鎬�
return "success";
}
@Override
- public List<Integer> listBySlotState(List<String> liftingStation, List<Integer> state) {
+ public List<Integer> listBySlotState(List<Integer> liftingStation, List<Integer> state) {
return baseMapper.listBySlotState(liftingStation, state);
}
+
+ @Override
+ public String outWarehousingRequest(int leftingStation) {
+ //瀵瑰簲宸ヤ綅鏄惁鏈夌┖鏋跺瓙
+ RawGlassStorageDetails details = getOne(new LambdaQueryWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(RawGlassStorageDetails::getSlot, leftingStation));
+ if (null == details) {
+ log.info("鏃犵┖鏋跺瓙锛岀粨鏉熸湰鍦板嚭鐗囪姹�");
+ return "fail";
+ }
+ //鐢熸垚涓�鏉¤鎯呮暟鎹� 浠呰褰曟灦瀛愮姸鎬�
+ update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, details.getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+ generateTask(leftingStation, details.getShelf(), details.getShelf(), details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT_REQUEST);
+ return "success";
+ }
+
+ /**
+ * 鐢熸垚鍘熺墖浠撳偍浠诲姟
+ *
+ * @param startSlot
+ * @param endSlot
+ * @param patternQuantity
+ * @param taskType
+ * @return
+ */
+ @Override
+ public boolean generateTask(int startSlot, int endSlot, int shelf, int patternQuantity, int taskType) {
+ RawGlassStorageTask task = RawGlassStorageTask.builder()
+ .startSlot(startSlot)
+ .endSlot(endSlot)
+ .patternQuantity(patternQuantity)
+ .taskType(taskType)
+ .taskState(Const.RAW_GLASS_TASK_NEW)
+ .shelf(shelf)
+ .createTime(new Date()).build();
+ return rawGlassStorageTaskService.save(task);
+ }
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
index e721e70..b94c59a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/controller/RawGlassStorageStationController.java
@@ -29,9 +29,6 @@
} else {
return Result.build(200, "绂佺敤", result);
}
-
-
-
}
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
index 8f1db02..cb0484e 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassstation/entity/RawGlassStorageStation.java
@@ -17,33 +17,24 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 璁惧id
*/
private Integer deviceId;
-
/**
* 鏍呮牸鍙�
*/
private Integer slot;
-
+ /**
+ * 鏍呮牸鍙�
+ */
+ private Integer shelf;
/**
* 鍚敤鏍囪
*/
private String enableState;
-
- /**
- * 寮�濮嬪伐浣�
- */
- private Integer startSlot;
-
- /**
- * 鐩爣宸ヤ綅
- */
- private Integer endSlot;
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
index 5346dee..dbef25a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java
@@ -27,32 +27,30 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
-
/**
* 璧峰鏍煎瓙
*/
- private Integer originateSlot;
-
+ private Integer startSlot;
/**
* 鐩爣鏍煎瓙
*/
private Integer endSlot;
-
+ /**
+ * 鏋跺瓙鍙�
+ */
+ private Integer shelf;
/**
* 鍘熺墖鏁伴噺
*/
private Integer patternQuantity;
-
/**
* 浠诲姟绫诲瀷
*/
private Integer taskType;
-
/**
* 浠诲姟鐘舵��
*/
private Integer taskState;
-
/**
* 鍒涘缓鏃堕棿
*/
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/controller/RawUsageController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/controller/RawUsageController.java
deleted file mode 100644
index 1518f75..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/controller/RawUsageController.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.mes.rawusage.controller;
-
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.web.bind.annotation.*;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.rawusage.service.RawUsageService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import java.util.List;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/rawUsage")
-@Api(tags = " 鎺у埗鍣�")
-public class RawUsageController {
-
- @Autowired
- private RawUsageService rawUsageService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody RawUsage params) {
- List<RawUsage> result = rawUsageService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- RawUsage rawUsage = rawUsageService.getById(id);
- return Result.success(rawUsage);
- }
-
- /**
- * 鏂板
- *
- * @param rawUsage
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody RawUsage rawUsage) {
- boolean result = rawUsageService.save(rawUsage);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param rawUsage
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping("/updaterawUsage")
- public Result updaterawUsage(@RequestBody RawUsage rawUsage) {
- boolean result = rawUsageService.updateById(rawUsage);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @PostMapping("/id")
- public Result delete(@RequestBody RawUsage rawUsage) {
- rawUsageService.updateRawPackageAndStorageRack(rawUsage);
- return Result.success();
- }
-
- @ApiOperation(value = "鍏ュ簱", notes = "鍏ュ簱")
- @PostMapping("/inStorage")
- public Result inStorage(@RequestBody RawUsageAndShelfRack rawUsage) {
- rawUsageService.inStorage(rawUsage);
- return Result.success();
- }
-
- @ApiOperation(value = "鍑哄簱", notes = "鍑哄簱")
- @PostMapping("/outStorage")
- public Result outStorage(@RequestBody RawUsageAndShelfRack rawUsage) {
- rawUsageService.outStorage(rawUsage);
- return Result.success();
- }
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
deleted file mode 100644
index de0b617..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/entity/RawUsage.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.mes.rawusage.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.stereotype.Component;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Data
-@Component
-@EqualsAndHashCode(callSuper = false)
-@TableName("raw_usage")
-@ApiModel(value = "RawUsage", description = " ")
-public class RawUsage implements Serializable{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鐜荤拑绫诲瀷
- */
- @ApiModelProperty("鐜荤拑绫诲瀷")
- private String rawType;
-
- /**
- * 瀹藉害
- */
- @ApiModelProperty("瀹藉害")
- private Float rawWidth;
-
- /**
- * 楂樺害
- */
- @ApiModelProperty("楂樺害")
- private Float rawHeight;
-
- /**
- * 鍘氬害
- */
- @ApiModelProperty("鍘氬害")
- private Float rawThickness;
-
- /**
- * 鐘舵��
- */
- @ApiModelProperty("鐘舵��")
- private String state;
-
- /**
- * 棰滆壊
- */
- @ApiModelProperty("棰滆壊")
- private String color;
-
- /**
- * 鎬绘暟閲�
- */
- @ApiModelProperty("鎬绘暟閲�")
- private Integer pieces;
-
- /**
- * 鍓╀綑鏁伴噺
- */
- @ApiModelProperty("鍓╀綑鏁伴噺")
- private Integer leftPieces;
-
- /**
- * 鐗╂枡缂栫爜
- */
- @ApiModelProperty("鐗╂枡缂栫爜")
- private String qrcode;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date createTime;
-
- /**
- * 鐢熶骇鏃ユ湡
- */
- @ApiModelProperty("鐢熶骇鏃ユ湡")
- private Date productionTime;
-
- /**
- * 鎵规鍙�
- */
- @ApiModelProperty("鎵规鍙�")
- private String batchId;
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.java
deleted file mode 100644
index 5eb15ee..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.mes.rawusage.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.rawusage.entity.RawUsage;
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-
-public interface RawUsageMapper extends BaseMapper<RawUsage> {
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.xml
deleted file mode 100644
index e276227..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/mapper/RawUsageMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.rawusage.mapper.RawUsageMapper">
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/RawUsageService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/RawUsageService.java
deleted file mode 100644
index 900e4a1..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/RawUsageService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mes.rawusage.service;
-
-import com.mes.rawusage.entity.RawUsage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-
-import java.util.List;
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface RawUsageService extends IService<RawUsage> {
-
- List<RawUsage> findList(RawUsage params);
-
- /**
- * @param raw
- * 淇敼
- */
- void updateRawPackageAndStorageRack(RawUsage raw);
-
- /**
- * @param raw
- * 鍏ュ簱
- */
- void inStorage(RawUsageAndShelfRack raw);
-
-
- /**
- * @param raw
- * 鍑哄簱
- */
- void outStorage(RawUsageAndShelfRack raw);
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/impl/RawUsageServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/impl/RawUsageServiceImpl.java
deleted file mode 100644
index 69f120f..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawusage/service/impl/RawUsageServiceImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.mes.rawusage.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.rawusage.mapper.RawUsageMapper;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.rawusage.service.RawUsageService;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.shelfrack.mapper.ShelfRackMapper;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.mapper.StorageTaskMapper;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.lang.reflect.InvocationTargetException;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import static cn.hutool.core.date.DateTime.now;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-public class RawUsageServiceImpl extends ServiceImpl<RawUsageMapper, RawUsage> implements RawUsageService {
-
- @Autowired
- private RawUsageMapper rawUsageMapper;
- @Autowired
- private ShelfRackMapper shelfRackMapper;
- @Autowired
- private StorageTaskMapper storageTaskMapper;
-
- @Override
- public List<RawUsage> findList(RawUsage params){
- LambdaQueryWrapper<RawUsage> query = Wrappers.lambdaQuery(RawUsage.class);
- return rawUsageMapper.selectList(query);
- }
-
- @Override
- public void updateRawPackageAndStorageRack(RawUsage raw) {
- // Step 1: 鏌ヨraw_package_id
- LambdaQueryWrapper<ShelfRack> queryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getId());
- ShelfRack shelfRack = shelfRackMapper.selectOne(queryWrapper);
- if (shelfRack == null) {
- throw new RuntimeException("鏈壘鍒颁笌鎸囧畾璐ф灦ID鍏宠仈鐨勫師鏂欏寘淇℃伅");
- }
-
-
- // Step 2: 鏇存柊raw_package琛�
- RawUsage rawUsage=new RawUsage();
-
- rawUsage.setState("绌洪棽");
- rawUsage.setId(shelfRack.getRawPackageId());
- rawUsageMapper.updateById(rawUsage);
-
- // Step 3: 鏇存柊storage_rack琛�
-
- ShelfRack rack = new ShelfRack();
- rack.setState("绌洪棽");
- rack.setRawPackageId(null); // 璁剧疆RawPackageId涓虹壒瀹氱殑绌哄�硷紝渚嬪0
- LambdaQueryWrapper<ShelfRack> queryWrapper2 = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getId());
- shelfRackMapper.update(rack, queryWrapper2);
-
-
- }
-
-
-
-
-
- @Override
- public void inStorage(RawUsageAndShelfRack raw) {
- RawUsage rawPackage = new RawUsage();
- BeanUtils.copyProperties(raw,rawPackage);
- rawPackage.setRawType(raw.getRawThickness() + raw.getColor());
- rawPackage.setState("浣跨敤涓�");
- rawPackage.setLeftPieces(rawPackage.getPieces());
- rawUsageMapper.insert(rawPackage);
-
- // 鏇存柊鏋惰〃
- ShelfRack rack = new ShelfRack();
- rack.setState("浣跨敤涓�");
- rack.setRawPackageId(rawPackage.getId()); // 璁剧疆RawPackageId涓虹壒瀹氱殑绌哄�硷紝渚嬪0
- LambdaQueryWrapper<ShelfRack> queryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getNumber());
- shelfRackMapper.update(rack, queryWrapper);
- StorageTask storageTask=new StorageTask();
- storageTask.setTaskState("绛夊緟涓�");
- storageTask.setTaskType("浠庝粨浣嶅埌鍚婅浣�");
- storageTask.setLoadRack(raw.getLoadRack());
- storageTask.setShelfRack(raw.getNumber());
- storageTask.setRouteGroup(1);
- storageTask.setStartTime(now());
- storageTask.setFinishTime(now());
- insertTask(storageTask);
-
-
- }
-
-
- @Override
- public void outStorage(RawUsageAndShelfRack raw) {
- ShelfRack rack = new ShelfRack();
- rack.setState("绛夊緟鍑哄簱");
- rack.setRawPackageId(null); // 璁剧疆RawPackageId涓虹壒瀹氱殑绌哄�硷紝渚嬪0
- LambdaQueryWrapper<ShelfRack> queryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, raw.getNumber());
- shelfRackMapper.update(rack, queryWrapper);
-
-
- StorageTask storageTask=new StorageTask();
- storageTask.setTaskState("绛夊緟涓�");
- storageTask.setTaskType("浠庝粨浣嶅埌鍚婅浣�");
- storageTask.setLoadRack(raw.getLoadRack());
- storageTask.setShelfRack(raw.getNumber());
- storageTask.setRouteGroup(1);
- storageTask.setStartTime(now());
- storageTask.setFinishTime(now());
- insertTask(storageTask);
- }
-
-
- public void insertTask(StorageTask storageTask) {
- storageTaskMapper.insert(storageTask);
-
- }
-
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
deleted file mode 100644
index 91ad4a7..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/controller/ShelfRackController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.mes.shelfrack.controller;
-
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.web.bind.annotation.*;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.service.ShelfRackService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/shelfRack")
-@Api(tags = " 鎺у埗鍣�")
-public class ShelfRackController {
-
- @Autowired
- private ShelfRackService shelfRackService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody ShelfRack params) {
- List<ShelfRack> result = shelfRackService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- ShelfRack shelfRack = shelfRackService.getBaseMapper().selectById(id);
- return Result.success(shelfRack);
- }
-
- /**
- * 鏂板
- *
- * @param shelfRack
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody ShelfRack shelfRack) {
- boolean result = shelfRackService.save(shelfRack);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param shelfRack
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PutMapping
- public Result update( @RequestBody ShelfRack shelfRack) {
- boolean result = shelfRackService.updateById(shelfRack);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @DeleteMapping("/{id}")
- public Result delete(@PathVariable("id") Long id) {
- int result = shelfRackService.getBaseMapper().deleteById(id);
- return Result.success(result);
- }
-
-
- @ApiOperation(value = "鏋跺瓙琛ㄦ牸鏌ヨ",notes = "鏋跺瓙琛ㄦ牸鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/findshelfrack")
- public Result findshelfrack() {
- List<RawUsageAndShelfRack> result = shelfRackService.selectshelf_rack();
- return Result.success(result);
- }
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
deleted file mode 100644
index f01efbf..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/ShelfRack.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.mes.shelfrack.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.stereotype.Component;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Data
-@Component
-@EqualsAndHashCode(callSuper = false)
-@TableName("shelf_rack")
-@ApiModel(value = "ShelfRack", description = " ")
-public class ShelfRack implements Serializable{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鏋跺瓙缂栧彿
- */
- @ApiModelProperty("鏋跺瓙缂栧彿")
- private String number;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String state;
-
- /**
- * 鍖呭彿缂栧彿
- */
- @ApiModelProperty("鍖呭彿缂栧彿")
- private Integer rawPackageId;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty("淇敼鏃堕棿")
- private Date modTime;
-
- /**
- * 鍚敤鐘舵��
- */
- @ApiModelProperty("鍚敤鐘舵��")
- private String enableState;
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/request/RawUsageAndShelfRack.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/request/RawUsageAndShelfRack.java
deleted file mode 100644
index 2af2aca..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/entity/request/RawUsageAndShelfRack.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.mes.shelfrack.entity.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-
-@EqualsAndHashCode(callSuper = false)
-public class RawUsageAndShelfRack {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty("ID")
- private Integer id;
-
- @ApiModelProperty("鐜荤拑绫诲瀷")
- private String rawType;
-
- @ApiModelProperty("瀹藉害")
- private Float rawWidth;
-
- @ApiModelProperty("楂樺害")
- private Float rawHeight;
-
- @ApiModelProperty("鍘氬害")
- private Float rawThickness;
-
- @ApiModelProperty("棰滆壊")
- private String color;
-
- @ApiModelProperty("鎬绘暟閲�")
- private Integer pieces;
-
- @ApiModelProperty("鍓╀綑鏁伴噺")
- private Integer leftPieces;
-
- @ApiModelProperty("鐗╂枡缂栫爜")
- private String qrcode;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
-
- private Date createTime;
-
-
-
- private Date productionTime;
-
- @ApiModelProperty("鎵规鍙�")
- private String batchId;
-
- @ApiModelProperty("鏋跺瓙缂栧彿")
- private String number;
-
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String state;
-
- @ApiModelProperty("鍖呭彿缂栧彿")
- private Integer rawPackageId;
-
-
- private Date modTime;
-
- @ApiModelProperty("鍚敤鐘舵��")
- private String enableState;
-
- @ApiModelProperty("涓婄墖浣嶇紪鍙�")
- private String loadRack;
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
deleted file mode 100644
index 87bbbfd..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/mapper/ShelfRackMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mes.shelfrack.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-
-public interface ShelfRackMapper extends MPJBaseMapper<ShelfRack> {
-
-
- List<RawUsageAndShelfRack> selectshelf_rack();
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
deleted file mode 100644
index 39102e0..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.shelfrack.service;
-
-import com.mes.shelfrack.entity.ShelfRack;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface ShelfRackService extends IService<ShelfRack> {
-
- List<ShelfRack> findList(ShelfRack params);
-
- List<RawUsageAndShelfRack> selectshelf_rack();
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
deleted file mode 100644
index 8171037..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/impl/ShelfRackServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.mes.shelfrack.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.mes.common.config.Const;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.shelfrack.mapper.ShelfRackMapper;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.service.ShelfRackService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-public class ShelfRackServiceImpl extends ServiceImpl<ShelfRackMapper, ShelfRack> implements ShelfRackService {
-
- @Autowired
- private ShelfRackMapper shelfRackMapper;
-
- @Override
- public List<ShelfRack> findList(ShelfRack params){
- LambdaQueryWrapper<ShelfRack> query = Wrappers.lambdaQuery(ShelfRack.class);
- return shelfRackMapper.selectList(query);
- }
-
-//
-// public void yourMethodName() {
-// List<Map<String, Object>> resultList = shelfRackMapper.selectMaps(
-// new LambdaQueryWrapper<ShelfRack>()
-// .select(ShelfRack::getNumber, RawUsage::getRawType, RawUsage::getRawWidth,
-// RawUsage::getRawHeight, RawUsage::getRawThickness, ShelfRack::getModTime,
-// ShelfRack::getEnableState, RawUsage::getPieces, RawUsage::getLeftPieces,
-// "(datediff(now(), raw_usage.create_time)) as rukuTime",
-// "(concat(if(ROUND(raw_usage.left_pieces / #{param1} * 100, 0) < 20, 20, ROUND(raw_usage.left_pieces / #{param1} * 100, 0)), '%')) as bfb")
-// .leftJoin(RawUsage.class, RawUsage::getId, ShelfRack::getRawPackageId)
-// .orderByAsc(ShelfRack::getNumber)
-// );
-//
-// // Process resultList as needed
-// }
-
-
-
- @Override
- public List<RawUsageAndShelfRack> selectshelf_rack() {
- return baseMapper.selectshelf_rack();
- }
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
deleted file mode 100644
index 0157fee..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/controller/StorageTaskController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.mes.storagetask.controller;
-
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-import com.mes.utils.Result;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-import org.springframework.web.bind.annotation.*;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.service.StorageTaskService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@RestController
-@RequestMapping("/api/storageTask")
-@Api(tags = " 鎺у埗鍣�")
-public class StorageTaskController {
-
- @Autowired
- private StorageTaskService storageTaskService;
-
- /**
- * 鍒楄〃鏌ヨ
- *
- * @param params
- * @return
- */
- @ApiOperation(value = "鍒楄〃鏌ヨ",notes = "鍒楄〃鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @PostMapping("/findList")
- public Result findList(@RequestBody StorageTask params) {
- List<StorageTask> result = storageTaskService.findList(params);
- return Result.success(result);
- }
-
- /**
- * 鏌ヨ
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鏌ヨ", notes = "鏌ヨ璇︽儏")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/{id}")
- public Result findById(@PathVariable("id") Long id) {
- StorageTask storageTask = storageTaskService.getBaseMapper().selectById(id);
- return Result.success(storageTask);
- }
-
- /**
- * 鏂板
- *
- * @param storageTask
- * @return
- */
- @ApiOperation(value = "鏂板", notes = "鏂板鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PostMapping
- public Result insert( @RequestBody StorageTask storageTask) {
- boolean result = storageTaskService.save(storageTask);
- return Result.success(result);
- }
-
- /**
- * 淇敼
- *
- * @param storageTask
- * @return
- */
- @ApiOperation(value = "淇敼", notes = "淇敼鏁版嵁")
- @ApiResponses({@ApiResponse(code = 200, message = "鎿嶄綔鎴愬姛")})
- @PutMapping
- public Result update( @RequestBody StorageTask storageTask) {
- boolean result = storageTaskService.updateById(storageTask);
- return Result.success(result);
- }
-
- /**
- * 鍒犻櫎
- *
- * @param id
- * @return
- */
- @ApiOperation(value = "鍒犻櫎", notes = "鍒犻櫎鏁版嵁")
- @DeleteMapping("/{id}")
- public Result delete(@PathVariable("id") Long id) {
- int result = storageTaskService.getBaseMapper().deleteById(id);
- return Result.success(result);
- }
-
-
- @ApiOperation(value = "浠诲姟鏌ヨ",notes = "浠诲姟鏌ヨ",produces = "application/json")
- @ApiResponses({@ApiResponse(code = 200, message = "鏌ヨ鎴愬姛")})
- @GetMapping("/findTasks")
- public Result findLatestTasks() {
- List<StorageTaskRequest> result = storageTaskService.Tasks();
- return Result.success(result);
- }
-
-
-
- @ApiOperation(value = "浠诲姟鎿嶄綔", notes = "浠诲姟鎿嶄綔")
- @PostMapping("/taskUpdate")
- public Result taskUpdate(@RequestBody Map<String, Object> storageTaskMap) {
-
- StorageTask task = new StorageTask();
- task.setType((String) storageTaskMap.get("Type")); // 鍋囪Type鏄瓨鍌ㄥ湪Map涓殑涓�涓敭
- task.setId((int) storageTaskMap.get("id"));
- storageTaskService.taskUpdate(task);
- return Result.success();
- }
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
deleted file mode 100644
index e037a41..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/StorageTask.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.mes.storagetask.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
-import org.springframework.stereotype.Component;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Data
-@Component
-@EqualsAndHashCode(callSuper = false)
-@TableName("storage_task")
-@ApiModel(value = "StorageTask", description = " ")
-public class StorageTask implements Serializable{
-
- private static final long serialVersionUID=1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty("浠诲姟绫诲瀷")
- private String taskType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String taskState;
-
- /**
- * 浠撳偍鏋跺彿
- */
- @ApiModelProperty("浠撳偍鏋跺彿")
- private String shelfRack;
-
- /**
- * 涓婄墖浣嶇紪鍙�
- */
- @ApiModelProperty("涓婄墖浣嶇紪鍙�")
- private String loadRack;
-
- /**
- * 绾胯矾
- */
- @ApiModelProperty("绾胯矾")
- private Integer routeGroup;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date startTime;
-
- /**
- * 瀹屾垚鏃堕棿
- */
- @ApiModelProperty("瀹屾垚鏃堕棿")
- private Date finishTime;
-
- @ApiModelProperty("鍓嶇浠诲姟绫诲瀷")
- private String Type;
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/request/StorageTaskRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/request/StorageTaskRequest.java
deleted file mode 100644
index 9c7dd09..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/entity/request/StorageTaskRequest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.mes.storagetask.entity.request;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class StorageTaskRequest {
-
-
- private static final long serialVersionUID = 1L;
-
- /**
- *
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty("浠诲姟绫诲瀷")
- private String taskType;
-
-
-
- @ApiModelProperty("鍓嶇浠诲姟绫诲瀷")
- private String Type;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty("宸ヤ綔鐘舵��")
- private String taskState;
-
- /**
- * 浠撳偍鏋跺彿
- */
- @ApiModelProperty("浠撳偍鏋跺彿")
- private String shelfRack;
-
- /**
- * 涓婄墖浣嶇紪鍙�
- */
- @ApiModelProperty("涓婄墖浣嶇紪鍙�")
- private String loadRack;
-
- /**
- * 绾胯矾
- */
- @ApiModelProperty("绾胯矾")
- private Integer routeGroup;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty("鍒涘缓鏃堕棿")
- private Date startTime;
-
- /**
- * 瀹屾垚鏃堕棿
- */
- @ApiModelProperty("瀹屾垚鏃堕棿")
- private Date finishTime;
-
- @ApiModelProperty("棰滆壊")
- private String color;
-
- @ApiModelProperty("鍘氬害")
- private Float rawThickness;
-
-
-}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java
deleted file mode 100644
index ca5a765..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/mapper/StorageTaskMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mes.storagetask.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- *
- * @author system
- * @since 2024-07-09 14:51:27
- *
- */
-@Repository
-public interface StorageTaskMapper extends BaseMapper<StorageTask> {
-
-
- List<StorageTaskRequest> selectTasks();
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
deleted file mode 100644
index b46250b..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mes.storagetask.service;
-
-import com.mes.storagetask.entity.StorageTask;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-public interface StorageTaskService extends IService<StorageTask> {
-
- List<StorageTask> findList(StorageTask params);
-
- Map<String, Optional<StorageTask>> findLatestTasks();
-
- List<StorageTaskRequest> Tasks();
-
- void taskUpdate(StorageTask storageTask);
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
deleted file mode 100644
index 876d202..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.mes.storagetask.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.mes.loadposition.entity.LoadPosition;
-import com.mes.loadposition.mapper.LoadPositionMapper;
-import com.mes.rawusage.entity.RawUsage;
-import com.mes.rawusage.mapper.RawUsageMapper;
-import com.mes.shelfrack.entity.ShelfRack;
-import com.mes.shelfrack.entity.request.RawUsageAndShelfRack;
-import com.mes.shelfrack.mapper.ShelfRackMapper;
-import com.mes.storagetask.entity.request.StorageTaskRequest;
-import com.mes.storagetask.mapper.StorageTaskMapper;
-import com.mes.storagetask.entity.StorageTask;
-import com.mes.storagetask.service.StorageTaskService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * @author system
- * @since 2024-07-09 14:51:27
- */
-@Service
-@Slf4j
-public class StorageTaskServiceImpl extends ServiceImpl<StorageTaskMapper, StorageTask> implements StorageTaskService {
-
- @Autowired
- private StorageTaskMapper storageTaskMapper;
- @Autowired
- private LoadPositionMapper loadPositionMapper;
- @Autowired
- private ShelfRackMapper shelfRackMapper;
- @Autowired
- private RawUsageMapper rawUsageMapper;
-
-
- @Override
- public List<StorageTask> findList(StorageTask params){
- LambdaQueryWrapper<StorageTask> query = Wrappers.lambdaQuery(StorageTask.class);
- return storageTaskMapper.selectList(query);
- }
-
-
- public Map<String, Optional<StorageTask>> findLatestTasks() {
- Map<String, Optional<StorageTask>> latestTasks = new HashMap<>();
-
- // 鏌ヨ鏈�鏂扮殑宸插畬鎴愪换鍔�
- LambdaQueryWrapper<StorageTask> completedWrapper = new LambdaQueryWrapper<>();
- completedWrapper.eq(StorageTask::getTaskType, "宸插畬鎴�")
- .orderByDesc(StorageTask::getId)
- .last("LIMIT 1");
- Optional<StorageTask> latestCompletedTask = Optional.ofNullable(storageTaskMapper.selectOne(completedWrapper));
- latestTasks.put("宸插畬鎴�", latestCompletedTask);
-
- // 鏌ヨ鏈�鏂扮殑绛夊緟涓换鍔�
- LambdaQueryWrapper<StorageTask> pendingWrapper = new LambdaQueryWrapper<>();
- pendingWrapper.eq(StorageTask::getTaskType, "绛夊緟涓�")
- .orderByDesc(StorageTask::getId);
- Optional<StorageTask> latestPendingTask = Optional.ofNullable(storageTaskMapper.selectOne(pendingWrapper));
- latestTasks.put("绛夊緟涓�", latestPendingTask);
- log.info(latestTasks+"");
- return latestTasks;
- }
-
-
- @Override
- public List<StorageTaskRequest> Tasks() {
- return baseMapper.selectTasks();
- }
-
-
-
- @Override
- public void taskUpdate(StorageTask request) {
- Integer taskId = request.getId();
- String taskType = request.getTaskType();
- String Type = request.getType();
- String taskState = request.getTaskState();
- String shelfRack = request.getShelfRack();
- String loadRack = request.getLoadRack();
-
- if ("閲嶆柊寮�濮�".equals(Type)) {
- StorageTask storageTask = new StorageTask();
- storageTask.setTaskState("绛夊緟涓�");
- LambdaQueryWrapper<StorageTask> queryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.update(request,queryWrapper);
- } else if ("瀹屾垚".equals(Type)) {
- StorageTask existingTask = storageTaskMapper.selectById(taskId);
- if (existingTask != null && "姝ｅ湪宸ヤ綔".equals(existingTask.getTaskState())) {
- if ("浠庝粨浣嶅埌涓婄墖浣�".equals(taskType) || "浠庝粨浣嶅埌鍚婅浣�".equals(taskType)) {
- LoadPosition loadPosition = new LoadPosition();
- loadPosition.setState("姝ｅ湪浣跨敤");
- loadPosition.setStorageTaskId(request.getId());
- LambdaQueryWrapper<LoadPosition> queryWrapper = Wrappers.lambdaQuery(LoadPosition.class)
- .eq(LoadPosition::getNumber, request.getLoadRack());
- loadPositionMapper.update(loadPosition, queryWrapper);
- StorageTask storageTask = new StorageTask();
- storageTask.setTaskState("姝ｅ湪浣跨敤");
- LambdaQueryWrapper<StorageTask> StorageTaskqueryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.update(request,StorageTaskqueryWrapper);
- } else if ("浠庝笂鐗囦綅鍒颁粨浣�".equals(taskType)) {
- LoadPosition loadPosition = new LoadPosition();
- loadPosition.setState("浣跨敤涓�");
- loadPosition.setStorageTaskId(null);
- LambdaQueryWrapper<LoadPosition> queryWrapper = Wrappers.lambdaQuery(LoadPosition.class)
- .eq(LoadPosition::getNumber, request.getLoadRack());
- loadPositionMapper.update(loadPosition, queryWrapper);
- ShelfRack loshelfRack = new ShelfRack();
- LambdaQueryWrapper<RawUsage> RawUsagequeryWrapper = Wrappers.lambdaQuery(RawUsage.class)
- .eq(RawUsage::getId,loshelfRack.getRawPackageId());
- RawUsage RawUsage = rawUsageMapper.selectOne(RawUsagequeryWrapper);
- if(RawUsage.getLeftPieces()==0){
- loshelfRack.setState("绌洪棽");
- }else {
- loshelfRack.setState("浣跨敤涓�");
- }
- LambdaQueryWrapper<ShelfRack> loshelfRackqueryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, request.getLoadRack());
- shelfRackMapper.update(loshelfRack, loshelfRackqueryWrapper);
- } else if ("浠庡悐瑁呬綅鍒颁粨浣�".equals(taskType)) {
- LoadPosition loadPosition = new LoadPosition();
- loadPosition.setState("绌洪棽");
- loadPosition.setStorageTaskId(null);
- LambdaQueryWrapper<LoadPosition> queryWrapper = Wrappers.lambdaQuery(LoadPosition.class)
- .eq(LoadPosition::getNumber, request.getLoadRack());
- loadPositionMapper.update(loadPosition, queryWrapper);
- ShelfRack loshelfRack = new ShelfRack();
- LambdaQueryWrapper<RawUsage> RawUsagequeryWrapper = Wrappers.lambdaQuery(RawUsage.class)
- .eq(RawUsage::getId,loshelfRack.getRawPackageId());
- RawUsage RawUsage = rawUsageMapper.selectOne(RawUsagequeryWrapper);
- if(RawUsage.getLeftPieces()==1){
- loshelfRack.setEnableState("鍚敤");
- }else {
- loshelfRack.setEnableState(loshelfRack.getEnableState());
- }
- loadPosition.setState("浣跨敤涓�");
- LambdaQueryWrapper<ShelfRack> loshelfRackqueryWrapper = Wrappers.lambdaQuery(ShelfRack.class)
- .eq(ShelfRack::getNumber, request.getLoadRack());
- shelfRackMapper.update(loshelfRack, loshelfRackqueryWrapper);
- }
- StorageTask storageTask = new StorageTask();
- storageTask.setTaskState("宸插畬鎴�");
- LambdaQueryWrapper<StorageTask> StorageTaskqueryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.update(storageTask, StorageTaskqueryWrapper);
- }
- } else if ("鍒犻櫎".equals(Type)) {
-
- LambdaQueryWrapper<StorageTask> StorageTaskqueryWrapper = Wrappers.lambdaQuery(StorageTask.class)
- .eq(StorageTask::getId, request.getId());
- storageTaskMapper.delete(StorageTaskqueryWrapper);
- }
- }
-
-
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
index 53a3a66..974323a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/yiwumes?serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
index dc2fa5d..50b7b24 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@
spring:
profiles:
- active: prod
+ active: dev
application:
name: glassStorage
liquibase:
@@ -16,5 +16,12 @@
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
kangaroohy:
milo:
- enabled: false
+ enabled: true
+ primary: default
+ config:
+ default:
+ endpoint: opc.tcp://192.168.10.241:49320
+ security-policy: basic256sha256
+ username: liu
+ password: 1qaz2wsx3edc4rfv
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
similarity index 64%
rename from hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml
rename to hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
index f13945e..e9fc32e 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/mapper/xml/RawGlassStorageDetailsMapper.xml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageDetailsMapper.xml
@@ -3,17 +3,22 @@
<mapper namespace="com.mes.rawglassdetails.mapper.RawGlassStorageDetailsMapper">
<select id="listBySlotState" resultType="java.lang.Integer">
- select t.slot
- from raw_glass_storage_station t
- inner JOIN raw_glass_storage_details t1
- on t.slot = t1.slot_id and t.enable_state = 1
- and t.slot in
- <foreach collection="leftingStation" item="item" open='(' close=')' separator=','>
- #{item}
- </foreach>
- and t1.state not in
+ SELECT
+ T.SLOT
+ FROM
+ RAW_GLASS_STORAGE_STATION T
+ LEFT JOIN RAW_GLASS_STORAGE_DETAILS AS T1 ON T.DEVICE_ID = T1.DEVICE_ID
+ AND T.SLOT = T1.SLOT
+ AND T1.STATE IN
<foreach collection="state" item="item" open='(' close=')' separator=','>
#{item}
</foreach>
+ WHERE
+ T.ENABLE_STATE = 1
+ AND T.DEVICE_ID IN
+ <foreach collection="leftingStation" item="item" open='(' close=')' separator=','>
+ #{item}
+ </foreach>
+ AND T1.SLOT IS NULL
</select>
</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
index 1b7b53f..56c2e88 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
@@ -4,7 +4,7 @@
<resultMap id="baseMap" type="com.mes.rawglassdetails.entity.RawGlassStorageDetails">
<result column="device_id" property="deviceId"/>
- <result column="slot" property="slotId"/>
+ <result column="slot" property="slot"/>
<result column="pattern_width" property="patternWidth"/>
<result column="pattern_height" property="patternHeight"/>
<result column="pattern_thickness" property="patternThickness"/>
@@ -27,7 +27,7 @@
T.ENABLE_STATE
FROM RAW_GLASS_STORAGE_STATION T
LEFT JOIN RAW_GLASS_STORAGE_DETAILS T1 ON T.DEVICE_ID = T1.DEVICE_ID
- AND T.SLOT = T1.SLOT_ID
+ AND T.SLOT = T1.SLOT
AND T1.STATE = 100
</select>
</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/ShelfRackMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/ShelfRackMapper.xml
deleted file mode 100644
index 576b9a9..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/ShelfRackMapper.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.shelfrack.mapper.ShelfRackMapper">
-
- <resultMap id="ShelfRackResultMap" type="com.mes.shelfrack.entity.request.RawUsageAndShelfRack">
- <result property="number" column="number"/>
- <result property="rawType" column="raw_type"/>
- <result property="rawWidth" column="raw_width"/>
- <result property="rawHeight" column="raw_height"/>
- <result property="rawThickness" column="raw_thickness"/>
- <result property="enableState" column="enable_state"/>
- <result property="pieces" column="pieces"/>
- <result property="createTime" column="createTime" />
- <result property="batchId" column="batch_id"/>
- </resultMap>
- <select id="selectshelf_rack" resultMap="ShelfRackResultMap">
- <![CDATA[
- SELECT a.number, b.raw_type, b.raw_width, b.raw_height, b.raw_thickness, a.enable_state, b.pieces,
- b.batch_id,DATE_FORMAT(b.create_time, '%Y-%m-%d %H:%i:%s') as createTime
- FROM shelf_rack AS a
- LEFT JOIN raw_usage AS b ON a.raw_package_id = b.id
- ]]>
-</select>
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml
deleted file mode 100644
index a526c7c..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mes.storagetask.mapper.StorageTaskMapper">
-
-
- <resultMap id="StorageTaskRequest" type="com.mes.storagetask.entity.request.StorageTaskRequest">
- <result property="loadRack" column="load_rack"/>
- <result property="color" column="color"/>
- <result property="taskState" column="task_state"/>
- <result property="shelfRack" column="shelf_rack"/>
- <result property="startTime" column="start_time"/>
- <result property="rawThickness" column="raw_thickness"/>
- <result property="routeGroup" column="route_group"/>
- <result property="id" column="id" />
- <result property="taskType" column="task_type"/>
- </resultMap>
-
-
-
- <select id="selectTasks" resultMap="StorageTaskRequest">
- <![CDATA[
- SELECT d.*, g.raw_thickness, g.color
- FROM (
- (SELECT * FROM storage_task AS a WHERE a.task_state = '宸插畬鎴�' ORDER BY a.id DESC LIMIT 1)
- UNION ALL
- (SELECT * FROM storage_task AS c WHERE c.task_state = '姝ｅ湪宸ヤ綔')
- UNION ALL
- (SELECT * FROM storage_task AS b WHERE b.task_state = '绛夊緟涓�')
- ) AS d
- LEFT JOIN shelf_rack AS f ON f.id = d.shelf_rack
- LEFT JOIN raw_usage AS g ON g.id = f.raw_package_id
- ]]>
- </select>
-
-</mapper>
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index 04632dd..ea38837 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -6,7 +6,7 @@
application:
name: temperingGlass
liquibase:
- enabled: true
+ enabled: false
mybatis-plus:
mapper-locations: classpath*:mapper/*.xml
configuration:
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
index 5473f61..3c2df0c 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/changelog/changelog.sql
@@ -195,7 +195,7 @@
start_slot int NULL DEFAULT NULL COMMENT '璧峰鏍煎瓙',
end_slot int NULL DEFAULT NULL COMMENT '鐩爣鏍煎瓙',
pattern_quantity int NULL DEFAULT NULL COMMENT '鍘熺墖鏁伴噺',
- enable_type int NULL DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
+ task_type int NULL DEFAULT NULL COMMENT '浠诲姟绫诲瀷',
enable_state int NULL DEFAULT NULL COMMENT '浠诲姟鐘舵��',
create_time datetime NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
PRIMARY KEY (id) USING BTREE
@@ -209,5 +209,71 @@
ALTER TABLE engineering
ADD COLUMN station_cell varchar(20);
+-- changeset zsh:20241017001
+-- preconditions onFail:CONTINUE onError:CONTINUE
+-- precondition-sql-check expectedResult:0 select count(1) from raw_glass_storage_station;
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (1, 1, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (2, 1, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (3, 1, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (4, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (5, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (6, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (7, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (8, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (9, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (10, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (11, 2, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (12, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (13, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (14, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (15, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (16, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (17, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (18, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (19, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (20, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (21, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (22, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (23, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (24, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (25, 3, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (98, 4, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (99, 4, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (101, 5, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (102, 5, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (103, 6, '1');
+INSERT INTO raw_glass_storage_station (slot, device_id, enable_state)
+VALUES (104, 6, '1');
+
--
Gitblit v1.8.0