Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

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

@@ -783,6 +783,12 @@ public class OMSController {
         return omsFeign.getCapacityAllOrder(capacityNumber,date);
     }
 
+    @ApiOperation(value = "该车牌号下的所有物资的综合")
+    @PostMapping("/getMatrialWeight")
+    public Map<String, Object> getMatrialWeight(String capacityNumber, String date){
+        return omsFeign.getMatrialWeight(capacityNumber,date);
+    }
+
     @ApiOperation(value = "根据运单id关闭运输订单")
     @PostMapping("/closeOrder")
     public Map<String, Object> closeOrder(@RequestParam Integer orderId) {

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

@@ -120,7 +120,7 @@ public class OTMSController {
     public synchronized RESTfulResult addTmstruckReceiptResult(MultipartRequest request, Integer num, String orderNumber, String resultArrivalAddress, Integer imgcount3, Integer imgcount4) throws Exception {
         //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
-        for(int i=0;i<11;i++){
+        for(int i=0;i<21;i++){
             MultipartFile file = request.getFile("file"+i);
             if(file!=null){
                 files.add(file);
@@ -148,7 +148,7 @@ public class OTMSController {
         //添加到files数组
         List<MultipartFile> files = new ArrayList<>();
         int index=-1;
-        for(int i=0;i<11;i++){
+        for(int i=0;i<21;i++){
             MultipartFile file = request.getFile("file"+i);
             if(file!=null){
                 files.add(file);

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.controller;
 import com.steerinfo.dil.feign.RmsFeign;
+import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -1248,4 +1250,98 @@ public class RMScontroller {
         return rmsFeign.selectBmsshipPriceList(id);
     }
 
+    @ApiOperation(value = "查询运力类型")
+    @PostMapping("/getCapacityType")
+    public Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String con) {
+        if(map==null){
+           map=new HashMap<>();
+        }
+        return rmsFeign.getCapacityType(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增运力类型")
+    @PostMapping(value = "/insertCapacityType")
+    public Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertCapacityType(map);
+    }
+
+    @ApiOperation(value="删除运力类型")
+    @PostMapping(value = "/deleteCapacityType/{id}")
+    public Map<String, Object> deleteCapacityType(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteCapacityType(id);
+    }
+
+    @ApiOperation(value = "查询运输范围")
+    @PostMapping("/getTransRange")
+    public Map<String, Object> getTransRange(@RequestBody(required = false) Map<String,Object> map,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getTransRange(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增运输范围")
+    @PostMapping(value = "/insertTransRange")
+    public Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertTransRange(map);
+    }
+
+    @ApiOperation(value = "查询APP备注")
+    @PostMapping("/getMaterialCoke")
+    public Map<String, Object> getMaterialCoke(@RequestBody(required = false) Map<String,Object> map,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getMaterialCoke(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增APP备注")
+    @PostMapping(value = "/insertMaterialCoke")
+    public Map<String, Object> insertMaterialCoke(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertMaterialCoke(map);
+    }
+
+    @ApiOperation(value="删除APP备注")
+    @PostMapping(value = "/deleteMaterialCoke/{id}")
+    public Map<String, Object> deleteMaterialCoke(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteMaterialCoke(id);
+    }
+
+
+    @ApiOperation(value = "查询收款客户")
+    @PostMapping("/getReceiveCompany")
+    public Map<String, Object> getReceiveCompany(@RequestBody(required = false) Map<String,Object> map,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con) {
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return rmsFeign.getReceiveCompany(map,apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation(value="新增收款客户")
+    @PostMapping(value = "/insertReceiveCompany")
+    public Map<String, Object> insertReceiveCompany(@RequestBody(required = false) Map<String, Object> map){
+        return rmsFeign.insertReceiveCompany(map);
+    }
+
+    @ApiOperation(value="删除收款客户")
+    @PostMapping(value = "/deleteReceiveCompany/{id}")
+    public Map<String, Object> deleteReceiveCompany(@PathVariable("id")BigDecimal id){
+        return rmsFeign.deleteReceiveCompany(id);
+    }
 }

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

@@ -424,6 +424,10 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/getCapacityAllOrder")
     Map<String, Object> getCapacityAllOrder(@RequestParam String capacityNumber,@RequestParam  String date);
 
+    @ApiOperation(value = "该车牌号下的所有物资的综合")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getMatrialWeight")
+    Map<String, Object> getMatrialWeight(@RequestParam String capacityNumber,@RequestParam  String date);
+
     @ApiOperation(value = "根据运单id关闭运输订单")
     @PostMapping("api/v1/oms/omstruckorderseparates/closeOrder")
     Map<String, Object> closeOrder(@RequestParam Integer orderId);

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

@@ -677,4 +677,57 @@ public interface RmsFeign {
     // 渲染船运合同单价
     @PostMapping(value = "/api/v1/rms/bmsshipcontractprices/selectBmsshipPriceList/{id}")
     Map<String, Object> selectBmsshipPriceList(@PathVariable("id") BigDecimal id);
+
+    //运力类型
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getCapacityType")
+    Map<String, Object> getCapacityType(@RequestBody(required = false) Map<String,Object> map,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertCapacityType")
+    Map<String, Object> insertCapacityType(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteCapacityType/{id}")
+    Map<String, Object> deleteCapacityType(@PathVariable("id") BigDecimal id);
+
+    //运输范围
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getTransRange")
+    Map<String, Object> getTransRange(@RequestBody(required = false) Map<String,Object> map,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertTransRange")
+    Map<String, Object> insertTransRange(@RequestBody(required = false) Map<String, Object> map);
+
+    //APP备注(RMS_MATERIAL_COKE)
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getMaterialCoke")
+    Map<String, Object> getMaterialCoke(@RequestBody(required = false) Map<String,Object> map,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertMaterialCoke")
+    Map<String, Object> insertMaterialCoke(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteMaterialCoke/{id}")
+    Map<String, Object> deleteMaterialCoke(@PathVariable("id") BigDecimal id);
+
+    //收款客户(RMS_RECEIVE_COMPANY)
+    @PostMapping(value = "/api/v1/rms/rmscapacitytype/getReceiveCompany")
+    Map<String, Object> getReceiveCompany(@RequestBody(required = false) Map<String,Object> map,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("con") String con);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/insertReceiveCompany")
+    Map<String, Object> insertReceiveCompany(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmscapacitytype/deleteReceiveCompany/{id}")
+    Map<String, Object> deleteReceiveCompany(@PathVariable("id") BigDecimal id);
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -787,8 +787,9 @@
                 RCT.CAPACITY_TYPE_NAME "capacityTypeName",
                 RCT.WHETHER_CAR "whether"
         from RMS_CAPACITY_TYPE RCT
-        <if test="index!=null">
-        where instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
+        where RCT.DELETED=0
+        <if test="index!=null and index!=''">
+            and instr( RCT.CAPACITY_TYPE_NAME, #{index}) > 0
         </if>
     </select>