From 52b23f1e9f27fa328304581fa4307e9cac7ba5ba Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Fri, 9 Mar 2018 14:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4=E5=8D=95No?=
 =?UTF-8?q?.45719?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3YunKen/Reports/EmployeeExamineReport.xml         | 1 -
 BWP.B3_YunKen/BLActions/OrderFreightData.cs                  | 5 ++---
 .../TypeIoc/SaleOutStoreManyBillsSetFreightPriceIOC.cs       | 2 +-
 BWP.B3_YunKen/TypeIoc/SaleOutStoreSetFreightPriceIOC.cs      | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.xml
index 87e496d..f709f67 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Select xmlns="urn:XDQuery">
   <Columns>
-    <Field name="ID"/>
   </Columns>
   <From>
     <DmoClass class="BWP.B3Sale.BO.CustomerAccept, B3Sale" alias="main"/>
diff --git a/BWP.B3_YunKen/BLActions/OrderFreightData.cs b/BWP.B3_YunKen/BLActions/OrderFreightData.cs
index 76d31a2..53b2fd0 100644
--- a/BWP.B3_YunKen/BLActions/OrderFreightData.cs
+++ b/BWP.B3_YunKen/BLActions/OrderFreightData.cs
@@ -29,13 +29,12 @@ namespace BWP.B3_YunKen.BLActions
             if (bill == null)
                 return;
             if (bill.FreightPayment == 运费支付方式.计重) {
-              bill.FreightPrice = (Money<金额>?)(bill.AllUnitNum * (bill.FreightUnitPrice??0).Value);
+              bill.FreightPrice = (Money<金额>?)((bill.AllUnitNum/1000) * (bill.FreightUnitPrice??0).Value);
             } else if (bill.FreightPayment == 运费支付方式.包车) {
               if (bill.AllUnitNum == 0 || bill.AllUnitNum == null)
                 bill.FreightUnitPrice = null;
               else
-                bill.FreightUnitPrice = bill.FreightPrice / bill.AllUnitNum.Value.Value;
-              
+                bill.FreightUnitPrice = bill.FreightPrice / (bill.AllUnitNum.Value.Value/1000);
             }
         }
 
diff --git a/BWP.B3_YunKen/TypeIoc/SaleOutStoreManyBillsSetFreightPriceIOC.cs b/BWP.B3_YunKen/TypeIoc/SaleOutStoreManyBillsSetFreightPriceIOC.cs
index 9c21e0c..2c7f791 100644
--- a/BWP.B3_YunKen/TypeIoc/SaleOutStoreManyBillsSetFreightPriceIOC.cs
+++ b/BWP.B3_YunKen/TypeIoc/SaleOutStoreManyBillsSetFreightPriceIOC.cs
@@ -25,7 +25,7 @@ namespace BWP.B3_YunKen.TypeIoc
       entity.FreightPrice = @group.Sum(x => (x.FreightPrice ?? 0).Value);
       var result = @group.Sum(x => (x.AllUnitNum ?? 0).Value);
       if(result!=0)
-        entity.FreightUnitPrice = entity.FreightPrice / result;
+        entity.FreightUnitPrice = entity.FreightPrice / (result/1000);
       entity.FreightPayment = dmo.FreightPayment;
     }
   }
diff --git a/BWP.B3_YunKen/TypeIoc/SaleOutStoreSetFreightPriceIOC.cs b/BWP.B3_YunKen/TypeIoc/SaleOutStoreSetFreightPriceIOC.cs
index b7ed34d..3f10efa 100644
--- a/BWP.B3_YunKen/TypeIoc/SaleOutStoreSetFreightPriceIOC.cs
+++ b/BWP.B3_YunKen/TypeIoc/SaleOutStoreSetFreightPriceIOC.cs
@@ -32,7 +32,7 @@ namespace BWP.B3_YunKen.TypeIoc
         var alreadyUnitNum = GetAlreadyAcceptUnitNum(dmo, session);
         if (alreadyUnitNum > 0) {
           if ((alreadyUnitNum + anyNum) >= dmo.AllUnitNum) {
-            entity.FreightPrice = dmo.FreightPrice - ((dmo.FreightUnitPrice??0).Value * alreadyUnitNum);
+            entity.FreightPrice = dmo.FreightPrice - ((dmo.FreightUnitPrice??0).Value * (alreadyUnitNum/1000));
           }
         } else if (anyNum >= dmo.AllUnitNum) {
           entity.FreightPrice = dmo.FreightPrice;