From ef94dde616595c9e6fa9d98fdc85249e375f4d2f Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 28 十一月 2024 16:22:08 +0800
Subject: [PATCH] -工艺路线优化
---
billion-ui/src/views/main/bs/routeChildInfo/index.vue | 43 ++++++++++++++++++++++++++++++++++++++-----
billion-main/src/main/java/com/billion/main/bs/service/impl/BsRouteInfoServiceImpl.java | 8 ++++++++
2 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/bs/service/impl/BsRouteInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/bs/service/impl/BsRouteInfoServiceImpl.java
index 295406b..edcc673 100644
--- a/billion-main/src/main/java/com/billion/main/bs/service/impl/BsRouteInfoServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/bs/service/impl/BsRouteInfoServiceImpl.java
@@ -3,9 +3,13 @@
import java.util.Date;
import java.util.List;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.billion.common.exception.ServiceException;
import com.billion.common.utils.DateUtils;
import com.billion.common.utils.SecurityUtils;
+import com.billion.main.bs.domain.BsBomInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.billion.main.bs.mapper.BsRouteInfoMapper;
@@ -62,6 +66,10 @@
bsRouteInfo.setCreateTime(DateUtils.getNowDate());
bsRouteInfo.setCreateBy(getUserName());
bsRouteInfo.setDataSource("MES");
+ List<BsRouteInfo> checkList = this.list(new LambdaQueryWrapper<BsRouteInfo>().eq(BsRouteInfo::getRouteCode, bsRouteInfo.getRouteCode()));
+ if (CollUtil.isNotEmpty(checkList)){
+ throw new ServiceException("宸插瓨鍦ㄦ祦绋嬬紪鐮佷负"+bsRouteInfo.getRouteCode()+"鐨勬暟鎹�");
+ }
return bsRouteInfoMapper.insertBsRouteInfo(bsRouteInfo);
}
diff --git a/billion-ui/src/views/main/bs/routeChildInfo/index.vue b/billion-ui/src/views/main/bs/routeChildInfo/index.vue
index 7d7741b..e9997fa 100644
--- a/billion-ui/src/views/main/bs/routeChildInfo/index.vue
+++ b/billion-ui/src/views/main/bs/routeChildInfo/index.vue
@@ -106,11 +106,41 @@
</el-col>
</el-row>
<el-row>
- <el-descriptions class="margin-top" :column="4" label-style="font-weight: bold" content-style="font-weight: bold">
- <el-descriptions-item label="娴佺▼缂栫爜">{{this.queryParams.routeCode}}</el-descriptions-item>
- <el-descriptions-item label="娴佺▼鍚嶇О">{{this.routeInfo[0].routeName}}</el-descriptions-item>
- <el-descriptions-item label="浜у搧缂栫爜">{{this.routeInfo[0].productCode}}</el-descriptions-item>
- <el-descriptions-item label="浜у搧鍚嶇О">{{this.routeInfo[0].productName}}</el-descriptions-item>
+<!-- <el-descriptions class="margin-top" :column="4" label-style="font-weight: bold" content-style="font-weight: bold">-->
+<!-- <el-descriptions-item label="娴佺▼缂栫爜">{{this.queryParams.routeCode}}</el-descriptions-item>-->
+<!-- <el-descriptions-item label="娴佺▼鍚嶇О">{{this.routeInfo[0].routeName}}</el-descriptions-item>-->
+<!-- <el-descriptions-item label="浜у搧缂栫爜">{{this.routeInfo[0].productCode}}</el-descriptions-item>-->
+<!-- <el-descriptions-item label="浜у搧鍚嶇О">{{this.routeInfo[0].productName}}</el-descriptions-item>-->
+<!-- </el-descriptions>-->
+ <el-descriptions class="margin-top" :contentStyle="labelStyle" :column="3" :size="size" border>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-user"></i>
+ 娴佺▼缂栫爜
+ </template>
+ {{this.queryParams.routeCode}}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-mobile-phone"></i>
+ 娴佺▼鍚嶇О
+ </template>
+ {{this.routeInfo[0].routeName}}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-location-outline"></i>
+ 浜у搧缂栫爜
+ </template>
+ {{this.routeInfo[0].productCode}}
+ </el-descriptions-item>
+ <el-descriptions-item>
+ <template slot="label">
+ <i class="el-icon-tickets"></i>
+ 浜у搧鍚嶇О
+ </template>
+ {{this.routeInfo[0].productName}}
+ </el-descriptions-item>
</el-descriptions>
</el-row>
@@ -179,6 +209,8 @@
name: "RouteChildInfo",
data() {
return {
+ labelStyle: "width: 300px;",
+ size: 'medium',
advancedSearchVisible: false,
// 閬僵灞�
loading: true,
@@ -352,3 +384,4 @@
}
};
</script>
+
--
Gitblit v1.9.3