From b32697542f61ab9f6579aed1321d2916dd278eb5 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 07 七月 2023 17:16:48 +0800
Subject: [PATCH] 出入库测试

---
 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 39ad1ad..9023442 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
@@ -148,7 +148,7 @@
      */
     public String outWeightBill(InoutData data) {
         // 鑾峰彇琛ㄥ崟鏁版嵁
-        WeightBill bill = this.createBillData(data, "鍑哄簱绉伴噸鍗�");
+        WeightBill bill = this.createBillData(data, "鍑哄簱鍒掔爜鍗�");
 
         //榛樿妯$増
         String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
@@ -190,7 +190,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());
@@ -212,13 +212,13 @@
                 new DecimalFormat("0").format(bill.getNetWeight()));
 
         htmlStr = htmlStr.replace("remark", bill.getRemark());
-        htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
+//        htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
         htmlStr = htmlStr.replace("settleWeight",
                 new DecimalFormat("0").format(bill.getSettleWeight()));
-
+        htmlStr = htmlStr.replace("deHandle", bill.getDeHandle() + "");
         htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
         htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
-
+        htmlStr = htmlStr.replace("deOther", bill.getDeOther() + "");
         htmlStr = htmlStr.replace("price", bill.getPrice());
         htmlStr = htmlStr.replace("settleMoney", bill.getSettleMoney() + "");
         htmlStr = htmlStr.replace("wet", bill.getWet() + "");

--
Gitblit v1.9.3