From 921ed67368431c332b68450a0407b0bd151052c5 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 7f8068b..4219d59 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
@@ -308,12 +308,12 @@
bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
bill.setSettleWeight(data.getSettleWeight());
- if(data.getWet() != null && data.getWet() > 0){
- bill.setWet(data.getWet() +"");
- }
- if(data.getImpurity() != null && data.getImpurity() > 0){
- bill.setImpurity(data.getImpurity()+"");
- }
+// if(data.getWet() != null && data.getWet() > 0){
+// bill.setWet(data.getWet() +"");
+// }
+// if(data.getImpurity() != null && data.getImpurity() > 0){
+// bill.setImpurity(data.getImpurity()+"");
+// }
bill.setPrice(data.getPrice()== null ? "" :data.getPrice() + "");
if(data.getSettleMoney() <= 0){
--
Gitblit v1.9.3