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

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

@@ -838,12 +838,6 @@ public class OMSController {
     }
 
 
-    @ApiOperation(value = "查看所有实绩点")
-    @PostMapping("/getAllResultLineMes")
-    public Map<String, Object> getAllResultLineMes(Integer orderId, String orderNumber){
-        return omsFeign.getAllResultLineMes(orderId, orderNumber);
-    }
-
     @ApiOperation(value = "正常关闭运输订单")
     @PostMapping("/closeInwardOrder")
     public Map<String, Object> closeInwardOrder(Integer orderId){

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

@@ -274,11 +274,19 @@ public class QMSController extends BaseRESTfulController {
                                          String capacityNo){
         return qmsFeign.isInCircle(longitude,latitude,capacityNo);
     }
+
+    @ApiOperation(value = "撤销进厂确认")
+    @PostMapping("/ctrlZQueueAllow")
+    public Map<String,Object> ctrlZQueueAllow(@RequestBody(required = false) Map<String,Object> map){
+        return qmsFeign.ctrlZQueueAllow(map);
+    }
+
     @PostMapping("/getStoreQueueList")
     public Map<String, Object> getStoreQueueList(){
         return qmsFeign.getStoreQueueList();
     }
 
+
 //    @ApiOperation(value="查询进厂排队详情")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -2198,8 +2198,8 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                String startTime,
                                                String endTime,
-                                               String con) {
-        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con);
+                                               String con, String isPage) {
+        return tmsTruckFeign.getLoaderForResultDetail(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, startTime, endTime,con,isPage);
     }
 
 

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

@@ -143,8 +143,13 @@ public interface QmsFeign {
     Map<String, Object> isInCircle(@RequestParam String longitude,
                                    @RequestParam String latitude,
                                    @RequestParam String capacityNo);
+
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/ctrlZQueueAllow")
+    Map<String, Object> ctrlZQueueAllow(Map<String, Object> map);
+
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getStoreQueueList")
     Map<String, Object> getStoreQueueList();
+
 //    @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
 //     Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
 //                                              @RequestParam("apiId") Integer apiId,

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

@@ -502,8 +502,7 @@ public interface TmsTruckFeign {
                                    @RequestParam("pageNum") Integer pageNum,
                                    @RequestParam("pageSize") Integer pageSize,
                                    @RequestParam("startTime") String startTime,
-                                   @RequestParam("endTime") String endTime,
-                                                 @RequestParam("con") String con);
+                                   @RequestParam("endTime") String endTime, @RequestParam("con") String con, @RequestParam("isPage") String  isPage);
 
     @PostMapping("api/v1/truckTms/statisticalReport/getUnLoading")
     Map<String, Object> getUnLoading(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -246,4 +246,6 @@ public class UniversalServiceImpl implements UniversalService {
         int result = universalMapper.closePassedOrder();
         System.out.println("订单关闭数为：" + result);
     }
+
+
 }

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout