Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

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

@@ -1701,4 +1701,16 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsTruckFeign.getSmsResult(mapValue,apiId,pageNum,pageSize,con);
     }
+
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("/getEnfactoryResultList")
+    public Map<String ,Object> getEnfactoryResultList() {
+        return tmsTruckFeign.getEnfactoryResultList();
+    }
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("/getEnfactoryMessageByOrderId")
+    public Map<String ,Object> getEnfactoryMessageByOrderId(String orderNumber) {
+        return tmsTruckFeign.getEnfactoryMessageByOrderId(orderNumber);
+    }
 }

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

@@ -295,6 +295,14 @@ public interface TmsTruckFeign {
                                     @RequestParam("pageNum") Integer pageNum,
                                     @RequestParam("pageSize") Integer pageSize,
                                     @RequestParam("con") String con);
+
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryResultList")
+    Map<String, Object> getEnfactoryResultList();
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryMessageByOrderId")
+    Map<String, Object> getEnfactoryMessageByOrderId(@RequestParam String orderNumber);
 }