licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置文件

Browse Source
This commit is contained in:
Ledo 2025-03-01 11:04:41 +08:00
parent 0a90c406b3
commit 82b626db44
8 changed files with 183 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -484,7 +484,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
taskReportMapper.updateById(lastReportDO);
// 生成虚拟入库单
crossOrderManager.generateStockInOrder(taskDispatchDetailDO.getDispatchId(), now, lastReportDO.getAmount());
// crossOrderManager.generateStockInOrder(taskDispatchDetailDO.getDispatchId(), now, lastReportDO.getAmount());
break;
case FINISH:

21
mes-server/src/main/resources/application-dev.yaml
View File

@ -1,5 +1,5 @@
server:
port: 8080
port: 33002
--- #################### 数据库相关配置 ####################
@ -44,20 +44,20 @@ spring:
datasource:
master:
name: mes-heli
url: jdbc:mysql://120.48.141.82:3309/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://120.48.141.82:3306/mes-heli?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
driver-class-name: com.mysql.jdbc.Driver
username: root
password: ${MYSQL_PASSWPRD}
password: qweasd,.123
# slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
# name: ruoyi-vue-pro
# url: jdbc:mysql://localhost:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
# driver-class-name: com.mysql.jdbc.Driver
# username: root
# password: 3WLiVUBEwTbvAfsh
# password: 'heli,12#$'
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 222.71.165.188 # 地址
host: localhost # 地址
port: 6379 # 端口
database: 3 # 数据库索引
password: 'qweasd,.123' # 密码，建议生产环境开启
@ -153,6 +153,8 @@ spring:
logging:
file:
name: ${logback.path}/${spring.application.name}.log # 日志文件名，全路径
level:
com.chanko.yunxi.mes.module.heli: debug
--- #################### 微信公众号相关配置 ####################
wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
@ -185,6 +187,15 @@ mes:
pay:
order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
tenant:
ignoreUrls:
- #登录时租户验证
- /admin-api/system/tenant/get-id-by-name
#登出时租户验证
- /admin-api/system/tenant/get-by-website
- /admin-api/biz/app/latest
- /admin-api/system/captcha/get
- /admin-api/infra/file/**
demo: true # 开启演示模式
tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc

28
mes-server/src/main/resources/application-local.yaml
View File

@ -1,6 +1,6 @@
server:
port: 8080
port: 33859
#@ port:8080
--- #################### 数据库相关配置 ####################
spring:
@ -43,9 +43,15 @@ spring:
primary: master
datasource:
master:
# name: mes-heli-dev
# url: jdbc:mysql://localhost:33061/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
# driver-class-name: com.mysql.cj.jdbc.Driver
# username: root
# password: linus,.123
# master:
name: mes-heli-dev
url: jdbc:mysql://120.48.141.82:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://120.48.141.82:3306/mes-heli-dev?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
driver-class-name: com.mysql.jdbc.Driver
username: root
password: qweasd,.123
# slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
@ -57,9 +63,9 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 222.71.165.188 # 地址
host: 222.75.128.58 # 地址
port: 6379 # 端口
database: 3 # 数据库索引
database: 15 # 数据库索引
password: 'qweasd,.123' # 密码，建议生产环境开启
--- #################### 定时任务相关配置 ####################
@ -187,9 +193,17 @@ mes:
pay:
order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
tenant:
ignoreUrls:
- #登录时租户验证
- /admin-api/system/tenant/get-id-by-name
#登出时租户验证
- /admin-api/system/tenant/get-by-website
- /admin-api/biz/app/latest
- /admin-api/system/captcha/get
- /admin-api/infra/file/**
demo: true # 开启演示模式
tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc
justauth:
enabled: true
type:

13
mes-server/src/main/resources/application-pro.yaml
View File

@ -44,10 +44,10 @@ spring:
datasource:
master:
name: mes-heli
url: jdbc:mysql://120.48.141.82:3306/mes-heli?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
url: jdbc:mysql://localhost:3306/mes-heli?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
driver-class-name: com.mysql.jdbc.Driver
username: root
password: qweasd,.123
password: 'heli,12#$'
# slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
# name: ruoyi-vue-pro
# url: jdbc:mysql://localhost:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
@ -187,6 +187,15 @@ mes:
pay:
order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
refund-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
tenant:
ignoreUrls:
- #登录时租户验证
- /admin-api/system/tenant/get-id-by-name
#登出时租户验证
- /admin-api/system/tenant/get-by-website
- /admin-api/biz/app/latest
- /admin-api/system/captcha/get
- /admin-api/infra/file/**
demo: true # 开启演示模式
tencent-lbs-key: TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E # QQ 地图的密钥 https://lbs.qq.com/service/staticV2/staticGuide/staticDoc

2
mes-server/src/main/resources/application.yaml
View File

@ -1,5 +1,5 @@
logback:
path: D:\files\mes-heli\logs
path: ./logs
spring:
application:
name: mes-server

6
mes-ui/mes-ui-admin-vue3/.env.pro
View File

@ -3,9 +3,9 @@ NODE_ENV=production
VITE_DEV=false
# 请求路径https://star.hz-hl.com/admin-api http://192.168.1.87:8080
VITE_BASE_URL='https://nxhs.cjyx.cc'
# 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080
VITE_BASE_URL='https://nxhs.cjyx.cc'
# 上传路径 http://218.75.46.166:8080
VITE_UPLOAD_URL='https://nxhs.cjyx.cc/admin-api/infra/file/upload'

129
mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelectAll.vue Normal file
View File

@ -0,0 +1,129 @@
<template>
<!-- 负责人选择 -->
<el-select v-if="status1==false" v-model="propsmodelValue" v-loading="loading" element-loading-background="rgb(255, 255, 255)" placeholder="请选择相关人员" :remote-method="remoteMethod" remote-show-suffix remote clearable reserve-keyword filterable :loading="userSelectLoading" @change="onSelectChange" @clear="clearchange" @visible-change="onVisibleChange">
<el-option v-for="item in userSelectList" :key="item.id" :label="item.username + ' ' + item.nickname" :value="item.id" />
</el-select>
<el-select v-else style="text-decoration: line-through" v-model="propsmodelValue" v-loading="loading" element-loading-background="rgb(255, 255, 255)" placeholder="请选择相关人员" :remote-method="remoteMethod" remote-show-suffix remote clearable reserve-keyword filterable :loading="userSelectLoading" @change="onSelectChange" @clear="clearchange" @visible-change="onVisibleChange">
<el-option v-for="item in userSelectList" :key="item.id" :label="item.username + ' ' + item.nickname" :value="item.id" />
</el-select>
</template>
<script lang="ts" setup>
import { ref, onMounted, toRefs, computed } from 'vue'
import * as UserApi from '@/api/system/user'
const props = defineProps({
modelValue: {
type: [Number, String],
required: true // 如果是必需的属性，可以设置为true
}
})
const userParams = {
pageNo: 1,
pageSize: 999,
status: 0, // 根据实际情况调整参数
username: undefined,
nickname: undefined,
userNickName: undefined
}
const valueName: any = ref() //选中的值
const valueNameObject: any = ref() // 存储选中的完整用户对象
const emit = defineEmits(['update:newValue'])
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const userSelectList = ref<UserApi.UserVO[]>([])
const loading = ref(true)
const userSelectLoading = ref(false)
const propsmodelValue = toRefs(props).modelValue // 获取 props 中的 modelValue
const initialValue: any = ref(null) // 存储初始选中的用户 ID
const status1 = ref(false)
const gitlist = async () => {
const data = await UserApi.getUserPage(userParams)
userList.value = []
userSelectList.value = []
userList.value = [...userList.value, ...data.list]
// 设置初始值
if (propsmodelValue.value) {
valueName.value = propsmodelValue.value
const initialUser = await UserApi.getUser(valueName.value)
if (initialUser.status == 1) {
status1.value = true
} else {
status1.value = false
}
// 查找初始用户是否已经在 userList 中
let foundInitialUserInList = false
for (const user of userList.value) {
if (user.id === initialUser.id) {
// propsmodelValue.value=initialUser.username+' '+initialUser.nickname
foundInitialUserInList = true
break
}
}
// 如果初始用户不在列表中，则将其添加到列表开头
if (!foundInitialUserInList && !userSelectList.value.length) {
userList.value.unshift(initialUser)
// propsmodelValue.value=initialUser.username+' '+initialUser.nickname
}
// loading.value = false
}
userSelectList.value = userList.value
loading.value = false
}
const remoteMethod = async (query: any) => {
userSelectLoading.value = true
userSelectList.value = []
try {
if (query) {
userParams.userNickName = query
const data = await UserApi.getUserPage(userParams)
userList.value = data.list
userSelectList.value = data.list
} else {
gitlist()
}
} catch (error) {
console.error(error)
} finally {
userSelectLoading.value = false
}
}
// 初始化用户列表
onMounted(async () => {
try {
await gitlist()
} catch (error) {
console.error(error)
}
})
watch(propsmodelValue, (newValue: any) => {
if (newValue) {
userList.value = []
gitlist()
}
})
const onVisibleChange = (isVisible: boolean) => {
if (!isVisible) {
// 下拉框关闭时，重置查询参数和下拉框列表
userParams.userNickName = undefined
userList.value = []
userSelectList.value = []
} else {
gitlist()
}
}
//清空逻辑传递空值
const clearchange = () => {
emit('update:newValue', undefined)
}
//选择之后传递的值
const onSelectChange = (newValue: any) => {
valueNameObject.value = userList.value.find((user) => user.id === newValue) // 更新选中的完整用户对象
emit('update:newValue', valueNameObject.value)
}
</script>

2
mes-ui/mini-app/src/services/constants.ts
View File

@ -10,5 +10,5 @@
// export const serviceDomain = 'https://star.hz-hl.com'
// export const serviceDomain = 'http://222.71.165.187:9010'
// export const serviceDomain = 'http://localhost:8080'
// export const serviceDomain = 'http://localhost:8080'
export const serviceDomain = 'https://nxhs.cjyx.cc'