From f4df0b5c294e598846dd565906d5027a7c043f25 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 18 七月 2024 15:39:36 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml | 1
hangzhoumesParent/gateway/src/main/resources/application.yml | 8
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java | 20 +
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 55 +++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java | 29 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java | 21
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java | 12
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 52 +++
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 15
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 4
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/StorageTaskService.java | 5
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 6
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java | 73 ++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml | 4
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java | 20 +
JsonFile/PlcTemperingGlass.json | 132 ++++++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml | 16
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java | 4
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 7
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/storagetask/service/impl/StorageTaskServiceImpl.java | 29 +
/dev/null | 20 -
hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java | 6
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java | 60 ++++
UI-Project/src/views/GlassStorage/MaterialRackManagement.vue | 22 +
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/json/PlcTemperingGlass.json | 132 ++++++++
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 4
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 8
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 1
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 22 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java | 16 +
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java | 11
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java | 16 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 3
38 files changed, 770 insertions(+), 77 deletions(-)
diff --git a/JsonFile/PlcTemperingGlass.json b/JsonFile/PlcTemperingGlass.json
new file mode 100644
index 0000000..3abe9a6
--- /dev/null
+++ b/JsonFile/PlcTemperingGlass.json
@@ -0,0 +1,132 @@
+{
+ "plcAddressBegin": "DB88.0",
+ "plcAddressLenght": "58",
+ "dataType": "word",
+ "parameteInfor": [
+ {
+ "codeId": "confirmationWord",
+ "addressIndex": "0",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperingLayoutId",
+ "addressIndex": "2",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "filmsid",
+ "addressIndex": "4",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperingType",
+ "addressIndex": "6",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "thickness",
+ "addressIndex": "8",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "loadingRate",
+ "addressIndex": "10",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "areaDifference",
+ "addressIndex": "12",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "state",
+ "addressIndex": "22",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "deviceState",
+ "addressIndex": "24",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "resultState",
+ "addressIndex": "26",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "loadSpeed",
+ "addressIndex": "28",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "downSpeed",
+ "addressIndex": "30",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "load1",
+ "addressIndex": "32",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heat1",
+ "addressIndex": "34",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heat2",
+ "addressIndex": "36",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "cool1",
+ "addressIndex": "38",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "cool2",
+ "addressIndex": "40",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "downId",
+ "addressIndex": "42",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "productionTime",
+ "addressIndex": "44",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heatEnergy",
+ "addressIndex": "46",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "coolEnergy",
+ "addressIndex": "48",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureUp1",
+ "addressIndex": "50",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureDown1",
+ "addressIndex": "52",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureUp2",
+ "addressIndex": "54",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureDown2",
+ "addressIndex": "56",
+ "addressLenght": "2"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
index e1b6d88..421e064 100644
--- a/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
+++ b/UI-Project/src/views/GlassStorage/MaterialRackManagement.vue
@@ -64,8 +64,17 @@
<!-- <el-button type="success" size="mini" @click="addglass()">娣诲姞鍘熺墖</el-button> -->
</template>
</el-table-column>
- </el-table>
+
+ </el-table>
+ <el-pagination
+ v-if="totalItems > 0"
+ background
+ layout="prev, pager, next"
+ :total="totalItems"
+ :page-size="pageSize"
+ @current-change="handleCurrentChange"
+ ></el-pagination>
</el-dialog>
@@ -257,6 +266,17 @@
const Hidden = ref(false)
+
+ const totalItems = ref(0);
+ totalItems.value = 10;
+ const pageSize = 10;
+ let currentPage = ref(1);
+ const handleCurrentChange = (val) => {
+
+ currentPage.value = val;
+
+ };
+
const getTagType2 =(status) => {
switch (status) {
case 'completed':
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 640d82f..e99f53e 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -156,6 +156,45 @@
console.log("鍏抽棴浜�")
closeWebSocket();
});
+
+
+const getTagType =(status) => {
+ return status === 1 ? 'success' : 'danger';
+ // 鏍规嵁鐘舵�佸�煎喅瀹氭爣绛剧被鍨嬶紝杩欓噷鍋囪鐘舵�佷负1鏃朵负鎴愬姛锛堢豢鑹诧級锛屽惁鍒欎负澶辫触锛堢孩鑹诧級
+ }
+
+ const toggleStatus = (row) => {
+ // 鍒囨崲鏂欐灦鐘舵�佺殑閫昏緫
+ row.enableState = 1 - row.enableState; // Toggle between 0 and 1
+ // 姝ゅ鍙互娣诲姞淇濆瓨鐘舵�佺殑閫昏緫锛屾瘮濡傝皟鐢� API 鏇存柊鏁版嵁
+ updateRowStatus(row);
+ };
+
+ const updateRowStatus = async (row) => {
+ try {
+ // 鍋囪浣犵殑鍚庣 API 鎺ユ敹 PUT 璇锋眰锛屽苟涓旈渶瑕佷紶閫� row.id 鍜� row.enableState 鍙傛暟
+
+
+ const response = await request.post('unLoadGlass/downWorkStation/updateDownWorkstation', {
+ enableState: row.enableState,
+ id: row.id
+
+
+ });
+ console.log('Updated row status:', response.data);
+ // 鍙互鏍规嵁鍚庣杩斿洖鐨勬暟鎹繘琛岃繘涓�姝ュ鐞嗭紝姣斿鏇存柊鏈湴鐘舵�佺瓑
+ } catch (error) {
+ console.error('Error updating row status:', error);
+ // 澶勭悊閿欒鎯呭喌锛屾瘮濡傛彁绀虹敤鎴锋洿鏂板け璐�
+ }
+};
+
+
+
+
+
+
+
// beforeUnmount(() => {
// closeWebSocket();
// });
@@ -172,11 +211,11 @@
<el-table-column prop="workstationId" align="center" :label="$t('reportWork.lowerbit')" min-width="80" />
<el-table-column prop="workstationId" align="center" :label="$t('reportWork.shelfnumber')" min-width="120" />
<el-table-column prop="flowCardId" align="center" :label="$t('reportWork.cardnumber')" min-width="150" />
- <el-table-column prop="totalquantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
- <el-table-column prop="racksnumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
+ <el-table-column prop="totalQuantity" align="center" :label="$t('reportWork.totalquantity')" min-width="120" />
+ <el-table-column prop="racksNumber" align="center" :label="$t('reportWork.beendropped')" min-width="120" />
<el-table-column prop="layer" align="center" label="灞傛暟" min-width="120" />
- <el-table-column prop="artificialnumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" />
+ <el-table-column prop="otherNumber" align="center" label="浜哄伐涓嬬墖鏁�" min-width="120" />
+ <!-- <el-table-column prop="work_state" align="center" :label="$t('reportWork.state')" min-width="120" /> -->
<el-table-column prop="deviceId" align="center" :label="$t('reportWork.devicenumber')" min-width="120" />
<el-table-column
align="center"
@@ -185,7 +224,10 @@
prop="enableState"
>
<template #default="scope">
- <el-tag type="success" >{{ scope.row.enableState==1? $t('reportWork.enable') : $t('reportWork.unenable')}}</el-tag>
+
+ <el-tag :type="getTagType(scope.row.enableState)" @click="toggleStatus(scope.row)">
+ {{ scope.row.enableState === 1 ? $t('reportWork.enable') : $t('reportWork.unenable') }}
+ </el-tag>
</template>
</el-table-column>
<el-table-column fixed="right" :label="$t('reportWork.operate')" align="center" width="200">
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 5423c6e..f8a310c 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
@@ -21,6 +21,7 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 2001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 2002
*/
+ public static final Integer OUT_TARGET_POSITION_ZERO = 0;
public static final Integer A09_OUT_TARGET_POSITION = 2001;
public static final Integer A10_OUT_TARGET_POSITION = 2002;
@@ -29,7 +30,7 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
*/
- public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3002;
public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
/**
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java
deleted file mode 100644
index df9b277..0000000
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/OptimizeDetailController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.mes.pp.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author zhoush
- * @since 2024-04-16
- */
-@RestController
-@RequestMapping("/optimize-detail")
-public class OptimizeDetailController {
-
-}
-
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
index e42cefa..47f829c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -20,7 +20,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -30,24 +30,25 @@
@DS("pp")
@Slf4j
public class ReportingWorkServiceImpl extends ServiceImpl<ReportingWorkMapper, ReportingWork> implements ReportingWorkService {
-@Autowired
-private ReportingDamageMapper reportingDamageMapper;
-@Autowired
-private AwaitingRepairMapper awaitingRepairMapper;
+ @Autowired
+ private ReportingDamageMapper reportingDamageMapper;
+ @Autowired
+ private AwaitingRepairMapper awaitingRepairMapper;
+
@Override
public List<Reportingdamage> selectDamage(Reportingdamage reportingdamage) {
- QueryWrapper<Reportingdamage>queryWrapper=new QueryWrapper<>();
- queryWrapper.select("this_process,sum(completed_quantity)as completedQuantity,sum(breakage_quantity)as breakageQuantity,device_name ")
- .eq("this_process",reportingdamage.getThisProcess())
+ QueryWrapper<Reportingdamage> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("this_process,sum(completed_quantity) as completedQuantity,sum(breakage_quantity) as breakageQuantity ")
+ //.eq("this_process", reportingdamage.getThisProcess())
//.eq("device_name",reportingdamage.getDeviceName())
- .ge("reporting_work_time",reportingdamage.getReportingWorkTime())
+ .ge("reporting_work_time", reportingdamage.getReportingWorkTime())
.groupBy("this_process");
return reportingDamageMapper.selectList(queryWrapper);
}
@Override
public List<AwaitingRepair> selectAwaitingRepair() {
- QueryWrapper<AwaitingRepair>queryWrapper=new QueryWrapper<>();
+ QueryWrapper<AwaitingRepair> queryWrapper = new QueryWrapper<>();
queryWrapper.select("*");
return awaitingRepairMapper.selectList(queryWrapper);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
index 63b0c45..d3d7b75 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -1,5 +1,4 @@
package com.mes.temperingglass.entity;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.mes.base.entity.BigStorageCageBaseInfo;
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
similarity index 78%
rename from hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
index 83088d7..9e37b94 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingAgoService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/TemperingGlassInfoService.java
@@ -11,7 +11,7 @@
* @author zhoush
* @since 2024-04-07
*/
-public interface TemperingAgoService extends MPJBaseService<TemperingGlassInfo> {
+public interface TemperingGlassInfoService extends MPJBaseService<TemperingGlassInfo> {
List<TemperingGlassInfo> selectWaitingGlass();
@@ -22,4 +22,6 @@
List<TemperingGlassInfo> selectOverGlass();
List<TemperingGlassInfo> selectLayoutId();
+
+ List<TemperingGlassInfo> selectTaskType();
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
similarity index 77%
rename from hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
rename to hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index e8a10af..806ee21 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingAgoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -1,12 +1,13 @@
package com.mes.temperingglass.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.base.MPJBaseServiceImpl;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
-import com.mes.temperingglass.service.TemperingAgoService;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import java.util.List;
@@ -19,7 +20,8 @@
* @since 2024-04-07
*/
@Service
-public class TemperingAgoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingAgoService {
+@DS("salve_hangzhoumes")
+public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
@Autowired
TemperingGlassInfoMapper temperingMapper;
@@ -55,12 +57,16 @@
public List<TemperingGlassInfo> selectOverGlass() {
//鑾峰彇杩囨棆杞彴鏈�澶х殑閽㈠寲鐗堝浘id
QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
- wapper.select("top 1 *").eq("state", 4)
+ wapper.select("Top 1 *").eq("state", 4)
.orderByDesc("tempering_layout_id");
//鏍规嵁鏈�澶х殑鐗堝浘id鏄剧ず閽㈠寲鍚庣殑鐗堝浘淇℃伅
TemperingGlassInfo glassinfo= temperingMapper.selectOne(wapper);
+ if (glassinfo == null) {
+ return null; // 鐩存帴杩斿洖null锛岃〃绀烘病鏈夋壘鍒扮鍚堟潯浠剁殑璁板綍
+ }
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId());
+
return temperingMapper.selectList(wrapper);
}
@@ -72,4 +78,12 @@
.orderByAsc("tempering_layout_id");
return temperingMapper.selectList(wrapper);
}
+
+ @Override
+ public List<TemperingGlassInfo> selectTaskType() {
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.select("state")
+ .groupBy("state");
+ return temperingMapper.selectList(wrapper);
+ }
}
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
index 036e737..f752b45 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/controller/SysRoleController.java
@@ -33,15 +33,19 @@
@ApiOperation("鏂板瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
@PostMapping("/saveRole")
// @PreAuthorize("hasAuthority('sys:role:save')")
- public Result<SysRole> saveRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
- return Result.success(sysRoleService.saveRole(sysRoleVO));
+ public Result<SysRoleVO> saveRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
+ //return Result.success(sysRoleService.saveRole(sysRoleVO));
+ sysRoleService.saveRole(sysRoleVO);
+ return Result.build(200,"鏂板鎴愬姛",sysRoleVO);
}
@ApiOperation("缂栬緫瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
@PostMapping("/updateRole")
// @PreAuthorize("hasAuthority('sys:role:save')")
- public Result<String> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
- return Result.success(sysRoleService.updateRole(sysRoleVO));
+ public Result<SysRoleVO> updateRole(@Validated @RequestBody SysRoleVO sysRoleVO) {
+ // return Result.success(sysRoleService.updateRole(sysRoleVO));
+ sysRoleService.updateRole(sysRoleVO);
+ return Result.build(200,"鏂板鎴愬姛",sysRoleVO);
}
@ApiOperation("鏌ヨ瑙掕壊鍙婅鑹蹭笅鐨勬潈闄愪俊鎭�")
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java
index 3201d55..a787182 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/role/service/impl/SysRoleServiceImpl.java
@@ -117,10 +117,21 @@
roleMenu.setMenuId(menu.getId());
return roleMenu;
}).collect(Collectors.toList());
+ // 浣跨敤娴佸鐞嗚彍鍗曞垪琛紝鎻愬彇 children 鐨� id锛屽苟璁剧疆鍒� SysRoleMenu 涓�
+ List<SysRoleMenu> childrenList = menuList.stream()
+ .flatMap(menu -> menu.getChildren().stream()) // 鎵佸钩鍖栧鐞� children 鍒楄〃
+ .map(child -> {
+ SysRoleMenu roleMenu = new SysRoleMenu();
+ roleMenu.setRoleId(roleId);
+ roleMenu.setMenuId(child.getId()); // 璁剧疆 child 鐨� id 鍒� menuId
+ return roleMenu;
+ })
+ .collect(Collectors.toList());
log.info("娓呯┖瑙掕壊鏉冮檺琛ㄤ腑璇ヨ鑹蹭俊鎭�");
// 鍏堝垹闄ゅ師鏉ョ殑璁板綍锛屽啀淇濆瓨鏂扮殑
sysRoleMenuService.remove(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
sysRoleMenuService.saveBatch(roleMenuList);
+ sysRoleMenuService.saveBatch(childrenList);
// 鍒犻櫎缂撳瓨
sysUserService.clearUserAuthorityInfoByRoleId(roleId);
return "success";
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 6f13e7c..e897e65 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -43,7 +43,6 @@
@ApiOperation("閫�鍑虹櫥褰�")
@PostMapping("/logout")
-// @PreAuthorize("hasRole('ROLE_admin')")
@PreAuthorize("hasAuthority('xt:yh')")
public Result<String> logout() {
return Result.success(sysUserService.logout());
@@ -61,10 +60,9 @@
@PostMapping("/updateUser")
// @PreAuthorize("hasAuthority('sys:user:update')")
public Result<List<SysUserVO>> updateUser(@Validated @RequestBody SysUserVO sysUser) {
- //return Result.success(sysUserService.updateUser(sysUser));
sysUserService.updateUser(sysUser);
GeneralRequest request=new GeneralRequest();
- request.setKey("");
+ //request.setKey("");
return Result.success(sysUserService.listByUserName(request));
//鏇存敼浜嗕慨鏀逛箣鍚庤繑鍥炴墍鏈夌敤鎴峰垪琛�
}
diff --git a/hangzhoumesParent/gateway/src/main/resources/application.yml b/hangzhoumesParent/gateway/src/main/resources/application.yml
index 3ddd26b..a369150 100644
--- a/hangzhoumesParent/gateway/src/main/resources/application.yml
+++ b/hangzhoumesParent/gateway/src/main/resources/application.yml
@@ -47,6 +47,14 @@
filters:
- StripPrefix=2
+
+ - id: glassStorage
+ uri: lb://glassStorage
+ predicates:
+ - Path=/api/glassStorage/**
+ filters:
+ - StripPrefix=2
+
# - id: unLoadGlass
# uri: lb://unLoadGlass
# predicates:
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 98206a6..c48b407 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -375,7 +375,7 @@
List<Object> list = edgStorageCageDetailsService.listObjs(queryWrapper);
//鑾峰彇绗煎唴鐜荤拑鐗堝浘宸�兼槸鍚﹀ぇ浜庨槇鍊�
if (CollectionUtil.isNotEmpty(list)) {
- int diff = (int) list.get(0);
+ Long diff = (Long) list.get(0);
return diff > threshold;
} else {
return Boolean.FALSE;
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 5430e36..12ebb88 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -145,6 +145,7 @@
}
LambdaQueryWrapper<BigStorageCageFeedTask> wrapper = new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getTaskType, Const.BIG_STORAGE_IN_RUN)
+ .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP);
//鑾峰彇鍙互鍚姩鍗ц浆绔嬬殑浠诲姟绾胯矾
List<BigStorageCageFeedTask> feedTaskList = bigStorageCageFeedTaskService.list(wrapper);
@@ -169,7 +170,7 @@
// log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
// return;
// }
- //鑾峰彇涓ゆ潯绾垮崸杞珛鏄惁鏈夌幓鐠冿紝涓斾换鍔＄姸鎬侀兘涓�2
+ //鑾峰彇涓ゆ潯绾垮崸杞珛鏄惁鏈夌幓鐠冿紝涓斾换鍔＄姸鎬佷负1/2
List<Integer> lineList = bigStorageCageFeedTaskService.querySitToUpGlass();
if (CollectionUtils.isEmpty(lineList)) {
Date endDate = new Date();
@@ -439,7 +440,8 @@
*/
public Integer getStartLine() {
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2 group by line"));
+ .inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2" +
+ "and (target_slot = 0 or target_slot is null) group by line"));
Assert.isFalse(CollectionUtils.isEmpty(taskList), "鍗ц浆绔嬩袱鏉＄嚎閮芥病鏈夌幓鐠冭繘鐗囦换鍔�");
Map<String, Integer> taskMap = taskList.stream().collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId,
BigStorageCageFeedTask::getLine));
@@ -458,6 +460,7 @@
//1銆佽幏鍙栦换鍔¤〃涓殑鎵�鏈夌幓鐠冿紙鎸囧畾绾胯矾涓斿凡缁忚繘鍗ц浆绔嬪畬鎴愶級
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, line)
+ .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
.in(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP_ALL)
.orderByAsc(BigStorageCageFeedTask::getId));
//2銆佸幓绗煎瓙鍐呮煡鎵炬槸鍚﹀彲浠ョ户缁瓨鏀剧殑绗煎瓙
@@ -524,7 +527,7 @@
//鎵撹溅鍓╀綑灏哄
Integer remainWidth = carWidth;
for (T e : list) {
- if (bigStorageCageOutTaskList.size() > outCarMaxSize || e.getWidth() > remainWidth) {
+ if (bigStorageCageOutTaskList.size() >= outCarMaxSize || e.getWidth() > remainWidth) {
break;
}
remainWidth = remainWidth - (int) e.getWidth() - glassGap;
@@ -555,14 +558,14 @@
/**
* 鏇存柊绗煎瓙鍐呮牸瀛愮殑鍓╀綑灏哄
*
- * @param list
- * @param taskGlassIds
+ * @param list 绗煎唴鍙互鍑虹鐨勭幓鐠冧俊鎭�
+ * @param taskGlassIds 鏈浠诲姟鍑哄幓鐨勭幓鐠僫ds
* @param <T>
*/
public <T extends BigStorageCageBaseInfo> void updateSlotRemain(List<T> list, List<String> taskGlassIds) {
//鑾峰彇闇�瑕佸嚭鍘伙紙鍖呮嫭寰呭嚭鍘荤殑锛夌殑鎵�鏈夌幓鐠冩牸瀛愬彿
List<Integer> slotList = list.stream().map(T::getSlot).distinct().collect(Collectors.toList());
- //鑾峰彇寰呭嚭鍘荤殑鐜荤拑淇℃伅锛堢瓑涓嬭溅鍑哄幓鐨勭幓鐠冿級
+ //鑾峰彇寰呭嚭鍘荤殑鐜荤拑淇℃伅锛堢瓑寰呮湰娆′换鍔＄粨鏉熷悗涓嬭溅鍑哄幓鐨勭幓鐠冿級
Map<Integer, Double> slotRemainMap = list.stream().filter(e -> !taskGlassIds.contains(e.getGlassId()))
.collect(Collectors.groupingBy(T::getSlot, Collectors.summingDouble(item -> item.getWidth() + glassGap)));
if (CollectionUtils.isNotEmpty(slotRemainMap)) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
index 0a32e28..c4affcd 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
@@ -34,6 +34,7 @@
END MAX_LENGTH
FROM BIG_STORAGE_CAGE_FEED_TASK
WHERE LINE = #{line}
+ AND (target_slot = 0 or target_slot is null)
AND TASK_STATE IN (1, 2)
) T
</select>
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
index e774319..0af86b2 100644
--- 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
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
/**
* @author system
* @since 2024-07-09 14:51:27
@@ -12,5 +15,5 @@
List<StorageTask> findList(StorageTask params);
-
+ Map<String, Optional<StorageTask>> findLatestTasks();
}
\ 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
index 8709da5..e9506e9 100644
--- 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
@@ -6,15 +6,21 @@
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
@@ -27,5 +33,28 @@
}
+ 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;
+ }
+
+
+
}
\ 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 3097382..974323a 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-dev.yml
@@ -17,7 +17,7 @@
cloud:
nacos:
discovery:
- server-addr: 127.0.0.1:8848
+ server-addr: 10.153.19.150:8848
redis:
database: 0
host: 127.0.0.1
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
new file mode 100644
index 0000000..05ec5fe
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -0,0 +1,55 @@
+package mes;
+
+import com.mes.GlassStorageApplication;
+import com.mes.storagetask.entity.StorageTask;
+import com.mes.storagetask.service.StorageTaskService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Arrays;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/3/27 16:37
+ * @Description:
+ */
+@Slf4j
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = GlassStorageApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+
+public class GlassStorageModuleApplicationTest {
+
+
+
+ @Autowired
+ private StorageTaskService storageTaskService;
+
+
+ @Test
+ public void testFindPath() {
+ log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
+ }
+
+ @Test
+ public void testCacheGlass() {
+ // storageTaskService.getBaseMapper().selectById(1);
+ //StorageTask storageTask=new StorageTask();
+// storageTask.setId(Long.valueOf("1"));
+// storageTask.setTaskState("1");
+// storageTaskService.updateById(storageTask);
+// storageTaskService.getBaseMapper().deleteById(1);
+ // storageTaskService.findList(storageTask);
+ storageTaskService.findLatestTasks();
+ }
+
+
+
+
+
+
+
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 8c66de2..e57a33f 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -43,7 +43,7 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 30000000)
public void plcLoadGlassTask() throws InterruptedException {
try {
//鑾峰彇鑱旀満鐘舵��
@@ -87,7 +87,7 @@
}
}
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 30000000)
public void plcLoadGlassReport(){
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
@@ -144,8 +144,8 @@
public void loadGlassStatus(){
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
- //String inkageStatus ="1";
+ //String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index f020aa3..9bcefd7 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -52,7 +52,11 @@
*/
UpPattenUsage selectSequence(UpPattenUsage upPattenUsage);
-
+ /**
+ * 鏇存敼涓婄墖鐜荤拑鐘舵��
+ * @return UpPattenUsage
+ */
Boolean updateGlassState(UpPattenUsage upPattenUsage);
+
}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java
new file mode 100644
index 0000000..94ae268
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/common/S7object.java
@@ -0,0 +1,60 @@
+package com.mes.common;
+
+import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
+import com.mes.device.PlcParameterObject;
+import com.mes.tools.InitUtil;
+import com.mes.tools.S7control;
+
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/4/9 15:13
+ * @Description:
+ */
+public class S7object extends Thread {
+ public S7control plccontrol; // PLC閫氳绫诲疄渚�
+ private EPlcType plcType = EPlcType.S1200; // 瑗块棬瀛怭LC绫诲瀷
+ private String ip = "192.168.20.202"; // plc ip鍦板潃
+ private int port = 102; // plc 绔彛鍙�
+
+
+ public PlcParameterObject PlcMesObject;
+ private static volatile S7object instance = null;
+
+ private S7object() {
+ if (plccontrol == null) {
+ plccontrol = new S7control(plcType, ip, port, 0, 0);
+ String PlcLoadGlass = System.getProperty("user.dir") + "/JsonFile/PlcTemperingGlass.json";
+ PlcMesObject = InitUtil.initword(PlcLoadGlass);
+ }
+ }
+
+ // 鍗曚緥妯″紡 鑾峰彇绫荤殑鍞竴瀹炰緥
+ public static S7object getinstance() {
+ if (instance == null) {
+ synchronized (S7object.class) {
+ if (instance == null) {
+ instance = new S7object();
+ }
+ }
+ }
+ return instance;
+ }
+
+ @Override
+ public void run() {
+ while (this != null) {
+ try {
+ Thread.sleep(100);
+
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ byte[] getplcvlues = plccontrol.readByte(PlcMesObject.getPlcAddressBegin(), PlcMesObject.getPlcAddressLength());
+ if (getplcvlues != null) {
+ PlcMesObject.setPlcParameterList(getplcvlues);
+ }
+ }
+ }
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index 3f108b5..794ee4a 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -1,6 +1,6 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
-import com.mes.temperingglass.service.TemperingAgoService;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
@@ -19,13 +19,13 @@
public class PlcTemperingGlassTask {
@Autowired
- private TemperingAgoService temperingAgoService;
+ private TemperingGlassInfoService temperingAgoService;
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 2000)
public void temperingGlassHome(){
JSONObject jsonObject = new JSONObject();
//姝ｅ湪绛夊緟杩涚墖鐨勭幓鐠�
@@ -46,6 +46,7 @@
jsonObject.append("outGlass", outGlass);
//杩囨棆杞彴閽㈠寲鍚庣殑鐜荤拑
List<TemperingGlassInfo> overGlass = temperingAgoService.selectOverGlass();
+
jsonObject.append("overGlass", overGlass);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
new file mode 100644
index 0000000..6b27ad0
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/TemperingTask.java
@@ -0,0 +1,29 @@
+package com.mes.job;
+
+import com.mes.tempering_record.service.TemperingRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/7/17 12:47
+ * @Description:
+ */
+public class TemperingTask {
+
+ @Autowired
+ private TemperingRecordService temporalRecordService;
+
+
+ @Scheduled(fixedDelay = 1000)
+ public void temperingGlassBefore() {
+ //todo:鑾峰彇閽㈠寲鐗堝浘涓姸鎬佷负2鐨勶紙杩涚倝瀹屾垚鐨勭幓鐠冧俊鎭級 涓斾笉瀛樺湪閽㈠寲璁板綍琛ㄥ唴鐨�
+
+
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void temperingGlassAfter() {
+
+ }
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java
new file mode 100644
index 0000000..774f5ae
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/controller/TemperingRecordController.java
@@ -0,0 +1,20 @@
+package com.mes.tempering_record.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+@RestController
+@RequestMapping("/temperingRecord")
+public class TemperingRecordController {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java
new file mode 100644
index 0000000..b11715c
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/entity/TemperingRecord.java
@@ -0,0 +1,73 @@
+package com.mes.tempering_record.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TemperingRecord implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 閽㈠寲鐗堝浘
+ */
+ private Integer temperingLayoutId;
+
+ /**
+ * 鐜荤拑鏉愯川(鑶滅郴0.鐧界幓1.鍗曢摱2.鍙岄摱3涓夐摱 4.瓒呯櫧5.鐑弽灏�)
+ */
+ private Integer glassType;
+
+ /**
+ * 閽㈠寲绫诲瀷锛�1.鍏ㄩ挗:2.鍗婇挗锛�
+ */
+ private Integer temperingType;
+
+ /**
+ * 鍘氬害锛堝帤搴�*10)
+ */
+ private Double thickness;
+
+ /**
+ * 瑁呰浇鐜�
+ */
+ private Double loadingRate;
+
+ /**
+ * 闈㈢Н宸�
+ */
+ private Double areaDifference;
+
+ /**
+ * 鐢熶骇鑰楁椂
+ */
+ private String productionTime;
+
+ /**
+ * 鍔犵儹鑳借��
+ */
+ private String heatEnergy;
+
+ /**
+ * 鍐峰嵈鑳借��
+ */
+ private String coolEnergy;
+
+ /**
+ * 鏄惁瀹屾垚(plc鑾峰彇闈�1锛氬弬鏁颁笉瀛樺湪锛�2銆佸尮閰嶅畬鎴愶紱3銆佸尮閰嶈秴鏃讹級
+ */
+ private Integer state;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java
new file mode 100644
index 0000000..c163cb3
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/TemperingRecordMapper.java
@@ -0,0 +1,16 @@
+package com.mes.tempering_record.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.tempering_record.entity.TemperingRecord;
+
+/**
+ * <p>
+ * Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+public interface TemperingRecordMapper extends BaseMapper<TemperingRecord> {
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml
new file mode 100644
index 0000000..73d8f85
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/mapper/xml/TemperingRecordMapper.xml
@@ -0,0 +1,5 @@
+<?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.tempering_record.mapper.TemperingRecordMapper">
+
+</mapper>
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java
new file mode 100644
index 0000000..49137c5
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/TemperingRecordService.java
@@ -0,0 +1,16 @@
+package com.mes.tempering_record.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.tempering_record.entity.TemperingRecord;
+
+/**
+ * <p>
+ * 鏈嶅姟绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+public interface TemperingRecordService extends IService<TemperingRecord> {
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java
new file mode 100644
index 0000000..1596f57
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/tempering_record/service/impl/TemperingRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.mes.tempering_record.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.tempering_record.entity.TemperingRecord;
+import com.mes.tempering_record.mapper.TemperingRecordMapper;
+import com.mes.tempering_record.service.TemperingRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author zhoush
+ * @since 2024-07-17
+ */
+@Service
+public class TemperingRecordServiceImpl extends ServiceImpl<TemperingRecordMapper, TemperingRecord> implements TemperingRecordService {
+
+}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
index 3496554..408199a 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -1,5 +1,5 @@
package com.mes.temperingglass.controller;
-import com.mes.temperingglass.service.TemperingAgoService;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
@@ -22,7 +22,7 @@
public class TemperingGlassInfoController {
@Autowired
- private TemperingAgoService temperingAgoService;
+ private TemperingGlassInfoService temperingAgoService;
@ApiOperation("鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�")
@GetMapping("/selectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
index 18d4c7e..ae0d119 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
@@ -4,8 +4,18 @@
primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
+# hangzhoumes:
+# 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
+# salve_hangzhoumes:
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes
+# username: sa
+# password: beibo.123/
+# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?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
@@ -15,12 +25,12 @@
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
pp:
- url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/pp?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
sd:
- url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/sd?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
index 3fc6fbb..697a608 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
@@ -1,7 +1,7 @@
spring:
datasource:
dynamic:
- primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ primary: salve_hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
hangzhoumes:
@@ -28,6 +28,8 @@
nacos:
discovery:
server-addr: 10.153.19.150:8848
+ application:
+ name: temperingGlass
redis:
database: 0
host: 10.153.19.150
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/json/PlcTemperingGlass.json b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/json/PlcTemperingGlass.json
new file mode 100644
index 0000000..3abe9a6
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/json/PlcTemperingGlass.json
@@ -0,0 +1,132 @@
+{
+ "plcAddressBegin": "DB88.0",
+ "plcAddressLenght": "58",
+ "dataType": "word",
+ "parameteInfor": [
+ {
+ "codeId": "confirmationWord",
+ "addressIndex": "0",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperingLayoutId",
+ "addressIndex": "2",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "filmsid",
+ "addressIndex": "4",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperingType",
+ "addressIndex": "6",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "thickness",
+ "addressIndex": "8",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "loadingRate",
+ "addressIndex": "10",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "areaDifference",
+ "addressIndex": "12",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "state",
+ "addressIndex": "22",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "deviceState",
+ "addressIndex": "24",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "resultState",
+ "addressIndex": "26",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "loadSpeed",
+ "addressIndex": "28",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "downSpeed",
+ "addressIndex": "30",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "load1",
+ "addressIndex": "32",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heat1",
+ "addressIndex": "34",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heat2",
+ "addressIndex": "36",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "cool1",
+ "addressIndex": "38",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "cool2",
+ "addressIndex": "40",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "downId",
+ "addressIndex": "42",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "productionTime",
+ "addressIndex": "44",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "heatEnergy",
+ "addressIndex": "46",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "coolEnergy",
+ "addressIndex": "48",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureUp1",
+ "addressIndex": "50",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureDown1",
+ "addressIndex": "52",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureUp2",
+ "addressIndex": "54",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "temperatureDown2",
+ "addressIndex": "56",
+ "addressLenght": "2"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
index d6edffc..05ad286 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/test/java/com/mes/TemperingApplicationTest.java
@@ -1,7 +1,7 @@
package com.mes;
import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.service.TemperingAgoService;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -23,7 +23,7 @@
public class TemperingApplicationTest {
@Autowired
- private TemperingAgoService temperingAgoService;
+ private TemperingGlassInfoService temperingAgoService;
@Test
@@ -45,7 +45,7 @@
@Test
public void testFindPa4() {
List<TemperingGlassInfo> glass = temperingAgoService.selectOverGlass();
- log.info("绛夊緟涓殑鐜荤拑锛歿}", Arrays.asList(glass));
+ log.info("閽㈠寲鍚庣殑鐜荤拑锛歿}", Arrays.asList(glass));
}
@Test
public void testFindPa5() {
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 8b40827..63f6a49 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -92,6 +92,7 @@
String currentSlot = plcParameterObject.getPlcParameter("currentCell").getValue();
+
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛歡06:{}銆乬08:{}銆乬11:{}銆乬13:{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
requestWord, glassIdeValue, confirmationWrodValue, out06Glassstate, out08Glassstate, out11Glassstate, out13Glassstate, currentSlot);
@@ -489,6 +490,7 @@
DownGlassInfo downGlassInfo = new DownGlassInfo();
BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
//todo锛氳惤鏋剁墖搴�
+ downGlassInfo.setSequence(downGlassInfoService.queryMaxSequence(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer()));
downGlassInfoService.save(downGlassInfo);
//鐢熸垚浠诲姟淇℃伅
GlassInfo glassInfo = new GlassInfo();
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
index 1930840..32bca1a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownGlassInfoMapper.xml
@@ -38,7 +38,7 @@
order by count desc limit 1
</select>
<select id="queryMaxSequence" resultType="java.lang.Integer">
- SELECT max(sequence) + 1 as sequence
+ SELECT COALESCE(max(sequence) + 1, 0) as sequence
FROM down_glass_info
WHERE flow_card_id = #{flowCardId}
AND layer = #{layer}
--
Gitblit v1.8.0