luobang 2 years ago
parent
commit
149dcbf451

+ 1 - 1
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);
     }
 

+ 7 - 0
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;
@@ -2676,4 +2677,10 @@ 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);
+    }
 }

+ 1 - 1
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,

+ 3 - 0
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -751,6 +751,9 @@ 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);
+
 }