bms

src/main/java/com/steerinfo/dil/controller/BMSController.java

@@ -5,6 +5,9 @@ import com.steerinfo.dil.feign.BmstrainFeign;
 import com.steerinfo.dil.feign.BmstruckFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -331,4 +334,62 @@ public class BMSController extends BaseRESTfulController {
     RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
         return bmstruckFeign.addTruckDetailsOrder(orderId);
     }
+    /**
+     * 展示汽运未生成账单的详单信息
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiModelProperty(value = "展示内转汽运未生成账单的作业详单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "还没定", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "orderType" ,value = "1:计时,2:计数，3：计重，4：包月",required = false,dataType = "Integer")
+    })
+    @PostMapping("/getUnFinishedConvertedTruckDetailsOrderList")
+    public RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                                     Integer pageNum,
+                                                                     Integer pageSize,
+                                                                     Integer apiId,
+                                                                     Integer orderType) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return bmstruckFeign.getUnFinishedConvertedTruckDetailsOrderList(mapVal, pageNum, pageSize, apiId, new BigDecimal(orderType));
+    }
+
+    @PostMapping("/addConvertedDetailsOrder/{orderId}")
+    RESTfulResult addConvertedDetailsOrder(@PathVariable("orderId") BigDecimal orderId) {
+        return bmstruckFeign.addConvertedDetailsOrder(orderId);
+    }
+
+    /**
+     * 生成内转汽运账单
+     * @param mapList
+     * @return
+     */
+    @ApiModelProperty(value = "生成内转汽运账单")
+    @PostMapping("/addConvertedTruckStatement")
+    public RESTfulResult addConvertedTruckStatement(@RequestBody Map<String,Object> map) {
+        return bmstruckFeign.addConvertedTruckStatement(map);
+    }
+
+    /**
+     *删除汽运账单
+     */
+    @PostMapping("/deleteConvertedTruckStatement/{statementId}")
+    public RESTfulResult deleteConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
+        return bmstruckFeign.delete(statementId);
+    }
+    /**
+     * 审批计费账单
+     */
+    @PostMapping("/updateConvertedTruckStatement/{statementId}")
+    public RESTfulResult updateConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
+        return bmstruckFeign.update(statementId);
+    }
+
 }

src/main/java/com/steerinfo/dil/feign/BmsshipFeign.java

@@ -28,9 +28,9 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getPortHandlingFeeList")
     RESTfulResult getPortHandlingFeeList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                         @RequestParam Integer pageNum,
-                                         @RequestParam Integer pageSize,
-                                         @RequestParam Integer apiId);
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示批次信息
@@ -43,9 +43,9 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getBatch")
     RESTfulResult getBatch(@RequestBody(required = false) Map<String, Object> mapValue,
-                           @RequestParam Integer pageNum,
-                           @RequestParam Integer pageSize,
-                           @RequestParam Integer apiId);
+                           @RequestParam("pageNum") Integer pageNum,
+                           @RequestParam("pageSize") Integer pageSize,
+                           @RequestParam("apiId") Integer apiId);
 
     /**
      * 生成港口装卸费
@@ -94,9 +94,9 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getDetailsOrderList")
     RESTfulResult getDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize,
-                                      @RequestParam Integer apiId);
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示未生成账单的详单信息
@@ -109,9 +109,9 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsshipdetailsorder/getUncomplateDetailsOrderList")
     RESTfulResult getUncomplateDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam Integer pageNum,
-                                                @RequestParam Integer pageSize,
-                                                @RequestParam Integer apiId);
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId);
 
     /**
      * 生成水运计费详单
@@ -135,9 +135,9 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementList")
     RESTfulResult getStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam Integer pageNum,
-                                   @RequestParam Integer pageSize,
-                                   @RequestParam Integer apiId);
+                                   @RequestParam("pageNum") Integer pageNum,
+                                   @RequestParam("pageSize") Integer pageSize,
+                                   @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示途损费账单信息
@@ -150,9 +150,9 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getLossStatementList")
     RESTfulResult getLossStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                       @RequestParam("pageNum") Integer pageNum,
+                                       @RequestParam("pageSize") Integer pageSize,
+                                       @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示水分质检实绩
@@ -165,9 +165,9 @@ public interface BmsshipFeign {
      */
     @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getWaterResult")
     RESTfulResult getWaterResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                                 @RequestParam Integer pageNum,
