asjdka

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

@@ -761,4 +761,28 @@ public class BMSController extends BaseRESTfulController {
         }
         return bmstruckFeign.getSteelTruckDetailsOrder(map,pageNum,pageSize,apiId,orderType,carrierSsoId,startTime,endTime,con);
     }
+
+    @PostMapping("/getShipFeeStatement")
+    public Map<String,Object> getShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.getShipFeeStatement(map);
+    }
+
+    @PostMapping("/addShipFeeStatement")
+    public Map<String,Object> addShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.addShipFeeStatement(map);
+    }
+
+    @PostMapping("/editShipFeeStatement")
+    public Map<String,Object> editShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.editShipFeeStatement(map);
+    }
 }

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

@@ -700,6 +700,33 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.selectAllShipDynamaics(map,con);
     }
 
+    //万州港装车数据
+    @PostMapping("/getLoadData")
+    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getLoadData(map);
+    }
+
+    //万州港卸船数据
+    @PostMapping("/getUnloadData")
+    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getUnloadData(map);
+    }
+
+    //下游港口船舶动态表
+    @PostMapping("/getDownShipDynamaics")
+    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getDownShipDynamaics(map);
+    }
+
     /**
      * 下拉框
      *
@@ -2551,5 +2578,17 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.sendMeaage(mobile,content);
     }
 
+    /**
+     * 修改三程船装船作业明细
+     * @param
+     * @return
+     */
+    @PostMapping("/updateThreeSectionDetails")
+    public Map<String,Object> updateThreeSectionDetails(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.updateThreeSectionDetails(mapVal);
+    }
 
 }

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

@@ -280,6 +280,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "历史收货单位")
+    @PostMapping("/getConsigneeHistory")
+    public RESTfulResult getConsigneeHistory() {
+        List<Map<String, Object>> list = universalMapper.getConsigneeHistory();
+        return success(list);
+    }
+
 
     @ApiModelProperty(value = "通过订单ID查询订单下物资信息")
     @PostMapping("/getOrderMaterialMesByOrderId/{orderId}")

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

@@ -313,4 +313,13 @@ public interface BmsshipFeign {
                                                 @RequestParam("pageSize")Integer pageSize,
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("batchId") BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatement")
+    Map<String, Object> getShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addShipFeeStatement")
+    Map<String, Object> addShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/editShipFeeStatement")
+    Map<String, Object> editShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -152,6 +152,14 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateLoadShip")
     Map<String, Object> updateLoadShip(@RequestBody Map<String, Object> tmsshipLoadShipResult);
 
+    /**
+     * 修改三程船装船信息
+     * @param mapVal
+     * @return
+     */
+    @PostMapping(value = "/api/v1/shipTms/tmsshiploadshipresults/updateThreeSectionDetails")
+    Map<String, Object> updateThreeSectionDetails(@RequestBody(required = false)Map<String, Object> mapVal);
+
     /**
      * 新增装船作业
      *
@@ -582,6 +590,18 @@ public interface TmsshipFeign {
     Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
                                                @RequestParam("con") String con);
 
+    //万州港装车数据
+    @PostMapping("api/v1/shipTms/shipdynamics/getLoadData")
+    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map);
+
+    //万州港卸船数据
+    @PostMapping("api/v1/shipTms/shipdynamics/getUnloadData")
+    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map);
+
+    //游港口船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/getDownShipDynamaics")
+    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map);
+
     /**
      * 展示货权转移
      *

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -63,6 +63,8 @@ public interface UniversalMapper {
     // 收货单位
     List<Map<String, Object>> queryConsigneeByLike(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> getConsigneeHistory();
+
     // 所有物资
     List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
 

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

@@ -534,6 +534,17 @@
         </where>
     </select>
 
+    <select id="getConsigneeHistory" resultType="java.util.Map">
+        SELECT distinct
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_COMPANY_NAME "value",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        FROM  AMS_SALE_ORDER ASO
+        LEFT JOIN RMS_CONSIGNEE RC
+        ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        WHERE ASO.SALE_TYPE=4 and RC.CONSIGNEE_COMPANY_NAME is not null
+    </select>
+
 <!--  通过订单ID查询订单下所有物资  -->
     <select id="getOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select RM.MATERIAL_NAME     "materialName",