Merge branch 'dev'

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

@@ -748,6 +748,25 @@ 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("/getPauseTimeTaskDetail")
+    public Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId){
+        return omsFeign.getPauseTimeTaskDetail(orderId);
+    }
+
     @ApiOperation(value="批量关闭运输订单")
     @PostMapping("/batchCloseOrder")
     public Map<String, Object> batchCloseOrder(@RequestBody List<Map<String,Object>> mapList) {
@@ -773,4 +792,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="新增钢材到异地库达州站驻港人员确定收货")
@@ -2021,6 +2022,34 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.sendLiuPiMeasureCommission(capacityNumber);
     }
 
+
+    @ApiOperation(value="新增计时作业实绩")
+    @PostMapping("/addTimeTaskResult")
+    public Map<String, Object> addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.addTimeTaskResult(map);
+    }
+
+    @ApiOperation(value="计时判断是否开始")
+    @PostMapping("/JudgeTimeTask")
+    public Map<String, Object> JudgeTimeTask(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTask(map);
+    }
+
+
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/unitSureEndTimeout")
+    public Map<String, Object> unitSureEndTimeout(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.unitSureEndTimeout(map);
+    }
+
+    @ApiOperation(value="计时暂停")
+    @PostMapping("/JudgeTimeTaskPause")
+    public Map<String, Object> JudgeTimeTaskPause(@RequestBody(required = false) Map<String, Object> map){
+        return  tmsTruckFeign.JudgeTimeTaskPause(map);
+    }
+
+
     @ApiOperation(value="对内转车辆装货点进行统计")
     @PostMapping("/getLoading")
     public Map<String, Object> getLoading(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2045,6 +2074,11 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
 
+
+
+
+
+
     @ApiOperation(value="查询零星中转统计报表")
     @PostMapping("/getLXInwardReport")
     public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -2056,4 +2090,5 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+
 }

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

@@ -8,6 +8,7 @@ import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -455,5 +456,15 @@ 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);
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/getPauseTimeTaskDetail")
+    Map<String, Object> getPauseTimeTaskDetail(@RequestParam("orderId") Integer orderId);
 }
 

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);
@@ -454,6 +455,11 @@ public interface TmsTruckFeign {
     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);
+
+
     @PostMapping("api/v1/truckTms/statisticalReport/getLoading")
     Map<String, Object> getLoading(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer apiId,
@@ -470,6 +476,16 @@ public interface TmsTruckFeign {
                                      @RequestParam String startTime,
                                      @RequestParam String endTime);
 
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTask")
+    Map<String, Object> JudgeTimeTask(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/unitSureEndTimeout")
+    Map<String, Object> unitSureEndTimeout(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTaskPause")
+    Map<String, Object> JudgeTimeTaskPause(@RequestBody Map<String, Object> map);
+
     @PostMapping("api/v1/truckTms/statisticalReport/getLXInwardReport")
     Map<String, Object> getLXInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer apiId,
@@ -477,6 +493,7 @@ public interface TmsTruckFeign {
                                      @RequestParam Integer pageSize,
                                      @RequestParam String startTime,
                                      @RequestParam String endTime);
+
 }
 
 

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.166:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162: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:192.168.1.118:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign: