Merge remote-tracking branch 'origin/master'

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

@@ -1789,7 +1789,7 @@ public class AMScontroller{
 
     @ApiModelProperty(value = "将车序号下发给承运商")
     @PostMapping("/dispatchToCarrier")
-    public RESTfulResult dispatchToCarrier(@RequestBody List<Map<String,Object>> mapList) {
+    public RESTfulResult dispatchToCarrier(@RequestBody(required = false) List<Map<String,Object>> mapList) {
         return amsFeign.dispatchToCarrier(mapList);
     }
 

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

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.websocket.server.ServerEndpoint;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
@@ -1965,9 +1966,10 @@ public class TMSController extends BaseRESTfulController {
                                               String con,
                                               String  userId,
                                               String startTime,
-                                              String endTime
+                                              String endTime,
+                                              Integer orderType
     ){
-        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime);
+        return tmsTruckFeign.getAllTimeTaskResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con,userId,startTime,endTime,orderType);
     }
 
     @ApiOperation(value="新增钢材到异地库达州站驻港人员确定收货")
@@ -2676,4 +2678,17 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> changeNumber(@RequestParam String orderNumber){
         return tmsTruckFeign.changeNumber(orderNumber);
     }
+
+    @ApiOperation("根据车序号id查询主干数据")
+    @PostMapping("/getSteelReportDetailsBySmId")
+    public Map<String,Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId){
+        return tmsTruckFeign.getSteelReportDetailsBySmId(saleOrderMaterialId);
+    }
+
+//    @ApiOperation(value="测试-新增计费详单")
+//    @PostMapping("/genernateInwardTime")
+//    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map){
+//        return  tmsTruckFeign.genernateInwardTime(map);
+//    }
+
 }

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

@@ -1584,7 +1584,7 @@ public interface AmsFeign {
     Map<String, Object> getPriceByCarrierAndPlace(@RequestBody Map<String, Object> mapValue);
 
     @PostMapping(value = "/api/v1/ams/amssaleorders/dispatchToCarrier")
-    RESTfulResult dispatchToCarrier(@RequestBody List<Map<String, Object>> mapList);
+    RESTfulResult dispatchToCarrier(@RequestBody(required = false) List<Map<String, Object>> mapList);
 
     @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderListToCarrier")
     RESTfulResult getSaleOrderListToCarrier(@RequestBody(required = false) Map<String, Object> mapValue,

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

@@ -350,7 +350,8 @@ public interface TmsTruckFeign {
                                               @RequestParam("con") String con,
                                               @RequestParam("userId") String userId,
                                               @RequestParam("startTime") String startTime,
-                                              @RequestParam("endTime") String endTime);
+                                              @RequestParam("endTime") String endTime,
+                                              @RequestParam("orderType")Integer orderType);
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addDaZhouToDaGangLoadResult")
     Map<String, Object> addDaZhouToDaGangLoadResult(@RequestBody(required = false)Map<String, Object> map);
@@ -751,6 +752,12 @@ public interface TmsTruckFeign {
     Map<String, Object> sendMeaage(@RequestParam String mobile,
                                    @RequestParam String content);
 
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSteelReportDetailsBySmId")
+    Map<String, Object> getSteelReportDetailsBySmId(@RequestParam BigDecimal saleOrderMaterialId);
+
+  /* @PostMapping("/api/v1/truckTms/tmstrucktimetaskresults/genernateInwardTime")
+    public Map<String, Object> genernateInwardTime(@RequestBody(required = false) Map<String, Object> map);*/
+
 }