-                                 @RequestParam Integer pageSize,
-                                 @RequestParam Integer apiId);
+                                 @RequestParam("pageNum") Integer pageNum,
+                                 @RequestParam("pageSize") Integer pageSize,
+                                 @RequestParam("apiId") Integer apiId);
 
     /**
      * 生成水运费账单
@@ -212,9 +212,9 @@ public interface BmsshipFeign {
     @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getStatementDetailsOrderList")
     RESTfulResult getStatementDetailsOrderList(@RequestParam BigDecimal batchId,
                                                @RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam Integer pageNum,
-                                               @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId);
+                                               @RequestParam("pageNum") Integer pageNum,
+                                               @RequestParam("pageSize") Integer pageSize,
+                                               @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示详单下的船运实绩
@@ -229,9 +229,9 @@ public interface BmsshipFeign {
     @PostMapping(value = "/api/v1/bmsship/bmsshipstatement/getShipResult")
     RESTfulResult getShipResult(@RequestParam BigDecimal batchId,
                                 @RequestBody(required = false) Map<String, Object> mapValue,
-                                @RequestParam Integer pageNum,
-                                @RequestParam Integer pageSize,
-                                @RequestParam Integer apiId);
+                                @RequestParam("pageNum") Integer pageNum,
+                                @RequestParam("pageSize") Integer pageSize,
+                                @RequestParam("apiId") Integer apiId);
 
     /**
      * 查询水运费计算公式

src/main/java/com/steerinfo/dil/feign/BmstrainFeign.java

@@ -29,9 +29,9 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainDetailsOrderList")
     RESTfulResult getTrainDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam Integer apiId);
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示未转账单的火运详单
@@ -44,9 +44,9 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getUncomplateTrainDetailsList")
     RESTfulResult getUncomplateTrainDetailsList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam Integer pageNum,
-                                                @RequestParam Integer pageSize,
-                                                @RequestParam Integer apiId);
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示火运实绩
@@ -59,9 +59,9 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstraindetailsorders/getTrainResultList")
     RESTfulResult getTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId);
+                                     @RequestParam("pageNum") Integer pageNum,
+                                     @RequestParam("pageSize") Integer pageSize,
+                                     @RequestParam("apiId") Integer apiId);
 
     /**
      * 生成火运详单
@@ -83,9 +83,9 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getTrainStatementList")
     RESTfulResult getTrainStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示火运实绩
@@ -98,10 +98,10 @@ public interface BmstrainFeign {
      */
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getStatementTrainResultList")
     RESTfulResult getStatementTrainResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam Integer detailsId);
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("detailsId") Integer detailsId);
 
     /**
      * 展示账单下的详单
@@ -115,10 +115,10 @@ public interface BmstrainFeign {
     @PostMapping(value = "/api/v1/bmstrain/bmstrainstatement/getComplateTrainDetailsList")
     RESTfulResult getComplateTrainDetailsList(@RequestParam BigDecimal batchId,
                                               @RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam BigDecimal statementId);
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("statementId") BigDecimal statementId);
 
     /**
      * 生成火运费账单

src/main/java/com/steerinfo/dil/feign/BmstruckFeign.java

@@ -28,9 +28,9 @@ public interface BmstruckFeign {
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckDetailsOrderList")
     RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam Integer pageNum,
-                                           @RequestParam Integer pageSize,
-                                           @RequestParam Integer apiId);
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("apiId") Integer apiId);
 
     /**
      * 展示汽运实绩信息
@@ -43,10 +43,10 @@ public interface BmstruckFeign {
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/getTruckResultList")
     RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                     @RequestParam Integer pageNum,
-                                     @RequestParam Integer pageSize,
-                                     @RequestParam Integer apiId,
-                                     @RequestParam BigDecimal orderId);
+                                     @RequestParam("pageNum") Integer pageNum,
+                                     @RequestParam("pageSize") Integer pageSize,
+                                     @RequestParam("apiId") Integer apiId,
+                                     @RequestParam("orderId") BigDecimal orderId);
 
     /**
      * 新增汽运详单
@@ -56,4 +56,46 @@ public interface BmstruckFeign {
      */
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")
     RESTfulResult addTruckDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
+
+
+    /**
+     * 展示内转汽运未生成账单的作业详单信息
+     *
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckConverted/getUnFinishedConvertedTruckDetailsOrderList")
+    RESTfulResult getUnFinishedConvertedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                              @RequestParam("pageNum") Integer pageNum,
+                                                              @RequestParam("pageSize") Integer pageSize,
+                                                              @RequestParam("apiId") Integer apiId,
+                                                              @RequestParam("orderType") BigDecimal orderType);
+    /**
+     * 新增内转汽运详单
+     *
+     * @param orderId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckConverted/addConvertedDetailsOrder/{orderId}")
+    RESTfulResult addConvertedDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
+
+
+    /**
+     * 生成内转汽运账单
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/addConvertedTruckStatement")
+    RESTfulResult addConvertedTruckStatement(@RequestBody(required = false) Map<String, Object> map);
+    /**
+     *删除汽运账单
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/deleteConvertedTruckStatement/{statementId}")
+    RESTfulResult delete(@PathVariable("statementId") BigDecimal statementId);
+    /**
+     * 审批计费账单
+     */
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckstatement/updateConvertedTruckStatement/{statementId}")
+    RESTfulResult update(@PathVariable("statementId") BigDecimal statementId);
 }