修改船运bug

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

@@ -112,8 +112,10 @@ public class AMScontroller{
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer planId,
-                                           Integer status, String con) {
-        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status, con);
+                                           Integer status,
+                                                 Integer planStatus,
+                                                 String con) {
+        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status, planStatus, con);
     }
 
 

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

@@ -99,8 +99,8 @@ public class OMSController {
 
     @ApiOperation(value = "派单")
     @PostMapping("/dispatchOrder")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map) {
-        return omsFeign.dispatchOrder(map);
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return omsFeign.dispatchOrder(mapValue);
     }
 
 

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

@@ -16,22 +16,78 @@ public class RMScontroller {
     @Autowired
     RmsFeign rmsFeign;
 
-    @ApiOperation(value="展示司机信息")
+    /**
+     * @author huk
+     * @return
+     */
+    //查询所有作业环节
+    @ApiOperation(value="查询所有作业环节")
+    @PostMapping("/getLink")
+    public Map<String, Object> getlink(){
+        return  rmsFeign.getlink();
+    }
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(339)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
     })
-    @PostMapping("/getCarDriverList")
-    public Map<String, Object> getCarDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize
-    ){
-        return   rmsFeign.getCarDriverList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+    @PostMapping("/insertSelective")
+    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.insertSelective(mapVal);
     }
