From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index b8dd7a2..5384b2b 100755
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -590,8 +590,8 @@
row.createCell(7).setCellValue(dataObj.getString("supplierName"));
row.createCell(8).setCellValue(dataObj.getString("shName"));
row.createCell(9).setCellValue(dataObj.getString("warehousingWayName") + dataObj.getString("resOrderTypeName"));
- row.createCell(10).setCellValue(dataObj.getString("quantity"));
- row.createCell(11).setCellValue(dataObj.getString("purchaseQuantity"));
+ row.createCell(10).setCellValue(dataObj.getString("quantity") + dataObj.getString("unitCodeName"));
+ row.createCell(11).setCellValue(dataObj.getString("purchaseQuantity") + dataObj.getString("unitCodeName"));
row.createCell(12).setCellValue(dataObj.getString("price"));
if (!StringUtil.isEmpty(dataObj.getString("resOrderType")) && dataObj.getString("resOrderType").equals("10000") &&
!StringUtil.isEmpty(dataObj.getString("purchaseQuantity")) && !StringUtil.isEmpty(dataObj.getString("price"))) { //鐘舵�佹槸鍏ュ簱
@@ -648,10 +648,10 @@
row.createCell(2).setCellValue("鐗╁搧绫诲瀷");
row.createCell(3).setCellValue("鐗╁搧鍚嶇О");
row.createCell(4).setCellValue("鐗╁搧瑙勬牸");
- row.createCell(5).setCellValue("鍘熸湁搴撳瓨");
+ row.createCell(5).setCellValue("琚皟浠撳簱鍘熷簱瀛�");
row.createCell(6).setCellValue("璋冩嫧鏁伴噺");
- row.createCell(7).setCellValue("鍓嶄粨搴撳悕绉�");
- row.createCell(8).setCellValue("鍚庝粨搴撳悕绉�");
+ row.createCell(7).setCellValue("琚皟浠撳簱");
+ row.createCell(8).setCellValue("鐩爣浠撳簱");
row.createCell(9).setCellValue("鐢宠浜篒D");
row.createCell(10).setCellValue("鐢宠浜�");
row.createCell(11).setCellValue("璋冩嫧璇存槑");
@@ -671,8 +671,8 @@
row.createCell(2).setCellValue(dataObj.getString("rstName"));
row.createCell(3).setCellValue(dataObj.getString("resName"));
row.createCell(4).setCellValue(dataObj.getString("specName"));
- row.createCell(5).setCellValue(dataObj.getString("originalStock"));
- row.createCell(6).setCellValue(dataObj.getString("stock"));
+ row.createCell(5).setCellValue(dataObj.getString("originalStock") + dataObj.getString("unitCodeName"));
+ row.createCell(6).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
if (!StringUtil.isEmpty(dataObj.getString("applyType")) && dataObj.getString("applyType").equals("20000")) { //杩旇繕
row.createCell(7).setCellValue(dataObj.getString("startUserName"));
} else {
@@ -729,9 +729,9 @@
} else {
row.createCell(7).setCellValue("--");
}
- row.createCell(8).setCellValue(dataObj.getString("stock"));
- row.createCell(9).setCellValue(dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
- row.createCell(10).setCellValue(dataObj.getString("miniStock"));
+ row.createCell(8).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
+ row.createCell(9).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
+ row.createCell(10).setCellValue(dataObj.getString("miniStock") + dataObj.getString("miniUnitCodeName"));
row.createCell(11).setCellValue(dataObj.getString("averagePrice"));
if (!StringUtil.isEmpty(dataObj.getString("stock")) && !StringUtil.isEmpty(dataObj.getString("averagePrice"))) {
//鑾峰彇鐗╁搧搴撳瓨鏁伴噺
@@ -851,8 +851,8 @@
row.createCell(4).setCellValue(dataObj.getString("specName"));
row.createCell(5).setCellValue(dataObj.getString("acceptUserId"));
row.createCell(6).setCellValue(dataObj.getString("acceptUserName"));
- row.createCell(7).setCellValue(dataObj.getString("stock"));
- row.createCell(8).setCellValue(dataObj.getString("giveQuantity"));
+ row.createCell(7).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
+ row.createCell(8).setCellValue(dataObj.getString("giveQuantity") + dataObj.getString("miniUnitCodeName"));
row.createCell(9).setCellValue(dataObj.getString("createTime"));
row.createCell(10).setCellValue(dataObj.getString("remark"));
}
@@ -887,7 +887,7 @@
row.createCell(3).setCellValue(dataObj.getString("rstName"));
row.createCell(4).setCellValue(dataObj.getString("resourceStoreName"));
row.createCell(5).setCellValue(dataObj.getString("specName"));
- row.createCell(6).setCellValue(dataObj.getString("quantity"));
+ row.createCell(6).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
row.createCell(7).setCellValue(dataObj.getString("unitPrice"));
row.createCell(8).setCellValue(dataObj.getString("createUserId"));
row.createCell(9).setCellValue(dataObj.getString("createUserName"));
--
Gitblit v1.8.0