diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql index 820a10750..5a7296111 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql @@ -249,6 +249,7 @@ WHERE 1 = 1 AND struct.lock_type = '1' + AND struct.lock_type <> '88' AND IFNULL(struct.storagevehicle_code,'') <> '' OPTION 输入.remark <> "" diff --git a/lms/nladmin-ui/src/components/Crud/crud.js b/lms/nladmin-ui/src/components/Crud/crud.js index afb522103..ccaa77992 100644 --- a/lms/nladmin-ui/src/components/Crud/crud.js +++ b/lms/nladmin-ui/src/components/Crud/crud.js @@ -169,6 +169,15 @@ function CRUD(options) { } return parseFloat(row[column.property]).toFixed(0) }, + /** + * 格式化数据,保留1位小数 + */ + formatNum1(row, column) { + if (!row[column.property]) { + return 0 + } + return parseFloat(row[column.property]).toFixed(1) + }, /** * 格式化数据,保留2位小数 */ diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue index 41936bad5..ecdd40e65 100644 --- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue +++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue @@ -216,7 +216,7 @@ - + diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue index 4da4783ad..2768fa8af 100644 --- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue +++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue @@ -130,7 +130,7 @@ - +