|
@@ -358,13 +358,18 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
|
|
BigDecimal type = DataChange.dataToBigDecimal(map.get("type"));
|
|
BigDecimal type = DataChange.dataToBigDecimal(map.get("type"));
|
|
//根据油品名称ID和非历史油价筛选出符合条件的运价合集
|
|
//根据油品名称ID和非历史油价筛选出符合条件的运价合集
|
|
List<Map<String, Object>> PriceValueList = new ArrayList<>();
|
|
List<Map<String, Object>> PriceValueList = new ArrayList<>();
|
|
- if (type.compareTo(new BigDecimal(1)) == 0) {
|
|
|
|
- PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
|
|
|
|
- }else if(type.compareTo(new BigDecimal(2)) == 0) {
|
|
|
|
- PriceValueList = amsContractTruckPriceMapper.getPriceValueListInward(oilTypeId);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
|
|
|
|
+// if (type.compareTo(new BigDecimal(1)) == 0) {
|
|
|
|
+//
|
|
|
|
+// }else if(type.compareTo(new BigDecimal(2)) == 0) {
|
|
|
|
+// PriceValueList = amsContractTruckPriceMapper.getPriceValueListInward(oilTypeId);
|
|
|
|
+// }
|
|
for (Map<String, Object> stringObjectMap : PriceValueList) {
|
|
for (Map<String, Object> stringObjectMap : PriceValueList) {
|
|
|
|
+ //内转的话复制子表信息并新增
|
|
|
|
+// if(type.compareTo(new BigDecimal(2)) == 0){
|
|
|
|
+// stringObjectMap.get("priceId");
|
|
|
|
+// amsContractTruckPriceMapper.
|
|
|
|
+// }
|
|
//有距离则是销售钢材
|
|
//有距离则是销售钢材
|
|
if (stringObjectMap.get("haulDistance")!=null) {
|
|
if (stringObjectMap.get("haulDistance")!=null) {
|
|
//中标价格或者收货地址(库存)则重新计算价格
|
|
//中标价格或者收货地址(库存)则重新计算价格
|