+
+
+    @ApiOperation(value="查询运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getAllLineDesk")
+    public Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        String con){
+        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/getLinkToUpdate")
+    public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {
+        return rmsFeign.getLinkToUpdate(lineId);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/updateByPrimaryKeySelective")
+    public Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal) {
+        return rmsFeign.updateByPrimaryKeySelective(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return  rmsFeign.updateRmsLine(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/getCountNumber")
+    public Map<String, Object> getCountNumber(@RequestParam Integer lineId) {
+        return rmsFeign.getCountNumber(lineId);
+    }
+
+    //查询所有作业环节
+    @ApiOperation(value="新增作业环节")
+    @PostMapping("/LinkInsertSelective")
+    public Map<String,Object> LinkInsertSelective(@RequestBody(required = false) Map<String,Object> mapValue){
+        return rmsFeign.LinkInsertSelective(mapValue);
+    }
+
+    //********************************************************************************************************
+
     @ApiOperation(value="创建", notes="根据RmsCarDriver对象创建")
     @ApiImplicitParam(name = "rmsCarDriver", value = "详细实体rmsCarDriver", required = true, dataType = "RmsCarDriver")
     @PostMapping(value = "/insertCarDriver")
@@ -65,15 +121,15 @@ public class RMScontroller {
     public Map<String, Object> getCarDriverById(@PathVariable("id") BigDecimal id){
         return rmsFeign.getCarDriverById(id);
     }
-    @PostMapping("/getCarDriverResultList")
+    @PostMapping("/getCarDriverList")
     @ApiOperation(value = "模糊查询司机")
-    public Map<String, Object> getCarDriverResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      String con) {
+    public Map<String, Object> getCarDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con) {
 
-        return rmsFeign.getCarDriverResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return rmsFeign.getCarDriverList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
     //获取承运商列表
@@ -305,24 +361,8 @@ public class RMScontroller {
     public Map<String, Object> getSupplierById(@PathVariable("id")BigDecimal id){
         return rmsFeign.getSupplierById(id);
     }
-    //    展示运力信息
-    @ApiOperation(value="展示运力信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(219)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
+//    展示运力信息
 
-    @PostMapping("/getCapacityList")
-    public Map<String, Object> getCapacityList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
-    ){
-        return   rmsFeign.getCapacityList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
-    }
     @ApiOperation(value="新增运力信息", notes="根据rmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsCapacity", value = "详细实体rmsCapacity", required = true, dataType = "rmsCapacity")
     @PostMapping(value = "/insertCapacity")
@@ -352,34 +392,17 @@ public class RMScontroller {
 
         return rmsFeign.updateCapacity(map);
     }
-    @PostMapping("/getCapacityResultList")
+    @PostMapping("/getCapacityList")
     @ApiOperation(value = "模糊查询运力")
-    public Map<String, Object> getCapacityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                     Integer pageNum,
-                                                     Integer pageSize,
-                                                     Integer apiId,
-                                                     String con) {
+    public Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
 
-        return rmsFeign.getCapacityResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return rmsFeign.getCapacityList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
-
-    @ApiOperation(value="展示汽车衡列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getTruckCalculateList")
-    public Map<String, Object> getTruckCalculateList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                     Integer apiId,
-                                                     Integer pageNum,
-                                                     Integer pageSize
-    ){
-        return   rmsFeign.getTruckCalculateList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
-    }
     @ApiOperation(value="新增汽车衡信息", notes="根据rmsCapacity对象创建")
     @ApiImplicitParam(name = "rmsTruckCalculate", value = "详细实体rmsTruckCalculate", required = true, dataType = "rmsTruckCalculate")
     @PostMapping(value = "/insertTruckCalculate")
@@ -411,35 +434,17 @@ public class RMScontroller {
     }
 
 
-    @PostMapping("/getTruckCalculateResultList")
+    @PostMapping("/getTruckCalculateList")
     @ApiOperation(value = "模糊查询汽车衡")
-    public Map<String, Object> getTruckCalculateResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                           Integer pageNum,
-                                                           Integer pageSize,
-                                                           Integer apiId,
-                                                           String con) {
-
-        return rmsFeign.getTruckCalculateResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
-    }
-
-
-    @ApiOperation(value="展示原料仓库信息", notes="分页查询")
+    public Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId,
+                                                     String con) {
 
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getWarehouseList")
-    public Map<String, Object> getWarehouseList(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize
-    ){
-        return   rmsFeign.getWarehouseList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return rmsFeign.getTruckCalculateList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
 
-
     @ApiOperation(value="新增汽车衡信息", notes="根据rmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
 
@@ -470,15 +475,15 @@ public class RMScontroller {
         return rmsFeign.getWarehouseById(id);
     }
 
-    @PostMapping("/getWarehouseResultList")
+    @PostMapping("/getWarehouseList")
     @ApiOperation(value = "模糊查询原料仓库")
-    public Map<String, Object> getWarehouseResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      String con) {
+    public Map<String, Object> getWarehouseList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con) {
 
-        return rmsFeign.getWarehouseResultList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return rmsFeign.getWarehouseList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
     @ApiOperation(value="展示司机排班信息", notes="分页查询")
     @ApiImplicitParams({
@@ -539,14 +544,51 @@ public class RMScontroller {
     public Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.updateGatepost(map);
     }
-    @ApiOperation(value="根据id查询门岗规则信息", notes="根据rmsGatepost对象创建")
+    @ApiOperation(value="根据id查询门岗信息", notes="根据rmsGatepost对象创建")
     @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/getGatepostById/{id}")
     public Map<String, Object> getGatepostById(@PathVariable("id")BigDecimal id){
         return rmsFeign.getGatepostById(id);
     }
+    @ApiOperation(value="根据id查询门岗规则信息", notes="根据rmsGatepost对象创建")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "门岗id", value = "id", required = true, dataType = "int")
+    })
+    @PostMapping(value = "/getGatepostRulesById/{id}")
+    public Map<String, Object> getGatepostRulesById(@PathVariable("id")BigDecimal id,
+                                                    Integer apiId){
+        return rmsFeign.getGatepostRulesById(id,apiId);
+    }
+    @ApiOperation(value="展示门岗规则信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+
+    @PostMapping("/getGatepostRulesList")
+    public Map<String, Object> getGatepostRulesList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String con
+    ){
+        return   rmsFeign.getGatepostRulesList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
 
+    @PostMapping("/getMaterialTypeList")
+    @ApiOperation(value = "框计算物资种类")
+    public Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con) {
 
+        return rmsFeign.getMaterialTypeList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+    }
     //*******************************下拉框************************
     @GetMapping("getCapacityTypeId")
     @ApiOperation(value = "得到下拉运力id")
@@ -596,67 +638,15 @@ public class RMScontroller {
         return rmsFeign.getGatepostRulesId();
     }
 
-    /**
-     * @author huk
-     * @return
-     */
-    //查询所有作业环节
-    @ApiOperation(value="查询所有作业环节")
-    @PostMapping("/getLink")
-    public Map<String, Object> getlink(){
-        return  rmsFeign.getlink();
-    }
-
-    /**
-     * @author huk
-     * @return
-     */
-    //新增运输路线
-    @ApiOperation(value="新增运输路线")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
-    })
-    @PostMapping("/insertSelective")
-    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
-        return rmsFeign.insertSelective(mapVal);
-    }
-
-
-    @ApiOperation(value="查询运输路线")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
-    })
-    @PostMapping(value = "/getAllLineDesk")
-    public Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer apiId,
-                                        String con,
-                                              Integer lineType){
-        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId ,con,lineType);
-    }
-
-    @ApiOperation(value = "根据主键查询出数据以供修改")
-    @PostMapping("/getLinkToUpdate")
-    public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {
-        return rmsFeign.getLinkToUpdate(lineId);
+    @GetMapping("getTransportTypeId")
+    @ApiOperation(value = "运输类型下拉")
+    public Map<String,Object> getTransportTypeId(){
+        return rmsFeign.getTransportTypeId();
     }
 
-    @ApiOperation(value = "根据运输线路主表ID修改数据")
-    @PostMapping("/updateByPrimaryKeySelective")
-    public Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal) {
-        return rmsFeign.updateByPrimaryKeySelective(mapVal);
-    }
-
-    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
-    @PostMapping("/updateRmsLine")
-    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal){
-        return  rmsFeign.updateRmsLine(mapVal);
-    }
-
-    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
-    @PostMapping("/getCountNumber")
-    public Map<String, Object> getCountNumber(@RequestParam Integer lineId) {
-        return rmsFeign.getCountNumber(lineId);
+    @GetMapping("/getVehicleTypeId")
+    @ApiOperation(value = "得到下拉车辆类型id")
+    public Map<String, Object> getVehicleTypeId() {
+        return rmsFeign.getVehicleTypeId();
     }
 }

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

