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-11-27 14:51:58 +08:00
parent e1e2a5d237
commit 06fe040d4f
5 changed files with 109 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
View File

@@ -116,10 +116,18 @@ public abstract class AbstractInManage {
String begin_time = (String) whereJson.get("begin_time"); String begin_time = (String) whereJson.get("begin_time");
String end_time = (String) whereJson.get("end_time"); String end_time = (String) whereJson.get("end_time");
map.put("flag", "2"); map.put("flag", "2");
map.put("receive_code", receive_code); if (StrUtil.isNotEmpty(receive_code)) {
map.put("material_search", material_search); map.put("bill_code", "%" +receive_code + "%");
map.put("begin_time", begin_time); }
map.put("end_time", end_time); if (StrUtil.isNotEmpty(material_search)) {
map.put("material_search", "%" +material_search + "%");
}
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10));
}
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc"); JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
return jo; return jo;
} }

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/RawManage.java
View File

@@ -27,8 +27,12 @@ public class RawManage extends InManage {
if (StrUtil.isNotEmpty(material_search)) { if (StrUtil.isNotEmpty(material_search)) {
map.put("material_search", "%" +material_search + "%"); map.put("material_search", "%" +material_search + "%");
} }
map.put("begin_time", begin_time); if (StrUtil.isNotEmpty(begin_time)) {
map.put("end_time", end_time); map.put("begin_time", begin_time.substring(0,10));
}
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc"); JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
return jo; return jo;
} }

10
mes/qd/src/views/wms/st/core/inbill/backinbill/AddDialog.vue
View File

@@ -152,10 +152,10 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}" :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
> >
<el-table-column type="index" label="序号" width="55" align="center" /> <el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="bucketunique" label="桶号" align="center" /> <el-table-column prop="bucketunique" label="桶号" align="center" min-width="140" />
<el-table-column prop="material_code" label="物料编号" align="center" width="150px" /> <el-table-column prop="material_code" label="物料编号" align="center" min-width="140" />
<el-table-column prop="material_name" label="物料名称" align="center" /> <el-table-column prop="material_name" label="物料名称" align="center" min-width="140" />
<el-table-column prop="plan_qty" width="220" label="负单重量" align="center"> <el-table-column prop="plan_qty" width="140" label="负单重量" align="center">
<template scope="scope"> <template scope="scope">
<el-input-number <el-input-number
v-model="scope.row.plan_qty" v-model="scope.row.plan_qty"
@@ -163,7 +163,7 @@
:precision="3" :precision="3"
:controls="false" :controls="false"
:min="0" :min="0"
style="width: 120px" style="width: 100px"
/> />
</template> </template>
</el-table-column> </el-table-column>

65
mes/qd/src/views/wms/st/core/inbill/backinbill/AddDtl.vue
View File

