ads

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

@@ -264,7 +264,9 @@ public class OMSController {
                                                                  @RequestParam Integer pageSize) {
         return omsFeign.getWaterSlagDayPlanAndRecivedList(carrierId, apiId, pageNum, pageSize);
     }
-
-
+    @PostMapping("/selectNewOrderId")
+    public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
+        return omsFeign.selectNewOrderId(map);
+    }
 
 }

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

@@ -641,7 +641,11 @@ public class TMSController extends BaseRESTfulController {
     Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId) {
         return tmsshipFeign.sendDeliveryNotice(noticeId);
     }
-
+    //船舶动态表
+    @PostMapping("/selectAll")
+    Map<String, Object> selectAll(){
+        return tmsshipFeign.selectAll();
+    }
 
     /**
      * 下拉框
@@ -1611,4 +1615,6 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> updateTruckCalculate(@PathVariable("orderId") Integer orderId) {
         return tmsTruckFeign.isNextNeedJl(orderId);
     }
+
+
 }

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

@@ -138,5 +138,9 @@ public interface OmsFeign {
                                                          @RequestParam Integer apiId,
                                                          @RequestParam Integer pageNum,
                                                          @RequestParam Integer pageSize);
+
+    //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
+    @PostMapping("api/v1/oms/omstruckorders/selectNewOrderId")
+    Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map);
 }
 

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

@@ -255,6 +255,8 @@ public interface TmsTruckFeign {
      */
     @PostMapping("api/v1/truckTms/tmstruckweightresults/{orderId}")
     Map<String,Object> isNextNeedJl(@PathVariable("orderId") Integer orderId);
+
+
 }
 
 

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

@@ -729,7 +729,8 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/amsshipdeliverynotices/sendDeliveryNotice/{noticeId}")
     Map<String, Object> sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId);
 
-
-
+    //船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/selectAll")
+    Map<String, Object> selectAll();
 
 }