@@ -1800,4 +1800,22 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList){
         return tmsTruckFeign.updateTruckWeight(mapList);
     }
+
+    @ApiOperation(value="提货单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getBillOrder")
+    public Map<String, Object> getBillOrder(@RequestParam String orderNumber){
+        return tmsTruckFeign.getBillOrder(orderNumber);
+    }
+
+    @ApiOperation(value="发货通知单 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderNumber", value = "运输订单号", required = false, dataType = "String"),
+    })
+    @PostMapping("/getDeliveryOrder")
+    public Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber){
+        return tmsTruckFeign.getDeliveryOrder(orderNumber);
+    }
 }

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

@@ -925,6 +925,7 @@ public interface AmsFeign {
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("planId") Integer planId,
                                            @RequestParam("status") Integer status,
+                                           @RequestParam("planStatus") Integer planStatus,
                                            @RequestParam("con") String con
     );
 

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

@@ -53,7 +53,7 @@ public interface OmsFeign {
     public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorders/dispatchOrder")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
+    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue);
 
     @PostMapping("api/v1/oms/omstruckorders/deleteOrder")
     public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,

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

@@ -11,14 +11,60 @@ import java.util.Map;
 
 @FeignClient(value = "DIL-RMS-API-DEV", url = "${openfeign.RmsFeign.url}")
 public interface RmsFeign {
-    //展示司机信息
-    @PostMapping(value = "api/v1/rms/rmscardriver/getCarDriverList")
-    Map<String,Object> getCarDriverList  (@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
+    /**
+     * @author huk
+     * @return
+     */
+    //新增作业环节
+    @ApiOperation(value="新增作业环节")
+    @PostMapping("api/v1/rms/rmslinks/LinkInsertSelective")
+    Map<String,Object> LinkInsertSelective(@RequestBody(required = false) Map<String,Object> mapValue);
+
+    /**
+     * @author huk
+     * @return
+     */
+    @PostMapping("/api/v1/rms/rmslinks/getLink")
+    Map<String, Object> getlink();
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/api/v1/rms/rmslines/insertSelective")
+    Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @PostMapping(value = "/api/v1/rms/rmslines/getAllLineDesk")
+    Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize")Integer pageSize,
+                                        @RequestParam("apiId")Integer apiId,
+                                        @RequestParam("con")String con);
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
+    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
+    Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/api/v1/rms/rmslines/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/api/v1/rms/rmslines/getCountNumber")
+    Map<String, Object> getCountNumber(@RequestParam Integer lineId);
+
+    //********************************************************************************************************
+
 
-    );
     //新增司机信息
     @PostMapping(value = "api/v1/rms/rmscardriver/insertCarDriver")
     Map<String, Object> insertCarDriver(@RequestBody(required = false) Map<String, Object> map);
