From 01d96359a638dc880a83e238d990c8724a1690c2 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 23 Aug 2023 16:24:18 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=8D=8A=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StIvtStructivtBcpController.java | 9 ++++---- .../mapper/xml/StIvtStructivtBcpMapper.xml | 5 +++- .../structIvt/dto/StIvtStructivtBcpVo.java | 3 +++ .../StIvtStructivtHrBcpController.java | 4 +--- .../service/tableData/ColumnInfoService.java | 23 ++++++------------- .../semiproduct/semiproductIvt/index.vue | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java index e60ccb62..1160f51b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java @@ -78,10 +78,11 @@ public class StIvtStructivtBcpController { //("半成品库存查询") public ResponseEntity download(StructIvtBcpQuery query, PageQuery page, HttpServletResponse response) { List maps = bcpService.queryAll(query); - String s = JSON.toJSONString(maps); - List bcpVos = JSONArray.parseArray(s, StIvtStructivtBcpVo.class); - columnInfoService.exportFile(bcpVos,response, ListOf.of("is_pick","ivt_level","is_active","qty_unit_id","stor_id","ivt_level","struct_id","material_id","quality_scode"), - MapOf.of("stor_name","仓库名称","material_name","物料名称","material_spec","物料规格","material_code","物料编号","storagevehicle_code","载具编号","vehicle_weight","载具单重(g)")); + columnInfoService.exportFile("st_ivt_structivt_bcp",maps,response, + ListOf.of("struct_code","bill_type","unit_weight","is_pick","ivt_level","is_active","qty_unit_id","stor_id","ivt_level","struct_id","material_id","quality_scode","canuse_qty"), + MapOf.of("stor_name","仓库名称","material_name","物料名称","material_spec","物料规格", + "material_code","物料编号","storagevehicle_code","载具编号","vehicle_weight2","载具单重(kg)" + ,"canuse_qty2","可用重量(kg)","m_qty","物料数量","unit_weight","物料单重(g)")); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index 5c9059c6..8d3d94fa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -143,7 +143,10 @@ attr.sect_name, attr.stor_name, attr.storagevehicle_code, - vehicle.vehicle_weight + vehicle.vehicle_weight, + format(vehicle.vehicle_weight/1000,3) as vehicle_weight2, + format(ivt.canuse_qty/1000,3) as canuse_qty2, + convert(convert(ivt.canuse_qty/ivt.unit_weight,decimal(9,0)),char) as m_qty FROM st_ivt_structivt_bcp ivt LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StIvtStructivtBcpVo.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StIvtStructivtBcpVo.java index 3a23fec4..9aaa7a60 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StIvtStructivtBcpVo.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dto/StIvtStructivtBcpVo.java @@ -99,5 +99,8 @@ public class StIvtStructivtBcpVo { private String stor_name; private String storagevehicle_code; private String vehicle_weight; + private String vehicle_weight2; + private String canuse_qty2; + private String m_qty; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/structLvt/StIvtStructivtHrBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/structLvt/StIvtStructivtHrBcpController.java index ccb86b16..d90a6de9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/structLvt/StIvtStructivtHrBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/controller/structLvt/StIvtStructivtHrBcpController.java @@ -71,9 +71,7 @@ public class StIvtStructivtHrBcpController { //("半成品库存查询") public ResponseEntity download(StructIvtHrBcpQuery query, PageQuery page, HttpServletResponse response) { List maps = bcpService.queryAll(query); - String s = JSON.toJSONString(maps); - List bcpVos = JSONArray.parseArray(s, StIvtStructivtBcpVo.class); - columnInfoService.exportFile(bcpVos,response, + columnInfoService.exportFile("st_ivt_structivt_bcp",maps,response, ListOf.of(""), MapOf.of("stor_name","仓库名称","material_name","物料名称","material_spec","物料规格")); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/tableData/ColumnInfoService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/tableData/ColumnInfoService.java index 05824fd9..4273d8e3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/tableData/ColumnInfoService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/tableData/ColumnInfoService.java @@ -43,21 +43,16 @@ public class ColumnInfoService { }; @SneakyThrows - public void exportFile(List data, HttpServletResponse response,List passParam, Map customizMap) { + public void exportFile(String tableName,List data, HttpServletResponse response,List passParam, Map customizMap) { if (CollectionUtils.isEmpty(data)){ throw new BindException("导出失败,没有导出数据"+data.size()); } List> excel_lst = new ArrayList<>(); - T t = data.get(0); - Class tClass = t.getClass(); - TableName tableName = tClass.getDeclaredAnnotation(TableName.class); + Map t = data.get(0); if (tableName == null){ - tableName = t.getClass().getSuperclass().getDeclaredAnnotation(TableName.class); - if (tableName == null){ - throw new BindException("导出失败,未获取到表名"); - } + throw new BindException("导出失败,未获取到表名"); } - Map map = this.TableColumn(tableName.value()); + Map map = this.TableColumn(tableName); if (!CollectionUtils.isEmpty(passParam)){ for (Object s : passParam) { map.remove(s); @@ -65,16 +60,12 @@ public class ColumnInfoService { } map.putAll(customizMap); if (CollectionUtils.isEmpty(map)){ - throw new BindException("导出失败,表结构信息失败"+tableName.value()); + throw new BindException("导出失败,表结构信息失败"+tableName); } - for (T item : data) { + for (Map item : data) { Map excelMap = new HashMap<>(); for (Map.Entry entry : map.entrySet()) { - try { - Field field = tClass.getDeclaredField(entry.getKey()); - field.setAccessible(true); - excelMap.put(entry.getValue(),field.get(item)); - }catch (NoSuchFieldException ex){} + excelMap.put(entry.getValue(),item.get(entry.getKey())); } excel_lst.add(excelMap); } diff --git a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue index c00f4c9b..d2d48e59 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductIvt/index.vue @@ -95,7 +95,7 @@ - +