diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java index 0c42e09e..b24f4add 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/AcceptFormulaServiceImpl.java @@ -76,11 +76,11 @@ public class AcceptFormulaServiceImpl implements AcceptFormulaService { if (!StrUtil.isEmpty(accept_pcsn)) { map.put("accept_pcsn", "%"+accept_pcsn+"%"); } - String begin_time = map.get("begin_time"); + String begin_time = (String) whereJson.get("begin_time"); if (StrUtil.isNotEmpty(begin_time)) { map.put("begin_time", begin_time.substring(0,10)+" 00:00:00"); } - String end_time = map.get("end_time"); + String end_time = (String) whereJson.get("end_time"); if (StrUtil.isNotEmpty(end_time)) { map.put("end_time", end_time.substring(0,10)+" 23:59:59"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicePairQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicePairQueryServiceImpl.java index f711dc90..7cd4dedb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicePairQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/service/impl/DevicePairQueryServiceImpl.java @@ -36,16 +36,20 @@ public class DevicePairQueryServiceImpl implements DevicePairQueryService { String repair_code = MapUtil.getStr(whereJson, "repair_code"); String device_code = MapUtil.getStr(whereJson, "device_code"); String invstatus = MapUtil.getStr(whereJson, "invstatus"); - String begin_time = MapUtil.getStr(whereJson, "begin_time"); - String end_time = MapUtil.getStr(whereJson, "end_time"); String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); String class_idStr = (String) whereJson.get("class_idStr"); HashMap map = new HashMap<>(); map.put("flag", "1"); map.put("invstatus",invstatus); - map.put("begin_time",begin_time); - map.put("end_time",end_time); + 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 (ObjectUtil.isNotEmpty(repair_code)) map.put("repair_code","%"+repair_code+"%"); if (ObjectUtil.isNotEmpty(device_code)) map.put("device_code","%"+device_code+"%"); //处理物料当前节点的所有子节点 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql index ae7193c6..1f55acbe 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/EM_DEVICEFAULTCAE01.wql @@ -55,8 +55,8 @@ MAX(file.device_code) AS device_code, MAX(file.device_model) AS device_model, re.devicerecord_id, - MAX( file.device_name ) AS device_name, - MAX( file.extend_code ) AS extend_code + MAX(file.device_name) AS device_name, + MAX(file.extend_code) AS extend_code FROM EM_BI_DeviceRepairRequest re LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = re.devicerecord_id @@ -68,25 +68,20 @@ OPTION 输入.classIds <> "" class.class_id in 输入.classIds ENDOPTION - OPTION 输入.device_gz <> "" fclass.device_faultclass_id = 输入.device_gz ENDOPTION - OPTION 输入.device_code <> "" (file.device_code like 输入.device_code or file.device_name like 输入.device_code) ENDOPTION - OPTION 输入.dept_id <> "" (dept.code like 输入.dept_id or dept.name like 输入.dept_id) ENDOPTION - OPTION 输入.begin_time <> "" re.fault_time >= 输入.begin_time ENDOPTION - OPTION 输入.end_time <> "" re.fault_time <= 输入.end_time ENDOPTION diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java index 46183199..d0f5b2d5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/CheckOutBillServiceImpl.java @@ -79,6 +79,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { if (StrUtil.isNotEmpty(map.get("buss_type"))) { map.put("buss_type", whereJson.get("buss_type") + "%"); } + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + if (StrUtil.isNotEmpty(begin_time)) { + map.put("begin_time", begin_time.substring(0,10)+" 00:00:00"); + } + String end_time = MapUtil.getStr(whereJson, "end_time"); + if (StrUtil.isNotEmpty(end_time)) { + map.put("end_time", end_time.substring(0,10)+" 23:59:59"); + } if (StrUtil.isNotEmpty(map.get("io_type"))) { map.put("io_type", map.get("io_type")); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java index 0bdc718a..16466bff 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/PhysicalQueryServiceImpl.java @@ -32,8 +32,14 @@ public class PhysicalQueryServiceImpl implements PhysicalQueryService { String material_model = MapUtil.getStr(whereJson, "material_model"); HashMap map = new HashMap<>(); map.put("flag", "1"); - map.put("begin_time", MapUtil.getStr(whereJson, "begin_time")); - map.put("end_time", MapUtil.getStr(whereJson, "end_time")); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + if (StrUtil.isNotEmpty(begin_time)) { + map.put("begin_time", begin_time.substring(0,10)+" 00:00:00"); + } + String end_time = MapUtil.getStr(whereJson, "end_time"); + if (StrUtil.isNotEmpty(end_time)) { + map.put("end_time", end_time.substring(0,10)+" 23:59:59"); + } map.put("inspection_code", MapUtil.getStr(whereJson, "inspection_code")); if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn","%"+pcsn+"%"); if (ObjectUtil.isNotEmpty(material_model)) map.put("material_model","%"+material_model+"%"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/RawUatWcQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/RawUatWcQueryServiceImpl.java index 860c4cd1..44b7750a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/RawUatWcQueryServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/RawUatWcQueryServiceImpl.java @@ -41,8 +41,14 @@ public class RawUatWcQueryServiceImpl implements RawUatWcQueryService { String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); HashMap map = new HashMap<>(); map.put("flag", "1"); - map.put("begin_time", MapUtil.getStr(whereJson,"begin_time")); - map.put("end_time", MapUtil.getStr(whereJson,"end_time")); + 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)); + } map.put("receive_code", MapUtil.getStr(whereJson,"receive_code")); if (ObjectUtil.isNotEmpty(pcsn)) map.put("pcsn", "%"+pcsn+"%"); map.put("bill_status", MapUtil.getStr(whereJson,"bill_status")); diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue index dee03250..281e2b13 100644 --- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue @@ -481,9 +481,6 @@ export default { this.mstrow = this.checkrows.pop() this.changeShow = true }, - onInput() { - this.$forceUpdate() - }, submit(status) { this.checkrows = this.$refs.table.selection if (this.checkrows.length === 0) { @@ -541,6 +538,9 @@ export default { this.crud.loading = false }) }, + onInput() { + this.$forceUpdate() + }, mytoQuery(array1) { if (array1 === null) { this.crud.query.begin_time = '' diff --git a/mes/qd/src/views/wms/pf/acceptformula/index.vue b/mes/qd/src/views/wms/pf/acceptformula/index.vue index 5253c3dd..c14be9dd 100644 --- a/mes/qd/src/views/wms/pf/acceptformula/index.vue +++ b/mes/qd/src/views/wms/pf/acceptformula/index.vue @@ -12,7 +12,7 @@ label-width="80px" label-suffix=":" > - + - + - - + + - - - - - - - - + + + + + + + + diff --git a/mes/qd/src/views/wms/sb/stat/devicerepairquery/index.vue b/mes/qd/src/views/wms/sb/stat/devicerepairquery/index.vue index d9d6c2ca..8ff6915e 100644 --- a/mes/qd/src/views/wms/sb/stat/devicerepairquery/index.vue +++ b/mes/qd/src/views/wms/sb/stat/devicerepairquery/index.vue @@ -48,7 +48,16 @@ /> - + - - - + + + @@ -287,6 +296,19 @@ export default { return '维修计划' } }, + 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() + }, downdtl() { if (this.currentRow !== null) { crud.downloadLoading = true diff --git a/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue b/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue index 544699c2..c3689a4a 100644 --- a/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/ioStorQuery/index.vue @@ -151,7 +151,8 @@ start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" - @change="crud.toQuery" + @input="onInput()" + @change="mytoQuery" /> @@ -238,6 +239,7 @@ import DivDialog from '@/views/wms/statistics/ioStorQuery/DivDialog' import TaskDialog from '@/views/wms/statistics/ioStorQuery/TaskDialog' import crudStorattr from '@/api/wms/basedata/st/storattr' import crudRawAssist from '@/api/wms/st/core/inbill/rawassist' +import Date from '@/utils/datetime' export default { name: 'IoStorQuery', @@ -269,6 +271,7 @@ export default { dis_flag: true, work_flag: true, openParam: [], + query_flag: true, mstrow: {}, currentRow: null, checkrows: [], @@ -289,9 +292,15 @@ export default { checkoutbill.getType().then(res => { this.billtypelist = res }) + this.crud.query.createTime = [new Date().daysAgo(30), new Date()] }, methods: { [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 + } this.handleCurrentChange(null) }, fun(val) { @@ -315,6 +324,19 @@ export default { this.$refs.table.clearSelection() this.handleCurrentChange(null) }, + 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() + }, buttonChange(current) { if (current !== null) { this.currentRow = current diff --git a/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue b/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue index 5937536d..b99a80dc 100644 --- a/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/phySicalQuery/index.vue @@ -15,7 +15,16 @@ - + @@ -124,13 +133,13 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - - + + + + + @@ -150,10 +159,11 @@ import DateRangePicker from '@/components/DateRangePicker' import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst' import { download } from '@/api/data' import { downloadFile } from '@/utils' +import Date from '@/utils/datetime' export default { name: 'PhySicalQuery', - components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker }, + components: { pagination, crudOperation, rrOperation }, mixins: [presenter(), header(), crud()], cruds() { return CRUD({ @@ -179,6 +189,7 @@ export default { return { cols: [], statusList: [], + query_flag: true, permission: { }, rules: { @@ -187,10 +198,16 @@ export default { beforeCreate() { }, created() { + 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 + } crudPhySicalQuery.getHeader().then(res => { this.cols = res }) @@ -198,6 +215,19 @@ export default { this.statusList = res }) }, + 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() + }, hand(value) { this.crud.toQuery() }, diff --git a/mes/qd/src/views/wms/statistics/productmouth/index.vue b/mes/qd/src/views/wms/statistics/productmouth/index.vue index d85d6695..47187d9d 100644 --- a/mes/qd/src/views/wms/statistics/productmouth/index.vue +++ b/mes/qd/src/views/wms/statistics/productmouth/index.vue @@ -45,13 +45,13 @@ - + - - - - + + + + diff --git a/mes/qd/src/views/wms/statistics/rawUatCbQuery/index.vue b/mes/qd/src/views/wms/statistics/rawUatCbQuery/index.vue index b1c314d7..d5024d01 100644 --- a/mes/qd/src/views/wms/statistics/rawUatCbQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/rawUatCbQuery/index.vue @@ -13,7 +13,16 @@ > - + @@ -96,13 +105,13 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - - + + + + + @@ -122,6 +131,7 @@ import DateRangePicker from '@/components/DateRangePicker' import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst' import {download} from "@/api/data"; import {downloadFile} from "@/utils"; +import Date from '@/utils/datetime' export default { name: 'RawUatCbQuery', @@ -159,11 +169,16 @@ export default { beforeCreate() { }, created() { - + 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 + } var str = this.$route.path // var material_type_id = str.substring(str.length - 2) // 截取最后一个/之后的内容 @@ -179,6 +194,19 @@ export default { this.query.material_type_id = str return true }, + 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() + }, hand(value) { this.crud.toQuery() }, diff --git a/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue b/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue index 82a3cd8d..3fe4cc3a 100644 --- a/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue +++ b/mes/qd/src/views/wms/statistics/rawUatWcQuery/index.vue @@ -13,7 +13,16 @@ > - + @@ -96,13 +105,13 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - - + + + + + @@ -122,6 +131,7 @@ import DateRangePicker from '@/components/DateRangePicker' import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst' import {download} from "@/api/data"; import {downloadFile} from "@/utils"; +import Date from '@/utils/datetime' export default { name: 'RawUatWcQuery', @@ -159,11 +169,16 @@ export default { beforeCreate() { }, created() { - + 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 + } var str = this.$route.path // var material_type_id = str.substring(str.length - 2) // 截取最后一个/之后的内容 @@ -182,6 +197,19 @@ export default { hand(value) { this.crud.toQuery() }, + 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() + }, downdtl() { if (this.currentRow !== null) { crud.downloadLoading = true