@@ -33,16 +79,16 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmscardriver/deleteCarDriver/{id}")
     Map<String, Object> deleteCarDriver(@PathVariable("id") BigDecimal id);
     //模糊查询司机
-    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarDriverResultList")
-    Map<String, Object> getCarDriverResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("con") String con);
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarDriverList")
+    Map<String, Object> getCarDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("con") String con);
 
 
     //获取承运商列表
-    @PostMapping(value = "api/v1/rms/rmscarriers/getCarrierList")
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierList")
     Map<String,Object>     getCarrierList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
                                           @RequestParam("pageNum") Integer pageNum,
@@ -50,16 +96,16 @@ public interface RmsFeign {
                                           @RequestParam String con);
 
     //新增承运商
-    @PostMapping(value = "api/v1/rms/rmscarriers/insertCarrier")
+    @PostMapping(value = "api/v1/rms/rmscarrier/insertCarrier")
     Map<String,Object> insertCarrier(@RequestBody(required = false) Map<String,Object> map);
     //删除承运商
-    @PostMapping(value = "api/v1/rms/rmscarriers/deleteCarrier/{id}")
+    @PostMapping(value = "api/v1/rms/rmscarrier/deleteCarrier/{id}")
     Map<String, Object> deleteCarrier(@PathVariable("id") BigDecimal id);
     //    更新承运商信息
-    @PostMapping(value = "api/v1/rms/rmscarriers/updateCarrier")
+    @PostMapping(value = "api/v1/rms/rmscarrier/updateCarrier")
     Map<String, Object> updateCarrier(@RequestBody(required = false) Map<String, Object> map);
     //    根据id获取承运商信息
-    @PostMapping(value = "api/v1/rms/rmscarriers/getCarrierById/{id}")
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierById/{id}")
     Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
 
     //获取物资列表
