From 83baf6d325fc84f397c3445551727e25f804a60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 23 May 2023 18:36:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicOrderPrintController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 966986102..41f4d8432 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -210,7 +210,7 @@ public class BasicOrderPrintController { data.put("data", list); String param = JSON.toJSONString(data); - JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); + JasperUtils.jasperReport(request, response, param, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf"); } public String getStatusName(Integer type){ From 64fcfe9c2272317dcea4d42aa817da50f9b3d6dd Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Tue, 23 May 2023 20:20:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/impl/ThrDeptServiceImpl.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index e01d38dbc..07d4e8c7f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -137,6 +137,7 @@ public class ThrDeptServiceImpl extends ServiceImpl i if (baseResponse.getCode() == 20000) { List responseList = baseResponse.getData().getList(); List list = new ArrayList<>(); + List warehouseList = new ArrayList<>(); for (UdiwmsWarehouseDetail response : responseList) { ThrDeptEntity thrDeptEntity = new ThrDeptEntity(); thrDeptEntity.setPid(0); @@ -148,25 +149,21 @@ public class ThrDeptServiceImpl extends ServiceImpl i thrDeptEntity.setUpdateTime(new Date()); list.add(thrDeptEntity); - List subWarehouseList = response.getSubWarehouses(); - if (CollUtil.isNotEmpty(subWarehouseList)) { - for (UdiwmsWarehouseDetail.SubWarehouse subWarehouse : subWarehouseList) { - ThrInvWarehouseEntity thrInvWarehouseEntity = new ThrInvWarehouseEntity(); - thrInvWarehouseEntity.setCode(subWarehouse.getCode()); - thrInvWarehouseEntity.setName(subWarehouse.getName()); - thrInvWarehouseEntity.setRemark(subWarehouse.getRemark()); - thrInvWarehouseEntity.setThirdSysFk(thirdSysFk); - thrInvWarehouseEntity.setParentId(response.getCode()); - thrInvWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); - thrInvWarehouseEntity.setUpdateTime(new Date()); - thrInvWarehouseDao.insertThrInvWarehouse(thrInvWarehouseEntity); - } - } + ThrInvWarehouseEntity thrInvWarehouseEntity = new ThrInvWarehouseEntity(); + thrInvWarehouseEntity.setCode(response.getCode()); + thrInvWarehouseEntity.setName(response.getName()); + thrInvWarehouseEntity.setRemark(response.getRemark()); + thrInvWarehouseEntity.setThirdSysFk(thirdSysFk); + thrInvWarehouseEntity.setParentId(response.getCode()); + thrInvWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); + thrInvWarehouseEntity.setUpdateTime(new Date()); + warehouseList.add(thrInvWarehouseEntity); } //插入数据 thrDeptDao.insertInvWarehouses(list); + thrInvWarehouseDao.insertThrInvWarehouses(warehouseList); if (list.size() >= limit) { page++; } else {