From 2357e01c50691622de0522dbee1fd9b3daf16da8 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 12 Dec 2024 14:35:36 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=BA=93=E5=AD=98=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../struct/service/dao/mapper/xml/StIvtStructattrMapper.xml | 2 +- .../nl/wms/stor_manage/struct/service/dto/StructattrQuery.java | 1 + .../struct/service/impl/StIvtStructattrServiceImpl.java | 2 +- wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index 5619d64d..07317de8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml @@ -136,7 +136,7 @@ vm.qty, vm.frozen_qty, vm.unit_id, - vm.vehicle_id, + vm.id, vm.parent_vehicle_code, material.material_code, material.material_name, diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java index 0f8955c9..3aaec7d5 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java @@ -16,6 +16,7 @@ public class StructattrQuery extends BaseQuery { private String search; private String stor_code; private String sect_code; + private String struct_code; private String lock_type; private Boolean is_used; private String vehicle_code; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java index 6579c683..48084ca6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java @@ -200,7 +200,7 @@ public class StIvtStructattrServiceImpl extends ServiceImpl getStructIvt(StructattrQuery query, PageQuery pageQuery) { Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); - page.setOrderBy("struct.create_time DESC"); + page.setOrderBy("struct.update_time DESC"); List mst_detail = this.baseMapper.getStructIvt(query, pageQuery); TableDataInfo build = TableDataInfo.build(mst_detail); build.setTotalElements(page.getTotal()); diff --git a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js index b3824329..9c785cc5 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js +++ b/wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/structattr.js @@ -105,7 +105,7 @@ export function exportFile(data) { return request({ url: '/api/structattr/exportFile', method: 'post', - renponseType: 'blob', + responseType: 'blob', data }) }