@@ -104,23 +150,23 @@ public interface RmsFeign {
 
 
     //获得托运人列表
-    @PostMapping(value = "api/v1/rms/rmsshippers/getShipperList")
+    @PostMapping(value = "api/v1/rms/rmsshipper/getShipperList")
     Map<String,Object>   getShipperList (@RequestBody(required = false) Map<String,Object> mapValue,
                                          @RequestParam("apiId") Integer apiId,
                                          @RequestParam("pageNum") Integer pageNum,
                                          @RequestParam("pageSize") Integer pageSize,
                                          @RequestParam String con);
     //新增托运人信息
-    @PostMapping(value = "api/v1/rms/rmsshippers/insertShipper")
+    @PostMapping(value = "api/v1/rms/rmsshipper/insertShipper")
     Map<String, Object> insertShipper(@RequestBody(required = false) Map<String, Object> map);
     //删除托运人
-    @PostMapping(value = "api/v1/rms/rmsshippers/deleteShipper/{id}")
+    @PostMapping(value = "api/v1/rms/rmsshipper/deleteShipper/{id}")
     Map<String, Object> deleteShipper(@PathVariable("id") BigDecimal id);
     //修改托运人信息
-    @PostMapping(value = "api/v1/rms/rmsshippers/updateShipper")
+    @PostMapping(value = "api/v1/rms/rmsshipper/updateShipper")
     Map<String, Object> updateShipper(@RequestBody(required = false) Map<String, Object> map);
     //根据id获取托运人信息
-    @PostMapping(value = "api/v1/rms/rmsshippers/getShipperById/{id}")
+    @PostMapping(value = "api/v1/rms/rmsshipper/getShipperById/{id}")
     Map<String, Object> getShipperById(@PathVariable("id") BigDecimal id);
 
     //展示供应商列表
@@ -143,14 +189,6 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmssupplier/getSupplierById/{id}")
     Map<String, Object> getSupplierById(@PathVariable("id") BigDecimal id);
 
-    //    获取运力列表
-    @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityList")
-    Map<String,Object>   getCapacityList (@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("pageNum") Integer pageNum,
-                                          @RequestParam("pageSize") Integer pageSize
-
-    );
     //新增运力
     @PostMapping(value = "api/v1/rms/rmscapacity/insertCapacity")
     Map<String, Object> insertCapacity(@RequestBody(required = false) Map<String, Object> map);
@@ -163,25 +201,19 @@ public interface RmsFeign {
 
 
     //模糊查询运力
-    @PostMapping(value = "/api/v1/rms/rmscapacity/getCapacityResultList")
-    Map<String, Object> getCapacityResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              @RequestParam Integer pageNum,
-                                              @RequestParam Integer pageSize,
-                                              @RequestParam Integer apiId,
-                                              @RequestParam String con);
+    @PostMapping(value = "/api/v1/rms/rmscapacity/getCapacityList")
+    Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam String con);
 
     //根据id获取运力详细信息
     @PostMapping(value = "api/v1/rms/rmscapacity/getCapacityById/{id}")
     Map<String,Object> getCapacityById(@PathVariable("id") BigDecimal id);
 
 
-    //查找汽车衡列表
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
-    Map<String,Object>   getTruckCalculateList (@RequestBody(required = false) Map<String, Object> mapValue,
-                                                @RequestParam("apiId") Integer apiId,
-                                                @RequestParam("pageNum") Integer pageNum,
-                                                @RequestParam("pageSize") Integer pageSize
-    );
+    ;
     //新增汽车衡
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/insertTruckCalculate")
     Map<String, Object> insertTruckCalculate(@RequestBody(required = false) Map<String, Object> map);
@@ -198,19 +230,13 @@ public interface RmsFeign {
     @PostMapping(value = "api/v1/rms/rmstruckcalculate/deleteTruckCalculate/{id}")
     Map<String, Object> deleteTruckCalculate(@PathVariable("id") BigDecimal id);
     //模糊查询汽车衡
-    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateResultList")
-    Map<String, Object> getTruckCalculateResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                    @RequestParam Integer pageNum,
-                                                    @RequestParam Integer pageSize,
-                                                    @RequestParam Integer apiId,
-                                                    @RequestParam String con);
-    //原料仓库列表
-    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseList")
-    Map<String,Object>   getWarehouseList (@RequestBody(required = false) Map<String, Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize
-    );
+    @PostMapping(value = "api/v1/rms/rmstruckcalculate/getTruckCalculateList")
+    Map<String, Object> getTruckCalculateList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam String con);
+
     //新增仓库
     @PostMapping(value = "api/v1/rms/rmswarehouse/insertWarehouse")
     Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map);
@@ -226,12 +252,12 @@ public interface RmsFeign {
     Map<String, Object> getWarehouseById(@PathVariable("id") BigDecimal id);
 
     //模糊查询原料仓库
-    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseResultList")
-    Map<String, Object> getWarehouseResultList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                               @RequestParam Integer pageNum,
-                                               @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId,
-                                               @RequestParam String con);
+    @PostMapping(value = "api/v1/rms/rmswarehouse/getWarehouseList")
+    Map<String, Object> getWarehouseList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam String con);
 
     //获取司机排队信息
     @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityList")
