4.1

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

@@ -2142,4 +2142,23 @@ public class TMSController extends BaseRESTfulController {
     public String getReceiptPhoto(@RequestParam String orderNumber){
         return tmsTruckFeign.getReceiptPhoto(orderNumber);
     }
+
+
+    @ApiOperation("厂外收货作业")
+    @PostMapping("/getReceivingResult")
+    public Map<String,Object> getReceivingResult(@RequestBody(required = false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con,
+                                               String startTime,
+                                               String endTime){
+        return tmsTruckFeign.getReceivingResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con,startTime,endTime);
+    }
+
+    @ApiOperation("展示收货的照片")
+    @PostMapping("/getReceivingPhoto")
+    public Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber){
+        return tmsTruckFeign.getReceivingPhoto(orderNumber);
+    }
 }

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

@@ -532,6 +532,19 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceiptPhoto")
     String getReceiptPhoto(@RequestParam String orderNumber);
 
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingResult")
+    Map<String, Object> getReceivingResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam String con,
+                                         @RequestParam String startTime,
+                                         @RequestParam String endTime
+    );
+
+    @PostMapping("api/v1/truckTms/tmstruckreceiptresults/getReceivingPhoto")
+    Map<String,Object> getReceivingPhoto(@RequestParam String orderNumber);
+
     @PostMapping("/api/v1/truckTms/pathDisplay/fullPath")
     public Object fullPath(@RequestParam("orderNumber") String orderNumber) throws Exception;
     @PostMapping("/api/v1/truckTms/pathDisplay/getInTransitTransportation")