Browse Source

错误提交单No.45719

master
wugang 7 years ago
parent
commit
52b23f1e9f
4 changed files with 4 additions and 6 deletions
  1. +0
    -1
      BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.xml
  2. +2
    -3
      BWP.B3_YunKen/BLActions/OrderFreightData.cs
  3. +1
    -1
      BWP.B3_YunKen/TypeIoc/SaleOutStoreManyBillsSetFreightPriceIOC.cs
  4. +1
    -1
      BWP.B3_YunKen/TypeIoc/SaleOutStoreSetFreightPriceIOC.cs

+ 0
- 1
BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/EmployeeExamineReport.xml View File

@ -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"/>


+ 2
- 3
BWP.B3_YunKen/BLActions/OrderFreightData.cs View File

@ -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);
}
}


+ 1
- 1
BWP.B3_YunKen/TypeIoc/SaleOutStoreManyBillsSetFreightPriceIOC.cs View File

@ -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;
}
}


+ 1
- 1
BWP.B3_YunKen/TypeIoc/SaleOutStoreSetFreightPriceIOC.cs View File

@ -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;


Loading…
Cancel
Save