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

优化

Browse Source
This commit is contained in:
zds
2022-12-01 12:24:32 +08:00
parent 7a741704d3
commit 1091de1e92
7 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/wql/QPAD_EMPTY_VEHICLE.wql
View File

@@ -99,8 +99,8 @@
mb.material_code
FROM
pdm_bi_procedureoffline off
LEFT JOIN md_me_materialbase mb ON mb.material_id = off.material_id
LEFT JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = off.bucketunique AND bucket.`status` = '02'
INNER JOIN md_me_materialbase mb ON mb.material_id = off.material_id
INNER JOIN md_pb_bucketrecord bucket ON bucket.bucketunique = off.bucketunique AND bucket.`status` = '02'
WHERE
off.`status` = '0'
AND

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IostordailyServiceImpl.java
View File

@@ -43,6 +43,14 @@ public class IostordailyServiceImpl implements IostordailyService {
String class_idStr = MapUtil.getStr(whereJson, "class_idStr");
HashMap<String, String> map = new HashMap<>(whereJson);
map.put("flag", "1");
String begin_time = MapUtil.getStr(whereJson, "begin_time");
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10));
}
String end_time = MapUtil.getStr(whereJson, "end_time");
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
//处理物料当前节点的所有子节点
if (!StrUtil.isEmpty(material_type_id)) {
map.put("material_type_id", material_type_id);

10
mes/qd/src/views/system/dict/dictDetail.vue
View File

@@ -32,13 +32,13 @@
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column label="所属字典" width="135">
<el-table-column label="所属字典" min-width="135">
{{ query.dictName }}
</el-table-column>
<el-table-column prop="label" label="字典标签" align="center" width="100" />
<el-table-column prop="value" label="字典值" align="center" width="60" />
<el-table-column prop="dictSort" label="排序" align="center" width="45" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" align="center" width="115px" fixed="right">
<el-table-column prop="label" label="字典标签" align="center" min-width="100" />
<el-table-column prop="value" label="字典值" align="center" min-width="60" />
<el-table-column prop="dictSort" label="排序" align="center" min-width="55" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" align="center" min-width="115px" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"

8
mes/qd/src/views/system/dict/index.vue
View File

@@ -30,10 +30,10 @@
</div>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="name" label="名称" />
<el-table-column show-overflow-tooltip prop="description" label="描述" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" width="130px" align="center" fixed="right">
<el-table-column type="selection" width="35" />
<el-table-column prop="name" label="名称" min-width="200" />
<el-table-column prop="description" label="描述" min-width="100" />
<el-table-column v-permission="['admin','dict:edit','dict:del']" label="操作" min-width="130px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"

2
mes/qd/src/views/wms/basedata/master/supp/index.vue
View File

@@ -134,7 +134,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="supp_code" label="供应商编码" min-width="100" />
<el-table-column prop="supp_name" label="供应商名称 " min-width="150" />
<el-table-column prop="supp_name" label="供应商名称 " min-width="250" />
<el-table-column prop="corp_address" label="公司地址" min-width="100" />
<el-table-column prop="corp_tele_no" label="公司电话" min-width="100" />
<el-table-column prop="jurid_name" label="法人代表" min-width="100" />

10
mes/qd/src/views/wms/statistics/powderOrderQuery/index.vue
View File

@@ -161,16 +161,16 @@ export default {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
this.crud.data = []
this.cols = []
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
const now = this.crud.query
crudPowderorder.getHeader(now).then(res => {
this.cols = res
})
}
const now = this.crud.query
crudPowderorder.getHeader(now).then(res => {
this.cols = res
})
return true
},
onInput() {
this.$forceUpdate()

31
mes/qd/src/views/wms/statistics/sendReceiveQuery/index.vue
View File

@@ -36,12 +36,13 @@
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="crud.toQuery"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
@@ -116,6 +117,8 @@ import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudMaterialbase from "@/api/wms/basedata/master/materialbase";
import crudBucketrecord from "@/api/wms/basedata/master/bucketrecord";
import Date from '@/utils/datetime'
import crudPowderorder from '@/api/wms/statistics/powderorder'
const defaultForm = {
stordaily_id: null,
@@ -139,7 +142,7 @@ const defaultForm = {
}
export default {
name: 'SendReceiveQuery',
components: {pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect},
components: {pagination, crudOperation, rrOperation, Treeselect},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -165,6 +168,7 @@ export default {
return {
permission: {},
classes: [],
query_flag: true,
QualityList: [],
IvtList: [],
class_idStr: null,
@@ -189,10 +193,16 @@ export default {
crudBucketrecord.getIvtList().then(res => {
this.IvtList = res
})
this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(30)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
return true
},
queryClassId() {
@@ -208,6 +218,19 @@ export default {
})
})
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
} else {
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
loadClass({ action, parentNode, callback}) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({pid: parentNode.id}).then(res => {