@@ -10,7 +10,16 @@
> >
<div class="head-container"> <div class="head-container">
<!-- 搜索 --> <!-- 搜索 -->
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd" /> <el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="mytoQuery"
/>
<el-select <el-select
v-model="query.query_type" v-model="query.query_type"
clearable clearable
@@ -52,19 +61,19 @@
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="source_bill_code" label="单据编号" width="120px" /> <el-table-column prop="source_bill_code" label="单据编号" min-width="120px" />
<el-table-column show-overflow-tooltip prop="source_type_name" label="单据类型" width="120px" /> <el-table-column prop="source_type_name" label="单据类型" min-width="120px" />
<el-table-column show-overflow-tooltip prop="receive_date" label="日期" width="120px" /> <el-table-column prop="receive_date" label="日期" min-width="140px" />
<el-table-column show-overflow-tooltip prop="bucketunique" label="桶号" /> <el-table-column prop="bucketunique" label="桶号" min-width="130" />
<el-table-column show-overflow-tooltip prop="material_code" width="100" label="物料编号" /> <el-table-column prop="material_code" min-width="120" label="物料编号" />
<el-table-column show-overflow-tooltip width="135" prop="material_name" label="物料名称" /> <el-table-column min-width="135" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" /> <el-table-column prop="pcsn" label="批次" min-width="90" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" /> <el-table-column prop="struct_code" label="货位" min-width="80" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" /> <el-table-column prop="storagevehicle_code" label="托盘号" min-width="100" />
<el-table-column show-overflow-tooltip prop="need_qty" :formatter="crud.formatNum3" label="实际重量" /> <el-table-column prop="need_qty" :formatter="crud.formatNum3" label="实际重量" min-width="80" />
<el-table-column show-overflow-tooltip prop="quality_scode" :formatter="qualityFormat" label="品质类型" /> <el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型" min-width="80" />
<el-table-column show-overflow-tooltip prop="ivt_level" :formatter="ivtFormat" label="库存等级" /> <el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级" min-width="80" />
<el-table-column show-overflow-tooltip prop="is_active" :formatter="activeFormat" label="是否可用" /> <el-table-column prop="is_active" :formatter="activeFormat" label="是否可用" min-width="80" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />
@@ -81,16 +90,16 @@
import CRUD, { crud, header, presenter } from '@crud/crud' import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index' import DateRangePicker from '@/components/DateRangePicker/index'
import crudRawAssist from '@/api/wms/st/core/inbill/rawassist' import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
import Date from '@/utils/datetime'
const start = new Date() const start = new Date()
export default { export default {
name: 'AddDtl', name: 'AddDtl',
dicts: ['ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'IS_OR_NOT'], dicts: ['ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'IS_OR_NOT'],
components: { crudOperation, rrOperation, pagination, DateRangePicker }, components: { rrOperation, pagination, DateRangePicker },
cruds() { cruds() {
return CRUD({ return CRUD({
title: '用户', title: '用户',
@@ -98,9 +107,6 @@ export default {
crudMethod: {}, crudMethod: {},
optShow: { optShow: {
reset: true reset: true
},
query: {
createTime: [start.daysAgo(7), new Date()]
} }
}) })
}, },
@@ -118,6 +124,7 @@ export default {
return { return {
dialogVisible: false, dialogVisible: false,
rows: [], rows: [],
query_flag: true,
billtypes: [], billtypes: [],
tableData: [] tableData: []
} }
@@ -132,6 +139,11 @@ export default {
methods: { methods: {
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
this.crud.query.bill_type = '000501' this.crud.query.bill_type = '000501'
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
}
return true return true
}, },
open() { open() {
@@ -139,13 +151,13 @@ export default {
crudRawAssist.getType({ 'io_code': '0005', 'io_flag': '00', 'io_other': false }).then(res => { crudRawAssist.getType({ 'io_code': '0005', 'io_flag': '00', 'io_other': false }).then(res => {
this.billtypes = res this.billtypes = res
for (let i = 0; i < this.billtypes.length; i++) { for (let i = 0; i < this.billtypes.length; i++) {
debugger
if (this.billtypes[i].code === '000401' || this.billtypes[i].code === '000601') { if (this.billtypes[i].code === '000401' || this.billtypes[i].code === '000601') {
this.billtypes.splice(i, 1) this.billtypes.splice(i, 1)
i-- i--
} }
} }
}) })
this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
this.crud.toQuery() this.crud.toQuery()
}, },
close() { close() {
@@ -160,6 +172,19 @@ export default {
activeFormat(row, column) { activeFormat(row, column) {
return this.dict.label.IS_OR_NOT[row.is_active] return this.dict.label.IS_OR_NOT[row.is_active]
}, },
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()
},
submit() { submit() {
this.$emit('update:dialogShow', false) this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection this.rows = this.$refs.multipleTable.selection

55
mes/qd/src/views/wms/st/core/inbill/rawassist/AddDtl.vue
View File

@@ -11,7 +11,16 @@
<div class="head-container"> <div class="head-container">
<div v-if="crud.props.searchToggle"> <div v-if="crud.props.searchToggle">
<!-- 搜索 --> <!-- 搜索 -->
<date-range-picker v-model="query.createTime" class="date-item" value-format="yyyy-MM-dd" /> <el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="mytoQuery"
/>
<el-input <el-input
v-model="query.bill_code" v-model="query.bill_code"
clearable clearable
@@ -43,16 +52,16 @@
@selection-change="crud.selectionChangeHandler" @selection-change="crud.selectionChangeHandler"
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="receive_date" label="日期" /> <el-table-column prop="receive_date" label="日期" min-width="90" />
<el-table-column show-overflow-tooltip width="205" prop="source_bill_code" label="单据号" /> <el-table-column prop="source_bill_code" label="单据号" min-width="120" />
<el-table-column prop="source_name" label="供应商" /> <el-table-column prop="source_name" label="供应商" min-width="160" />
<el-table-column show-overflow-tooltip prop="material_code" width="100" label="物料编号" /> <el-table-column prop="material_code" label="物料编号" min-width="140" />
<el-table-column show-overflow-tooltip width="135" prop="material_name" label="物料名称" /> <el-table-column min-width="135" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="class_desc" label="物料类别" /> <el-table-column prop="class_desc" label="物料类别" min-width="90" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" /> <el-table-column prop="pcsn" label="批次" min-width="90" />
<el-table-column show-overflow-tooltip prop="receive_qty" :formatter="crud.formatNum3" label="重量" /> <el-table-column prop="receive_qty" :formatter="crud.formatNum3" label="重量" min-width="90" />
<el-table-column show-overflow-tooltip prop="need_qty" :formatter="crud.formatNum3" label="待入重量" /> <el-table-column prop="need_qty" :formatter="crud.formatNum3" label="待入重量" min-width="90" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" /> <el-table-column prop="qty_unit_name" label="重量单位" min-width="90" />
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination />
@@ -72,6 +81,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination' import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index' import DateRangePicker from '@/components/DateRangePicker/index'
import Date from '@/utils/datetime'
const start = new Date() const start = new Date()
export default { export default {
@@ -84,9 +94,6 @@ export default {
crudMethod: {}, crudMethod: {},
optShow: { optShow: {
reset: true reset: true
},
query: {
createTime: [start.daysAgo(7), new Date()]
} }
}) })
}, },
@@ -104,6 +111,7 @@ export default {
return { return {
dialogVisible: false, dialogVisible: false,
rows: [], rows: [],
query_flag: true,
tableData: [] tableData: []
} }
}, },
@@ -117,14 +125,33 @@ export default {
methods: { methods: {
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
this.crud.query.bill_type = '000101' this.crud.query.bill_type = '000101'
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
}
return true return true
}, },
open() { open() {
this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
this.crud.toQuery() this.crud.toQuery()
}, },
close() { close() {
this.$emit('update:dialogShow', false) this.$emit('update:dialogShow', false)
}, },
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()
},
submit() { submit() {
this.$emit('update:dialogShow', false) this.$emit('update:dialogShow', false)
this.rows = this.$refs.multipleTable.selection this.rows = this.$refs.multipleTable.selection