From 44f2c6f98e394809b8e1eaebe133488c7a32cdb7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 15 十月 2021 10:20:43 +0800
Subject: [PATCH] 1、优化采购管理物品增加二级分类 2、增加仓库是否对外开放 3、修复未绑定业主显示代码问题
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index aadeb0b..66f1049 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -585,7 +585,7 @@
row.createCell(1).setCellValue(dataObj.getString("userName"));
row.createCell(2).setCellValue(dataObj.getString("endUserName"));
row.createCell(3).setCellValue(dataObj.getString("resOrderTypeName"));
- row.createCell(4).setCellValue(dataObj.getString("rstName"));
+ row.createCell(4).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(5).setCellValue(dataObj.getString("resName"));
row.createCell(6).setCellValue(dataObj.getString("specName"));
row.createCell(7).setCellValue(dataObj.getString("supplierName"));
@@ -669,7 +669,7 @@
dataObj = allocationStorehouses.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("applyId"));
row.createCell(1).setCellValue(dataObj.getString("resId"));
- row.createCell(2).setCellValue(dataObj.getString("rstName"));
+ row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(3).setCellValue(dataObj.getString("resName"));
row.createCell(4).setCellValue(dataObj.getString("specName"));
row.createCell(5).setCellValue(dataObj.getString("originalStock") + dataObj.getString("unitCodeName"));
@@ -714,7 +714,12 @@
dataObj = resourceStores.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("resId"));
row.createCell(1).setCellValue(dataObj.getString("shName"));
- row.createCell(2).setCellValue(dataObj.getString("rstName"));
+// row.createCell(2).setCellValue(dataObj.getString("rstName"));
+ if (StringUtil.isEmpty(dataObj.getString("rstName"))) {
+ row.createCell(2).setCellValue(dataObj.getString("parentRstName"));
+ } else {
+ row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
+ }
row.createCell(3).setCellValue(dataObj.getString("resName"));
row.createCell(4).setCellValue(dataObj.getString("rssName"));
row.createCell(5).setCellValue(dataObj.getString("resCode"));
@@ -847,7 +852,7 @@
dataObj = allocationUserStorehouses.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("ausId"));
row.createCell(1).setCellValue(dataObj.getString("resId"));
- row.createCell(2).setCellValue(dataObj.getString("rstName"));
+ row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(3).setCellValue(dataObj.getString("resName"));
row.createCell(4).setCellValue(dataObj.getString("specName"));
row.createCell(5).setCellValue(dataObj.getString("acceptUserId"));
@@ -885,7 +890,7 @@
row.createCell(0).setCellValue(dataObj.getString("rsurId"));
row.createCell(1).setCellValue(dataObj.getString("repairId"));
row.createCell(2).setCellValue(dataObj.getString("resId"));
- row.createCell(3).setCellValue(dataObj.getString("rstName"));
+ row.createCell(3).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(4).setCellValue(dataObj.getString("resourceStoreName"));
row.createCell(5).setCellValue(dataObj.getString("specName"));
row.createCell(6).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
@@ -1197,7 +1202,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/purchaseApplyDetail.listPurchaseApplyDetails" + mapToUrlParam(reqJson);
+ apiUrl = "purchaseApplyDetail.listPurchaseApplyDetails" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1221,7 +1226,7 @@
reqJson.put("userId", pd.getUserId());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/resourceStore.listAllocationStorehouseApplys" + mapToUrlParam(reqJson);
+ apiUrl = "resourceStore.listAllocationStorehouseApplys" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1434,7 +1439,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10001);
- apiUrl ="/reportFeeYearCollection/queryReportFeeYear" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeYearCollection/queryReportFeeYear" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
--
Gitblit v1.8.0