提交代码

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

@@ -105,35 +105,40 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             if(bmstruckDetailsOrderMapper.getIsHaveDetailsOrder(weightTaskResultId) > 0 ){
                 continue;
             }
-            BigDecimal detailsAmountOld = generateTruckFees(orderId, weightTaskResultId);
-            Double amount = detailsAmountOld.doubleValue();
-            BigDecimal detailsAmount = new BigDecimal(amount).setScale(2,RoundingMode.HALF_UP);
-            BigDecimal orderType = bmstruckDetailsOrderMapper.getOrderType(orderId);
-            BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
-            if (orderType.intValue() == 3) {
-                BigDecimal purchaseOrderId = getFormulaMembers(orderId);
-                bmstruckDetailsOrder.setPurchaseOrderId(purchaseOrderId);
-            }
-            if (orderType.intValue() == 2 || orderType.intValue() == 1) {
-                bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(0));
+            //BigDecimal detailsAmountOld=new BigDecimal(0);
+            try {
+                BigDecimal  detailsAmountOld = generateTruckFees(orderId, weightTaskResultId);
+                Double amount = detailsAmountOld.doubleValue();
+                BigDecimal detailsAmount = new BigDecimal(amount).setScale(2,RoundingMode.HALF_UP);
+                BigDecimal orderType = bmstruckDetailsOrderMapper.getOrderType(orderId);
+                BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
+                if (orderType.intValue() == 3) {
+                    BigDecimal purchaseOrderId = getFormulaMembers(orderId);
+                    bmstruckDetailsOrder.setPurchaseOrderId(purchaseOrderId);
+                }
+                if (orderType.intValue() == 2 || orderType.intValue() == 1) {
+                    bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(0));
+                }
+                // 得到最大id
+                BigDecimal detailsId = selectMaxId();
+                String detailsNo = noUtil.setResultNo("QYXD", detailsId);
+                bmstruckDetailsOrder.setDetailsId(detailsId);
+                bmstruckDetailsOrder.setWeightTaskResultId(weightTaskResultId);
+                bmstruckDetailsOrder.setOrderId(orderId);
+                bmstruckDetailsOrder.setDetailsNo(detailsNo);
+                bmstruckDetailsOrder.setPriceId(priceId);
+                bmstruckDetailsOrder.setDetailsAmount(detailsAmount);
+                bmstruckDetailsOrder.setDetailsTime(new Date());
+                // 设置常规字段
+                bmstruckDetailsOrder.setInsertTime(new Date());
+                bmstruckDetailsOrder.setUpdateTime(new Date());
+                bmstruckDetailsOrder.setInsertUsername("admin");
+                bmstruckDetailsOrder.setUpdateUsername("admin");
+                bmstruckDetailsOrder.setInsertUpdateRemark("无");
+                result += bmstruckDetailsOrderMapper.insertSelective(bmstruckDetailsOrder);
+            }catch (Exception e){
+                e.printStackTrace();
             }
-            // 得到最大id
-            BigDecimal detailsId = selectMaxId();
-            String detailsNo = noUtil.setResultNo("QYXD", detailsId);
-            bmstruckDetailsOrder.setDetailsId(detailsId);
-            bmstruckDetailsOrder.setWeightTaskResultId(weightTaskResultId);
-            bmstruckDetailsOrder.setOrderId(orderId);
-            bmstruckDetailsOrder.setDetailsNo(detailsNo);
-            bmstruckDetailsOrder.setPriceId(priceId);
-            bmstruckDetailsOrder.setDetailsAmount(detailsAmount);
-            bmstruckDetailsOrder.setDetailsTime(new Date());
-            // 设置常规字段
-            bmstruckDetailsOrder.setInsertTime(new Date());
-            bmstruckDetailsOrder.setUpdateTime(new Date());
-            bmstruckDetailsOrder.setInsertUsername("admin");
-            bmstruckDetailsOrder.setUpdateUsername("admin");
-            bmstruckDetailsOrder.setInsertUpdateRemark("无");
-            result += bmstruckDetailsOrderMapper.insertSelective(bmstruckDetailsOrder);
         }
         return result;
     }
@@ -530,6 +535,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         try {
             int i = insertSelective(orderId);
         } catch (Exception e) {
+            e.printStackTrace();
         }
         BigDecimal priceId = DataChange.dataToBigDecimal(mapValue.get("priceId"));
         //根据运输订单id查询计费详单id
@@ -555,7 +561,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                 // 计算出新的详单金额
                 BigDecimal newAmount = updateSteelAmounts(map);
                 bmstruckDetailsOrder.setDetailsAmount(newAmount.divide(new BigDecimal(1),2, RoundingMode.HALF_UP));
-                //修改计量表的历史时间
+                //修改单价的历史时间
                 omstruckOrderMapper.modifyOldTime(priceId,new Date());
             }catch (Exception e) {
                 System.out.println("更新历史时间失败");