From 97891cd2be28b7cd7075f0f0a89fc385baae9410 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 03 三月 2025 15:22:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 22 +++++--
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 35 ++++++++---
UI-Project/src/lang/en.js | 3 +
UI-Project/src/lang/py.js | 3 +
UI-Project/src/lang/zh.js | 3 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/bigstoragecagetask/entity/BigStorageTaskVO.java | 17 +++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 23 +++----
UI-Project/src/views/hollow/hollowequipment.vue | 4 +
UI-Project/src/views/hollow/hollowequipmenttwo.vue | 4 +
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 18 +++---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 41 +++++++------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java | 5 -
12 files changed, 117 insertions(+), 61 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 4584a9b..76000bd 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -96,6 +96,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 1e53c24..ce44e86 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -96,6 +96,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 7e4d385..8e656a7 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -95,6 +95,9 @@
emptymissions:'绌轰换鍔�',
advancetask:'杩涚墖浠诲姟',
outputtasks:'鍑虹墖浠诲姟',
+ schedulingtasks:'璋冨害浠诲姟',
+ advancerequests:'杩涚墖璇锋眰',
+ releaserequest:'鍑虹墖璇锋眰',
straighttasks:'鐩撮�氫换鍔�',
endingtask:'缁撴潫',
another:'鍏朵粬',
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index f3c75a8..d8235b6 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -310,16 +310,24 @@
return 'warning';
case 3:
return 'success';
+ case 4:
+ return 'danger';
+ case 5:
+ return 'primary';
}
}
function getStatusText1(taskType) {
switch (taskType) {
case 1:
- return t('film.stocke');//鍏ュ簱
+ return t('sorter.advancetask');//杩涚墖浠诲姟
case 2:
- return t('film.outbound');//鍑哄簱
+ return t('sorter.outputtasks');//鍑虹墖浠诲姟
case 3:
- return t('film.dispatch');//璋冨害
+ return t('sorter.schedulingtasks');//璋冨害浠诲姟
+ case 4:
+ return t('sorter.advancerequests');//杩涚墖璇锋眰
+ case 5:
+ return t('sorter.releaserequest');//鍑虹墖璇锋眰
}
}
function getStatusType2(taskState) {
@@ -374,9 +382,11 @@
<el-option :label="$t('film.fail')" value="2"></el-option>
</el-select>
<el-select v-model="selectValuesa[1]" clearable :placeholder="$t('film.tasktype')" style="margin-left: 10px;" >
- <el-option :label="$t('film.stocke')" value="1"></el-option>
- <el-option :label="$t('film.outbound')" value="2"></el-option>
- <el-option :label="$t('film.dispatch')" value="3"></el-option>
+ <el-option :label="$t('sorter.advancetask')" value="1"></el-option>
+ <el-option :label="$t('sorter.outputtasks')" value="2"></el-option>
+ <el-option :label="$t('sorter.schedulingtasks')" value="3"></el-option>
+ <el-option :label="$t('sorter.advancerequests')" value="4"></el-option>
+ <el-option :label="$t('sorter.releaserequest')" value="5"></el-option>
</el-select>
<el-button type="primary" style="margin-left: 10px;" @click="selectReportData()">{{ $t('film.inquire') }}</el-button>
</div>
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 085ed87..673c709 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -663,7 +663,7 @@
glassId: currentGlassId.value,
// temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 8,
+ state: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -683,7 +683,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 8,
+ state: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -704,7 +704,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 8,
+ state: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -725,7 +725,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -746,7 +746,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 1,
+ state: 1,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -767,7 +767,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -788,7 +788,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -829,7 +829,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 9,
+ state: 9,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -849,7 +849,7 @@
const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
glassId: currentGlassId.value,
line: 4001,
- status: 3,
+ state: 3,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 4a192a7..960454e 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -95,6 +95,7 @@
<div style="display: flex;">
<el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
{{$t('reportmanage.inquire')}}</el-button>
</div>
@@ -1028,6 +1029,7 @@
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
+const thickness = ref('')
const flowCardId = ref('')
const casFour = ref('')
const casOne = ref('')
@@ -1406,6 +1408,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: '',
flowCardId: '',
+ thickness: '',
});
if (response.code == 200) {
ElMessage.success(response.message);
@@ -1423,6 +1426,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ thickness: thickness.value
});
if (response.code == 200) {
ElMessage.success(response.message);
diff --git a/UI-Project/src/views/hollow/hollowequipmenttwo.vue b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
index fa0c416..861978e 100644
--- a/UI-Project/src/views/hollow/hollowequipmenttwo.vue
+++ b/UI-Project/src/views/hollow/hollowequipmenttwo.vue
@@ -68,6 +68,7 @@
<div style="display: flex;">
<el-input v-model="flowCardId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.incardnumber')" />
<el-input v-model="filmsId" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('film.infilms')"/>
+ <el-input v-model="thickness" style="margin-left: 10px;margin-bottom: 10px;width: 240px;" :placeholder="$t('searchOrder.inthickness')"/>
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="fetchFlowCardsearch">
{{$t('reportmanage.inquire')}}</el-button>
</div>
@@ -519,6 +520,7 @@
const filmRemove = ref('')
const formulaName = ref('')
const leftRemove = ref('')
+const thickness = ref('')
const rightRemove = ref('')
const topRemove = ref('')
const filmsId = ref('')
@@ -689,6 +691,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: '',
flowCardId: '',
+ thickness: '',
});
if (response.code == 200) {
ElMessage.success(response.message);
@@ -706,6 +709,7 @@
const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
filmsId: filmsId.value,
flowCardId: flowCardId.value,
+ thickness: thickness.value
});
if (response.code == 200) {
ElMessage.success(response.message);
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/bigstoragecagetask/entity/BigStorageTaskVO.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/bigstoragecagetask/entity/BigStorageTaskVO.java
new file mode 100644
index 0000000..2f8c5a4
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/bigstoragecagetask/entity/BigStorageTaskVO.java
@@ -0,0 +1,17 @@
+package com.mes.bigstoragecagetask.entity;
+
+import lombok.Data;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/3/3 15:05
+ * @Description:
+ */
+@Data
+public class BigStorageTaskVO extends BigStorageCageTask{
+
+ /**
+ * 鏄惁鐩稿悓
+ */
+ private int isSame;
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
index fbdc55e..57806a4 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/rawglassdetails/service/impl/RawGlassStorageDetailsServiceImpl.java
@@ -128,9 +128,8 @@
@Override
public String deleteWarehousing(Long slotId) {
- update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
+ remove(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getSlot, slotId)
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN));
return "success";
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index 5f12d21..97f4364 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
+import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
+import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
+import com.mes.common.config.Const;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -54,19 +57,26 @@
carPostion.add(0.5);
jsonObject.append("carPostion", carPostion);
//鐣岄潰灞曠ず绗煎瓙淇℃伅
- jsonObject.append("bigStorageCageInfos", bigStorageCageDetailsService.querybigStorageCageDetail());
+ jsonObject.append("bigStorageCageInfos", bigStorageCageDetailsService.querybigStorageCageDetail());
- try{
+ try {
//杩涚墖浠诲姟鏁版嵁
- List<BigStorageCageTask> inTaskList = new ArrayList();
+ List<BigStorageTaskVO> inTaskList = new ArrayList();
ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
for (int i = 1; i <= 6; i++) {
ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
if (null != requestWord.getValue()) {
- BigStorageCageTask task = new BigStorageCageTask();
+ BigStorageTaskVO task = new BigStorageTaskVO();
task.setGlassId(requestWord.getValue() + "");
+ int isExistCount = bigStorageCageDetailsService.count(new LambdaQueryWrapper<BigStorageCageDetails>().in(BigStorageCageDetails::getGlassId, task.getGlassId())
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
+ if (isExistCount > 0) {
+ task.setIsSame(1);
+ } else {
+ task.setIsSame(0);
+ }
task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
@@ -75,7 +85,10 @@
}
}
jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
-
+ } catch (Exception e) {
+ //todo:涓嶅仛浠诲姟澶勭悊
+ }
+ try {
//杩涚墖鑱旀満
ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
jsonObject.append("inkageEntity", inkageEntity.getValue());
@@ -91,14 +104,14 @@
//鍑虹墖璇锋眰
ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
jsonObject.append("outRequestEntity", outRequestEntity.getValue());
- }catch(Exception e){
+
+
+ //鍑虹墖浠诲姟鏁版嵁
+ List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
+ jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
+ } catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
}
-
- //鍑虹墖浠诲姟鏁版嵁
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
- jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
-
//閽㈠寲寮�鍏�
boolean temperingSwitch = false;
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 cba1a3d..3723ff4 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
@@ -41,21 +41,21 @@
200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
}
- @ApiOperation("鏇存柊鍓╀綑鏁伴噺")
- @PostMapping("/updateQuantity")
- public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
- return Result.success(rawGlassStorageDetailsService.updateQuantity(request));
- }
+ @ApiOperation("鏇存柊鍓╀綑鏁伴噺")
+ @PostMapping("/updateQuantity")
+ public Result<Object> updateQuantity(@Validated @RequestBody RawGlassRequest request) {
+ return Result.success(rawGlassStorageDetailsService.updateQuantity(request));
+ }
- @ApiOperation("鍒犻櫎鍘熺墖")
- @PostMapping("/deleteWarehousing")
- public Result<Object> deleteWarehousing(Long slotId) {
- return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slotId));
- }
+ @ApiOperation("鍒犻櫎鍘熺墖")
+ @PostMapping("/deleteWarehousing")
+ public Result<Object> deleteWarehousing(Long slot) {
+ return Result.success(rawGlassStorageDetailsService.deleteWarehousing(slot));
+ }
@ApiOperation("鍘熺墖鍑哄簱")
@PostMapping("/outWarehousing")
- public Result<Object> outWarehousing(@RequestBody Long slotId) {
+ public Result<Object> outWarehousing(Long slotId) {
return Result.success(rawGlassStorageDetailsService.outWarehousing(slotId));
}
@@ -78,7 +78,6 @@
public Result<List<RawGlassStorageDetailsDTO>> patternUsage(String width, String height, String thickness, String films) {
return Result.build(200, "鏌ヨ鎴愬姛", rawGlassStorageDetailsService.patternUsage(width, height, thickness, films));
}
-
}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index d4241db..80e7c76 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -6,8 +6,10 @@
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
+import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
import com.mes.common.config.Const;
+import com.mes.hollow.entity.HollowBigStorageCageDetails;
import com.mes.hollow.entity.HollowGlassOutRelationInfo;
import com.mes.hollow.service.HollowBigStorageCageDetailsService;
import com.mes.hollow.service.HollowBigStorageCageService;
@@ -69,13 +71,13 @@
jsonObject.append("932", listMap.get(932));
try {
//930绌洪棽淇″彿
- ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+ ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
//931绌洪棽淇″彿
ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
- }catch (Exception e){
- log.error("opc瀛樺湪寮傚父",e);
+ } catch (Exception e) {
+ log.error("opc瀛樺湪寮傚父", e);
}
List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("HollowGlass");
@@ -124,17 +126,24 @@
//鐣岄潰灞曠ず绗煎瓙淇℃伅
jsonObject.append("bigStorageCageInfos", hollowBigStorageCageDetailsService.queryHollowbigStorageCageDetail());
- try{
+ try {
//杩涚墖浠诲姟鏁版嵁
- List<BigStorageCageTask> inTaskList = new ArrayList();
+ List<BigStorageTaskVO> inTaskList = new ArrayList();
ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
for (int i = 1; i <= 6; i++) {
ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP2A.DLP2A.TO" + i);
ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP2A.DLP2A.STATE" + i);
if (null != requestWord.getValue()) {
- BigStorageCageTask task = new BigStorageCageTask();
+ BigStorageTaskVO task = new BigStorageTaskVO();
task.setGlassId(requestWord.getValue() + "");
+ int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
+ .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO));
+ if (isExistCount > 0) {
+ task.setIsSame(1);
+ } else {
+ task.setIsSame(0);
+ }
task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
@@ -143,6 +152,10 @@
}
}
jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+ } catch (Exception e) {
+ //todo:涓嶅仛浠诲姟澶勭悊
+ }
+ try {
//杩涚墖鑱旀満
ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
jsonObject.append("inkageEntity", inkageEntity.getValue());
@@ -159,13 +172,12 @@
ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
jsonObject.append("outRequestEntity", outRequestEntity.getValue());
//930绌洪棽淇″彿
- ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+ ReadWriteEntity freeOneRequestEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
jsonObject.append("freeOneRequestEntity", freeOneRequestEntity.getValue());
//931绌洪棽淇″彿
ReadWriteEntity freeTwoRequestEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
jsonObject.append("freeTwoRequestEntity", freeTwoRequestEntity.getValue());
-
- }catch(Exception e){
+ } catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
}
@@ -185,17 +197,6 @@
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
List<Map<String, Object>> bigStorageCageUsage = hollowBigStorageCageService.selectBigStorageCageUsage();
jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
-
-//
-// //鎵撳嵃寮�鍏�
-// boolean autoPrint = false;
-// if (redisUtil.getCacheObject("autoPrint") == null) {
-// redisUtil.setCacheObject("autoPrint", false);
-// } else {
-// autoPrint = redisUtil.getCacheObject("autoPrint");
-// }
-// jsonObject.append("autoPrint", autoPrint);
-
}
}
--
Gitblit v1.8.0