From 995b0d803cad76839d2d3e2308d9725cdeee4145 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 27 六月 2023 20:02:49 +0800
Subject: [PATCH] 入库问题修改2
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 866b61a..4abd844 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -93,7 +93,7 @@
htmlStr = htmlStr.replace("fullTime", bill.getFullTime());
htmlStr = htmlStr.replace("emptyTime", bill.getEmptyTime());
htmlStr = htmlStr.replace("serId", bill.getSerId());
- htmlStr = htmlStr.replace("specType", bill.getSpecType());
+// htmlStr = htmlStr.replace("specType", bill.getSpecType());
htmlStr = htmlStr.replace("customerName", bill.getCustomerName());
htmlStr = htmlStr.replace("deptName", bill.getUnitName());
@@ -261,7 +261,7 @@
bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),
"yyyy-MM-dd HH:mm:ss"));
bill.setSerId(data.getId());
-// bill.setSpecType(StringUtils.isEmpty(data.getSpecType())?"鏁ｇ伯":data.getSpecType());
+// bill.setSpecType(StringUtils.isEmpty(data.getSpecType()) ? "鏁ｇ伯" : data.getSpecType());
if ("5016".equals(data.getCompanyId())) {
bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));
bill.setSerId(data.getId().substring(2));
@@ -269,7 +269,7 @@
}
//瀹㈡埛淇℃伅
- // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
+ // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());
bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());
bill.setUserId(data.getUserId() == null ? "" : data.getUserId());
bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());
@@ -277,7 +277,7 @@
//浠庨�氱煡鍗曚腑鑾峰彇鏀跺彂璐у崟浣嶄俊鎭�
NoticeDto noticeDto = noticeService.queryNoticeById(data.getNoticeId(), data.getType());
- if(null != noticeDto && StringUtils.isNotEmpty(noticeDto.getUnitName())){
+ if (null != noticeDto && StringUtils.isNotEmpty(noticeDto.getUnitName())) {
bill.setUnitName(noticeDto.getUnitName());
}
@@ -315,13 +315,13 @@
// bill.setImpurity(data.getImpurity()+"");
// }
- bill.setPrice(data.getPrice()== null ? "" :data.getPrice() + "");
- if(data.getSettleMoney() <= 0){
- if(null != data.getPrice() && null != data.getRecordWeight()){
- data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice()*data.getRecordWeight(),2));
+ bill.setPrice(data.getPrice() == null ? "" : data.getPrice() + "");
+ if (data.getSettleMoney() <= 0) {
+ if (null != data.getPrice() && null != data.getRecordWeight()) {
+ data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));
}
}
- bill.setSettleMoney(data.getSettleMoney()== null ? "" :data.getSettleMoney()+"");
+ bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());
return bill;
@@ -373,7 +373,7 @@
String key;
for (CheckItemData item : checkLst) {
key = item.getStandardId() + "_ST";
- // checkBillItems.put(key, item.getStandardValue());
+ // checkBillItems.put(key, item.getStandardValue());
key = item.getStandardId() + "_VAL";
checkBillItems.put(key, item.getValue());
}
@@ -449,7 +449,7 @@
public String inSettleBill(InoutData data, InoutSettle settle) {
if (null != data) {
- // settle.setCompleteTime(data.getCompleteTime());
+ // settle.setCompleteTime(data.getCompleteTime());
settle.setDepotId(data.getDepotId());
settle.setDeptId(data.getDeptId());
// settle.setUserName(data.getUserName());
@@ -614,18 +614,18 @@
}
String htmlStr;
- if(list.size() <= 30){
+ if (list.size() <= 30) {
//鍙湁涓�椤垫椂
- htmlStr = getShipBill(data, list, true,0);
+ htmlStr = getShipBill(data, list, true, 0);
result.add(htmlStr);
- }else {
+ } else {
//鏈夊椤垫椂
- int page = list.size()/30 + 1;
+ int page = list.size() / 30 + 1;
for (int i = 1; i <= page; i++) {
- if(i == page){
- htmlStr = getShipBill(data, list.subList((i-1)*30, list.size()),true, i);
- }else {
- htmlStr = getShipBill(data, list.subList((i-1)*30, i*30),false, i);
+ if (i == page) {
+ htmlStr = getShipBill(data, list.subList((i - 1) * 30, list.size()), true, i);
+ } else {
+ htmlStr = getShipBill(data, list.subList((i - 1) * 30, i * 30), false, i);
}
result.add(htmlStr);
}
@@ -636,6 +636,7 @@
/**
* 鑾峰彇鑸硅繍鎵撳嵃妯℃澘鏁版嵁
+ *
* @param data 娴佹按淇℃伅
* @param list 杞﹁締淇℃伅锛屾暟閲忎笉澶т簬30
* @param moreTag 缁撶畻鏍囩锛宼rue-浠ｈ〃缁撶畻椤碉紱false-涓嶆槸缁撶畻椤�
@@ -646,7 +647,7 @@
//璋冩暣妯＄増鏁版嵁骞惰繑鍥�
String htmlStr = InoutBill.SHIP_WEIGHT_DEFAULT_MORE;
- if(moreTag){
+ if (moreTag) {
htmlStr = InoutBill.SHIP_WEIGHT_DEFAULT;
}
@@ -654,7 +655,7 @@
//琛ㄥご
String billTitle = (dept == null ? "鑸硅繍杩囩鍗�" : dept.getName() + "鑸硅繍杩囩鍗�");
- if(0 != pageNum){
+ if (0 != pageNum) {
billTitle += " - 绗�" + pageNum + "椤�";
}
htmlStr = htmlStr.replace("billTitle", billTitle);
@@ -695,7 +696,7 @@
}
//娣诲姞缁撶畻淇℃伅
- if(moreTag){
+ if (moreTag) {
htmlStr = htmlStr.replace("handleUser", depot == null ? "" : (depot.getStoreKeeperName() == null ? "" : depot.getStoreKeeperName()));
htmlStr = htmlStr.replace("remarks", data.getRemarks() == null ? "" : data.getRemarks());
htmlStr = htmlStr.replace("fullWeight", new DecimalFormat("0").format(data.getFullWeight()));
--
Gitblit v1.9.3