root/WmsStandard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:策略管理包结构修改2

Browse Source
This commit is contained in:
zhangzq
2025-06-26 13:58:24 +08:00
parent de643e472c
commit 7b9ad26e11
16 changed files with 117 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/sectStrategy/StSectStrategyController.java
View File

@@ -4,8 +4,8 @@ package org.nl.wms.decision_manage.controller.sectStrategy;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService;
import org.nl.wms.decision_manage.service.dao.StSectStrategy;
import org.nl.wms.decision_manage.service.dto.SectStrategyQuery;
import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy;
import org.nl.wms.decision_manage.service.sectStrategy.dto.SectStrategyQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/controller/strategyConfig/StStrategyConfigController.java
View File

@@ -11,8 +11,8 @@ import cn.dev33.satoken.annotation.SaIgnore;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.utils.MapOf;
import org.nl.wms.decision_manage.service.strategyConfig.IStStrategyConfigService;
import org.nl.wms.decision_manage.service.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.dto.StrategyQuery;
import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.strategyConfig.dto.StrategyQuery;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/StSectStrategyMapper.java
View File

@@ -1,7 +1,7 @@
package org.nl.wms.decision_manage.service.sectStrategy.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.decision_manage.service.dao.StSectStrategy;
import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy;
/**
* <p>

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/mapper/xml/StSectStrategyMapper.xml
View File

@@ -1,5 +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="org.nl.wms.decision_manage.service.dao.mapper.StSectStrategyMapper">
<mapper namespace="org.nl.wms.decision_manage.service.sectStrategy.dao.mapper.StSectStrategyMapper">
</mapper>

3
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dto/SectStrategyQuery.java
View File

@@ -4,8 +4,7 @@ import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.common.domain.query.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.decision_manage.service.dao.StSectStrategy;
import org.nl.wms.decision_manage.service.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy;
/*
* @author ZZQ

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/impl/StSectStrategyServiceImpl.java
View File

@@ -2,8 +2,8 @@ package org.nl.wms.decision_manage.service.sectStrategy.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.decision_manage.service.sectStrategy.IStSectStrategyService;
import org.nl.wms.decision_manage.service.dao.StSectStrategy;
import org.nl.wms.decision_manage.service.dao.mapper.StSectStrategyMapper;
import org.nl.wms.decision_manage.service.sectStrategy.dao.StSectStrategy;
import org.nl.wms.decision_manage.service.sectStrategy.dao.mapper.StSectStrategyMapper;
import org.springframework.stereotype.Service;
/**

6
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/IStStrategyConfigService.java
View File

@@ -1,9 +1,9 @@
package org.nl.wms.decision_manage.service.strategyConfig;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.decision_manage.service.dao.StStrategyConfig;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.decision_manage.service.dto.StrategyQuery;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.strategyConfig.dto.StrategyQuery;
/**
* <p>

5
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/StStrategyConfigMapper.java
View File

@@ -3,8 +3,9 @@ package org.nl.wms.decision_manage.service.strategyConfig.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.decision_manage.service.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.dto.StrategyQuery;
import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.strategyConfig.dto.StrategyQuery;
import java.util.List;
import java.util.Map;

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml
View File

@@ -1,6 +1,6 @@
<?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="org.nl.wms.decision_manage.service.dao.mapper.StStrategyConfigMapper">
<mapper namespace="org.nl.wms.decision_manage.service.strategyConfig.dao.mapper.StStrategyConfigMapper">
<select id="getPageQuery" resultType="java.util.Map">
SELECT
*

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dto/StrategyQuery.java
View File

@@ -4,7 +4,7 @@ import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.common.domain.query.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.decision_manage.service.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig;
/*
* @author ZZQ

6
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/impl/StStrategyConfigServiceImpl.java
View File

@@ -11,12 +11,12 @@ import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.decision_manage.service.strategyConfig.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.strategyConfig.dao.mapper.StStrategyConfigMapper;
import org.nl.wms.decision_manage.service.strategyConfig.dto.StrategyQuery;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.nl.wms.decision_manage.service.strategyConfig.IStStrategyConfigService;
import org.nl.wms.decision_manage.service.dao.StStrategyConfig;
import org.nl.wms.decision_manage.service.dao.mapper.StStrategyConfigMapper;
import org.nl.wms.decision_manage.service.dto.StrategyQuery;
import java.util.List;
import java.util.Map;

34
nladmin-ui/src/components/TableEnum/TableEnum.js Normal file
View File

@@ -0,0 +1,34 @@
import Vue from 'vue'
import { tableEnum as getEnumDetail } from '@/views/system/dict/enumDetail'
// tableEnums: ['st_ivt_bsrealstorattr#stor_name#stor_code'],
export default class TableEnum {
constructor(tableEnum) {
this.tableEnum = tableEnum
}
async init(names, completeCallback) {
if (names === undefined || name === null) {
throw new Error('need TableEnum names')
}
const ps = []
names.forEach(n => {
const split = n.split('#')
const code = split[0]
const label = split[1]
const value = split[2]
Vue.set(this.tableEnum.tableEnum, code, {})
Vue.set(this.tableEnum.label, code, {})
Vue.set(this.tableEnum, code, [])
ps.push(getEnumDetail({ 'code': code, 'label': label, 'value': value }).then(data => {
this.tableEnum[code].splice(0, 0, ...data)
data.forEach(d => {
Vue.set(this.tableEnum.tableEnum[code], d.value, d)
Vue.set(this.tableEnum.label[code], d.value, d.label)
})
}))
})
await Promise.all(ps)
completeCallback()
}
}

29
nladmin-ui/src/components/TableEnum/index.js Normal file
View File

@@ -0,0 +1,29 @@
import TableEnum from './TableEnum'
const install = function(Vue) {
Vue.mixin({
data() {
if (this.$options.tableEnums instanceof Array) {
const tableEnum = {
tableEnum: {},
label: {}
}
return {
tableEnum
}
}
return {}
},
created() {
if (this.$options.tableEnums instanceof Array) {
new TableEnum(this.tableEnum).init(this.$options.tableEnums, () => {
this.$nextTick(() => {
this.$emit('dictReady')
})
})
}
}
})
}
export default { install }

2
nladmin-ui/src/main.js
View File

@@ -11,6 +11,7 @@ import 'mavon-editor/dist/css/index.css'
// 数据字典
import dict from './components/Dict'
import tableEnum from './components/TableEnum'
import scroll from 'vue-seamless-scroll'
// 权限指令
@@ -71,6 +72,7 @@ Vue.use(VueHighlightJS)
Vue.use(mavonEditor)
Vue.use(permission)
Vue.use(dict)
Vue.use(tableEnum)
Vue.use(VueBus)
// 全局设置控件样式https://codeantenna.com/a/0IN5FMJk5h
Element.Table.props.border = { type: Boolean, default: true }

22
nladmin-ui/src/views/system/dict/enumDetail.js Normal file
View File

@@ -0,0 +1,22 @@
import request from '@/utils/request'
export function get(code) {
const params = {
code
}
return request({
url: 'api/dict/getStatusEnum',
method: 'get',
params
})
}
export function tableEnum(params) {
return request({
url: 'api/dict/getTableEnum',
method: 'get',
params
})
}
export default { get, tableEnum }

18
nladmin-ui/src/views/wms/decision_manage/sectStrategy/AddDialog.vue
View File

@@ -50,7 +50,7 @@
style="width: 200px"
>
<el-option
v-for="item in classTypeList"
v-for="item in tableEnum.st_ivt_sectattr"
:key="item.id"
:label="item.label"
:value="item.value"
@@ -106,6 +106,8 @@ import CRUD, { form, crud } from '@crud/crud'
export default {
name: 'AddDialog',
tableEnums: ['st_ivt_sectattr#sect_name#sect_code'],
mixins: [form(defaultForm), crud()],
props: {
dialogShow: {
@@ -116,13 +118,6 @@ export default {
type: Object
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
data() {
return {
dialogVisible: false,
@@ -155,6 +150,13 @@ export default {
}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
handleClose(done) {
this.$confirm('确认关闭？')