liyg 2 年之前
父節點
當前提交
3075e4c410

+ 7 - 0
src/main/java/com/steerinfo/dil/controller/BmsportHandlingFeeController.java

@@ -402,7 +402,14 @@ public class BmsportHandlingFeeController extends BaseRESTfulController {
         if(map!=null &&  map.get("list")!=null){
             List<Map<String,Object>> list= (List<Map<String, Object>>) map.get("list");
             for(Map<String,Object> item:list){
+                if(map.get("statementStatus")==null){
+                    return failed("没有给出结算状态!");
+                }
                 item.put("statementStatus",map.get("statementStatus"));
+                if(Integer.parseInt(map.get("statementStatus").toString()) == 0){
+                    //如果是预开,结算金额减去水分检测费
+                    item.put("statementTotalAmount",DataChange.dataToBigDecimal(item.get("statementTotalAmount")).subtract(DataChange.dataToBigDecimal(item.get("inspectionsFee"))));
+                }
                 if(item.get("statementId")==null || DataChange.dataToBigDecimal(item.get("statementId")).intValue()<=0){
                     i+=bmsportHandlingFeeService.addShipFeeStatement(item);
                 }else{

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/BmsportHandlingFeeServiceImpl.java

@@ -363,7 +363,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         bmsshipStatement.setTotalPreviewTon(DataChange.dataToBigDecimal(map.get("totalPreviewTonnage")).setScale(2,BigDecimal.ROUND_HALF_UP));//预开总吨位
         bmsshipStatement.setTotalPreviewFee(DataChange.dataToBigDecimal(map.get("totalPreviewFee")).setScale(2,BigDecimal.ROUND_HALF_UP));//预开总金额
         bmsshipStatement.setResultOutPortTime(map.get("resultOutPortTime")+"");
-        bmsshipStatement.setTotalWaterFee(DataChange.dataToBigDecimal(map.get("inspectionsFee")).setScale(2,BigDecimal.ROUND_HALF_UP));
+        bmsshipStatement.setTotalWaterFee(DataChange.dataToBigDecimal(map.get("inspectionsFee")).setScale(2,BigDecimal.ROUND_HALF_UP));//水分检测费
         bmsshipStatement.setStatementNo("BMSSF"+new Date().getTime());
         bmsshipStatement.setStatementStatus(DataChange.dataToBigDecimal(map.get("statementStatus")));
         bmsshipStatement.setInsertTime(new Date());

+ 5 - 2
src/main/resources/com/steerinfo/dil/mapper/BmsportHandlingFeeMapper.xml

@@ -1020,10 +1020,11 @@
         COUNT(TLT.RESULT_ID) "wagonNumber",--总计车数
         SUM(TLT.RESULT_BILLABLE_TONNAGE) "totalTrainTon",--计费吨位
         SUM(TQR.DEDUCT_NUMBER) "totalDeduct",--扣杂
-        SUM(TQR.ELEMENT_VALUE) "totalWaterTon"--水分吨位
+        ROUND(SUM(TQR.ELEMENT_VALUE*(TWR.RESULT_NET_WEIGHT-TQR.DEDUCT_NUMBER)/100),2) "totalWaterTon"--水分吨位
         from TMSTRAIN_LOADING_RESULT TLR
         LEFT JOIN TMSTRAIN_TOTAL_RESULT TTR ON TTR.LOADING_ID=TLR.RESULT_ID
         LEFT JOIN TMSTRAIN_QUALITY_RESULT TQR ON TTR.TOTAL_RESULT_ID=TQR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRAIN_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID=TTR.TOTAL_RESULT_ID
         LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID=TLR.BATCH_ID
         LEFT JOIN TMSTRAIN_LOADING_TEMP TLT ON TLT.RESULT_ID=TLR.TEMP_RESULT_ID
         GROUP BY DB.BATCH_ID
@@ -1032,10 +1033,12 @@
         (--汽运质检
         SELECT DB.BATCH_ID "batchId",
         SUM(TQR.RESULT_DEDUCTION) "totalDeduct",--扣杂
-        SUM(TQR.ELEMENT_VALUE) "totalWaterTon"--水分吨位
+        ROUND(SUM(TQR.ELEMENT_VALUE*(TWR.RESULT_NET_WEIGHT-TQR.RESULT_DEDUCTION)/100),2) "totalWaterTon"--水分吨位
         from TMSTRUCK_QUALITY_RESULT TQR --汽运质检
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR --汽运总实绩
         ON  TQR.TOTAL_RESULT_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO --运输订单
         ON OO.ORDER_ID=TTR.ORDER_ID
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP