'修改一定啊'

src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -43,11 +43,11 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
     public List<Map<String, Object>> getTruckDetailsOrderList(Map<String, Object> mapVal) {
         Integer orderType = (Integer) mapVal.get("orderType");
         List<Map<String, Object>> truckDetailsOrderList;
-        if (orderType == 3) {
-            truckDetailsOrderList = bmstruckDetailsOrderMapper.getTruckDetailsOrderList(mapVal);
+        if (orderType == 2 || orderType == 1) {
+            truckDetailsOrderList = bmstruckDetailsOrderMapper.getSaleTruckDetailsOrderList(mapVal);
         }
         else {
-            truckDetailsOrderList = bmstruckDetailsOrderMapper.getSaleTruckDetailsOrderList(mapVal);
+            truckDetailsOrderList = bmstruckDetailsOrderMapper.getTruckDetailsOrderList(mapVal);
         }
         return truckDetailsOrderList;
     }
@@ -75,7 +75,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             BigDecimal purchaseOrderId = getFormulaMembers(orderId);
             bmstruckDetailsOrder.setPurchaseOrderId(purchaseOrderId);
         }
-        if (orderType.intValue() == 2) {
+        if (orderType.intValue() == 2 || orderType.intValue() == 1) {
             bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(0));
         }
         bmstruckDetailsOrder.setDetailsId(detailsId);
@@ -224,7 +224,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             formula_string = formula_string.replace("到厂计量湿吨",netWeight.toString())
                     .replace("单价",priceValue.toString());
         }
-        if (orderType.intValue() == 2) {
+        if (orderType.intValue() == 2 || orderType.intValue() == 1) {
 //            BigDecimal distance = new BigDecimal(101);
             // 得到销售汽运计费公式
 //            if (distance.intValue() >= 91 || distance.intValue() <= 109) {