From a41bc7cc4fb5dc4bfbfeaf2ba09aa3487bf6eab9 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Wed, 28 Dec 2022 11:19:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/HandMoveStorServiceImpl.java | 8 +++++++
.../st/instor/wql/QST_IVT_HANDMOVESTOR.wql | 2 +-
.../service/impl/IvtQueryServiceImpl.java | 2 +-
.../moveStor/handmovestor/AddDialog.vue | 18 +++++++-------
.../inStor/moveStor/handmovestor/AddDtl.vue | 2 +-
.../st/inStor/moveStor/handmovestor/index.vue | 24 ++++++++++++++++++-
6 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
index 50865d34..bf15e55b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
@@ -49,6 +49,14 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
if (StrUtil.isNotEmpty(map.get("material_code"))) {
map.put("material_code", "%" + map.get("material_code") + "%");
}
+ String begin_time = map.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");
+ if (StrUtil.isNotEmpty(end_time)) {
+ map.put("end_time", end_time.substring(0,10)+" 23:59:59");
+ }
String deptIds = DataAuthUtil.getDeptStr();
map.put("deptIds", deptIds);
if (StrUtil.isNotEmpty(map.get("buss_type"))) {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql
index 4eb59875..c9c84814 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql
@@ -182,7 +182,7 @@
struct.struct_code like 输入.struct_code
ENDOPTION
OPTION 输入.stor_id <> ""
- ivt2.stor_id = 输入.stor_id
+ struct.stor_id = 输入.stor_id
ENDOPTION
OPTION 输入.sect_id <> ""
struct.sect_id = 输入.sect_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java
index 86d9742a..f79224ba 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java
@@ -184,7 +184,7 @@ public class IvtQueryServiceImpl implements IvtQueryService {
dtl_map.put("品质类型", jo.getString("quality_scode"));
dtl_map.put("库存等级", jo.getString("ivt_level"));
dtl_map.put("是否可用", jo.getString("is_active"));
- dtl_map.put("桶数", jo.getString("bucket_num"));
+ dtl_map.put("桶数", jo.getIntValue("bucket_num"));
dtl_map.put("库存重量", jo.getString("ivt_qty"));
dtl_map.put("可用重量", jo.getString("canuse_qty"));
dtl_map.put("冻结数", jo.getString("frozen_qty"));
diff --git a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue
index e8eb95a8..14a06bdf 100644
--- a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue
+++ b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDialog.vue
@@ -130,19 +130,19 @@
>
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDtl.vue b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDtl.vue
index ff5a163d..73ba8318 100644
--- a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDtl.vue
+++ b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/AddDtl.vue
@@ -100,7 +100,7 @@ export default {
name: 'AddDtl',
components: { rrOperation, pagination },
cruds() {
- return CRUD({ title: '用户', idField: 'stockrecord_id', url: 'api/handmovestor/getStructIvt',
+ return CRUD({ title: '库存物料', idField: 'stockrecord_id', url: 'api/handmovestor/getStructIvt',
query: {
struct_code: '',
remark: '',
diff --git a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue
index f2b24556..a0290971 100644
--- a/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue
+++ b/mes/qd/src/views/wms/st/inStor/moveStor/handmovestor/index.vue
@@ -108,7 +108,8 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
- @change="crud.toQuery"
+ @input="onInput()"
+ @change="mytoQuery"
/>
@@ -200,6 +201,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/st/inStor/moveStor/handmovestor/AddDialog'
import crudStorattr from '@/api/wms/basedata/st/storattr'
+import Date from '@/utils/datetime'
export default {
name: 'Handmovestor',
@@ -234,6 +236,7 @@ export default {
confirm_flag: true,
mstrow: {},
currentRow: null,
+ query_flag: true,
storlist: []
}
},
@@ -247,6 +250,7 @@ export default {
crudStorattr.getStor({ 'is_materialstore': '1' }).then(res => {
this.storlist = res.content
})
+ this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
},
methods: {
canUd(row) {
@@ -254,6 +258,11 @@ export default {
},
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.buss_type = ''
+ 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
+ }
this.handleCurrentChange(null)
},
stateFormat(row) {
@@ -302,6 +311,19 @@ export default {
this.currentRow = {}
}
},
+ 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()
+ },
checkboxT(row) {
return row.bill_status !== '99'
},