From 14d191d504606d7d3fb6d2a19eb70c00c71503b6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 20 Jun 2024 09:57:35 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/utils/WaybillHelper.java  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
index a9236af42..54ddb08f0 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -68,7 +68,11 @@ public class WaybillHelper {
         else if("2".equals(carryType)){
             int intWeight = (int) Math.floor(weight);
             double tHasWeight = weight - (double)intWeight;
-            if(tHasWeight == 0.5D){
+
+            if(tHasWeight == 0.0D ){
+                setteldWeight=weight;
+            }
+            else if(tHasWeight == 0.5D ){
                 setteldWeight=weight;
             }
             else if(tHasWeight > 0.5D){
@@ -128,7 +132,10 @@ public class WaybillHelper {
         else if("4".equals(priceType)){
             int intFee = (int) Math.floor(fee);
             double tHasFee = fee - (double)intFee;
-            if(tHasFee == 0.5D){
+            if(tHasFee == 0.0D){
+                settledFee=fee;
+            }
+            else if(tHasFee == 0.5D){
                 settledFee=fee;
             }
             else if(tHasFee > 0.5D){
@@ -255,8 +262,8 @@ public class WaybillHelper {
             // 6000 167
             // 3333 300
             // 5000 0.1
-//            float volumeWeight=166.667f;
-//            System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"3"));
+            float volumeWeight=5.9f;
+            System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"2"));
 //            System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"4"));
 
 //            System.out.println(removeUnSeeChar(" Phuc)"));
@@ -269,10 +276,10 @@ public class WaybillHelper {
 //
 //            String str="T123213\n1231232,";
 //            str=WaybillHelper.formatQueryValue(str);
-            String billCode="SF9189239821389";
-            int len=billCode.length();
-            String mainBillCode=billCode.substring(0,len-4);
-            System.out.print(mainBillCode);
+//            String billCode="SF9189239821389";
+//            int len=billCode.length();
+//            String mainBillCode=billCode.substring(0,len-4);
+//            System.out.print(mainBillCode);
 
         } catch (Exception e) {
             e.printStackTrace();