From 24857c037628e105951f49f2803885245fcfc1ce Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:53 +0800
Subject: [PATCH] 钢化模块进炉中，左右炉位置调换
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java | 30 ++++++++++++++++++++++++++++--
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 12 ++++++------
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglassdetails/controller/RawGlassStorageDetailsController.java | 1 -
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 4 ++--
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/RawGlassStorageTask.java | 1 -
5 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index aa09737..52d18f6 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -213,13 +213,13 @@
ElMessage.success(response.message);
row.state = newState;
} else {
- ElMessage.error(response.message);
- }
- row.state = newState;
+ ElMessage.error(response.message);
+ }
+ row.state = newState;
} catch (error) {
- ElMessage.error(t('basicData.glassnull'));
- }
-};
+ ElMessage.error(t('basicData.glassnull'));
+ }
+};
const handleEdit = (row) => {
window.localStorage.setItem('slotId', row.slotId)
dialogFormVisiblec.value = true;
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 705f206..d875780 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -787,7 +787,7 @@
<el-button id="searchButton" type="info" @click="dialogFormVisiblec = true;dialogFormVisibleb = false;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.print') }}</el-button>
<div v-if="dialogFormVisible" >
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
-<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
+<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects1.length > 0">
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
@@ -814,7 +814,7 @@
</el-scrollbar>
</div>
</div>
-<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
+<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
<div v-if="adjustedRects2.length > 0">
<div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
<!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
index 6e7d874..a06a933 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -2,7 +2,10 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
@@ -13,6 +16,7 @@
import javax.annotation.Resource;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author wangfei
@@ -24,6 +28,8 @@
@Resource private RawGlassStorageStationService rawGlassStorageStationService;
@Resource private RawGlassStorageTaskService rawGlassStorageTaskService;
+
+ @Resource private RawGlassStorageDetailsService rawGlassStorageDetailsService;
@Scheduled(fixedDelay = 2000)
public void sendRawGlassMessage() {
@@ -42,11 +48,31 @@
e.sendMessage(String.valueOf(jsonObject));
});
}
-
-
}
/** todo:鍏ュ簱浠诲姟锛氬悐瑁呬綅鏈夌幓鐠冿紝鍏堝幓宸ヤ綅琛ㄦ煡璇㈢┖鏍煎瓙锛岀敓鎴愬叆搴撲换鍔′粠鍚婅浣嶅埌鐩爣鏍煎瓙 */
+// @Scheduled(fixedDelay = 1000)
+// public void sendRawGlassMessage() {
+//// List<RawGlassStorageDetails> rawGlassStorageDetailsList = rawGlassStorageDetailsService.List(new RawGlassStorageDetails())
+// Wrapper<RawGlassStorageDetails> queryWrapper = null;
+// List<RawGlassStorageDetails> detailsList = rawGlassStorageDetailsService.list(null);
+// queryWrapper.eq(RawGlassStorageDetails::getState, 100);
+// if(detailsList.size() >0){
+// //鏌ユ壘鏍煎瓙琛╠etails绌烘牸瀛�
+// List<String> slotIds = detailsList.stream()
+// .map(RawGlassStorageDetails::getSlotId)
+// .collect(Collectors.toList());
+// list(new LambdaQueryWrapper<RawGlassStorageTask>()
+// .in(CollectionUtil.isNotEmpty(request.getState()), RawGlassStorageTask::getState, request.getState())
+// .in(CollectionUtil.isNotEmpty(request.getSlotId()), RawGlassStorageTask::getSlotId, request.getSlotId())
+// .orderByDesc(RawGlassStorageTask::getCreateTime));
+// }if(slotIds.size()>0){
+// //鐢熸垚鍏ュ簱浠诲姟
+// }
+//
+// }
+
+
/** todo:鍑哄簱浠诲姟锛�1銆佺偣鍑哄簱锛岀珛椹敓鎴愬嚭鐗囦换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负寰呭嚭搴擄紝瀹氭椂浠诲姟鎵弿鐢熸垚鍑哄簱浠诲姟 */
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 aa0665f..d95f7b7 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
@@ -27,7 +27,6 @@
@ApiOperation("鍘熺墖鍏ュ簱")
@PostMapping("/patternWarehousing")
public Result<String> patternWarehousing(@Validated @RequestBody RawGlassRequest request) {
-
return Result.build(
200, "鍏ュ簱宸插畬鎴愶紝绛夊緟浠诲姟鎵ц", rawGlassStorageDetailsService.patternWarehousing(request));
}
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 a31fa99..8c6a3be 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
@@ -56,5 +56,4 @@
private String createTime;
-
}
--
Gitblit v1.8.0