@@ -273,9 +299,28 @@ public interface RmsFeign {
     //    更新门岗信息
     @PostMapping(value = "api/v1/rms/rmsgatepost/updateGatepost")
     Map<String, Object> updateGatepost(@RequestBody(required = false) Map<String, Object> map);
-    //    根据id获取门岗规则信息
+    //    根据id获取门岗信息
     @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostById/{id}")
     Map<String, Object> getGatepostById(@PathVariable("id") BigDecimal id);
+    //    根据id获取门岗规则信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostRulesById/{id}")
+    Map<String, Object> getGatepostRulesById(@PathVariable("id") BigDecimal id,@RequestParam("apiId") Integer apiId);
+    //    展示门岗规则信息
+    @PostMapping(value = "api/v1/rms/rmsgatepost/getGatepostRulesList")
+    Map<String, Object> getGatepostRulesList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam String con);
+
+    //获取物资种类
+    @PostMapping(value = "api/v1/rms/rmsmaterialtype/getMaterialTypeList")
+    Map<String, Object> getMaterialTypeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam String con);
+
 
     //******************************************下拉框*******************************
     @GetMapping(value = "api/v1/rms/rmscapacity/getCapacityTypeId")
@@ -313,46 +358,10 @@ public interface RmsFeign {
     @GetMapping(value = "api/v1/rms/rmsgatepost/getShipperId")
     Map<String, Object> getGatepostRulesId();
 
-    /**
-     * @author huk
-     * @return
-     */
-    @PostMapping("/api/v1/rms/rmslinks/getLink")
-    Map<String, Object> getlink();
-
-    /**
-     * @author huk
-     * @return
-     */
-    //新增运输路线
-    @ApiOperation(value="新增运输路线")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
-    })
-    @PostMapping("/api/v1/rms/rmslines/insertSelective")
-    Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal);
-
-    @PostMapping(value = "/api/v1/rms/rmslines/getAllLineDesk")
-    Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize")Integer pageSize,
-                                        @RequestParam("apiId")Integer apiId,
-                                        @RequestParam("con")String con,
-                                       @RequestParam("lineType")Integer lineType);
-
-    @ApiOperation(value = "根据主键查询出数据以供修改")
-    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
-    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
-
-    @ApiOperation(value = "根据运输线路主表ID修改数据")
-    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
-    Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal);
-
-    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
-    @PostMapping("/api/v1/rms/rmslines/updateRmsLine")
-    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal);
-
-    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
-    @PostMapping("/api/v1/rms/rmslines/getCountNumber")
-    Map<String, Object> getCountNumber(@RequestParam Integer lineId);
+    //运输类型下拉框
+    @GetMapping(value = "api/v1/rms/rmscardriver/getTransportTypeId")
+    Map<String,Object> getTransportTypeId();
+    //    根据id下拉框获取车辆类型
+    @GetMapping(value = "api/v1/rms/rmsgatepost/getVehicleTypeId")
+    Map<String,Object> getVehicleTypeId();
 }

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

@@ -324,6 +324,12 @@ public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstruckweightresults/updateTruckWeight")
     public Map<String, Object> updateTruckWeight(@RequestBody List<Map<String, Object>> mapList);
+
+    @PostMapping("api/v1/truckTms/selfMachine/getBillOrder")
+    Map<String, Object> getBillOrder(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/selfMachine/getDeliveryOrder")
+    Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber);
 }
 
 

src/main/resources/bootstrap.yml

@@ -43,13 +43,13 @@ openfeign:
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:
-    url: ${WMSHFEIGN_URL:172.16.33.161:8070}
+    url: ${WMSHFEIGN_URL:localhost:8070}
   WMSFeign:
     url: ${WMSFEIGN_URL:localhost:8093}
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8095}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:192.168.1.115:8060}
+    url: ${RMSFEIGN_HRL:localhost:8060}
 
 genxml:
   pth: com/a