修改

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

@@ -744,6 +744,18 @@ public class OMSController {
         return omsFeign.getAllLoadUnloadResult(mapValue);
     }
 
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEnd")
+    public Map<String, Object> getTimeTaskEnd(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEnd(mapValue);
+    }
+
+    @ApiOperation(value = "计时作业查看订单详情")
+    @PostMapping("/getTimeTaskEndDetail")
+    public Map<String, Object> getTimeTaskEndDetail(@RequestBody(required = false) Map<String, Object> mapValue){
+        return omsFeign.getTimeTaskEndDetail(mapValue);
+    }
+
     @ApiOperation(value="批量关闭运输订单")
     @PostMapping("/batchCloseOrder")
     public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
@@ -769,4 +781,7 @@ public class OMSController {
         return omsFeign.closeInwardOrder(orderId);
     }
 
+
+
+
 }

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

@@ -1817,9 +1817,10 @@ public class TMSController extends BaseRESTfulController {
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              String con
+                                              String con,
+                                              String  userId
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -2010,4 +2011,11 @@ public class TMSController extends BaseRESTfulController {
     public Map<String, Object> sendLiuPiMeasureCommission(String capacityNumber){
         return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
     }
+
+    @ApiOperation(value="新增计时作业实绩")
+    @PostMapping("/addTimeTaskResult")
+    public Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.addTimeTaskResult(map);
+    }
+
 }

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

@@ -451,5 +451,12 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
     Map<String, Object> closeInwardOrder(@RequestParam("orderId") Integer orderId);
 
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEnd")
+
+
+    Map<String, Object> getTimeTaskEnd(@RequestBody Map<String, Object> mapValue);
+    @PostMapping("api/v1/oms/omstruckorderseparates/getTimeTaskEndDetail")
+    Map<String, Object> getTimeTaskEndDetail(@RequestBody Map<String, Object> mapValue);
 }
 

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

@@ -329,7 +329,8 @@ public interface TmsTruckFeign {
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("con") String con);
+                                              @RequestParam("con") String con,
+                                              @RequestParam("userId") String userId);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -444,6 +445,10 @@ public interface TmsTruckFeign {
     //发送留皮计量委托
     @GetMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendLiuPiMeasureCommission")
     Map<String, Object> sendLiuPiMeasureCommission(@RequestParam("capacityNumber")String capacityNumber);
+
+    //新增计时作业实绩
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
+    Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);
     }
 
 

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
   JoinFeign: