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

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

@@ -914,4 +914,10 @@ public class OMSController {
         }
         return omsFeign.getWarehouseMes(mapValue,startTime,endTime, con);
     }
+
+    @ApiOperation(value = "通过运单下的物资信息")
+    @PostMapping("/closeInwardOrderByPlan")
+    public  Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId) {
+        return omsFeign.closeInwardOrderByPlan(planId);
+    }
 }

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

@@ -917,7 +917,7 @@ public class UniversalController extends BaseRESTfulController {
     @ApiModelProperty(value = "边输边查片区")
     @PostMapping("/getSaleAreaByLike")
     public RESTfulResult getSaleAreaByLike(@RequestParam("index") String index) {
-        List<Map<String, Object>> list = universalMapper.getSaleAreaByLike(index == null ? "" : index);
+        List<Map<String, Object>> list = universalMapper.getSaleAreaByLike(index == null ? "" : "%" + index + "%");
         return success(list);
     }
 
@@ -968,7 +968,7 @@ public class UniversalController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "关闭过期运输订单")
     @PostMapping("/closePassedOrder")
-//    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0 8 * * ?")
     public RESTfulResult closePassedOrder() {
         List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
         System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");

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

@@ -528,5 +528,8 @@ public interface OmsFeign {
                                         @RequestParam(required = false) String startTime,
                                         @RequestParam(required = false) String endTime,
                                         @RequestParam(required = false) String con);
+
+    @PostMapping("api/v1/oms/omstruckorders/closeInwardOrderByPlan")
+    Map<String, Object> closeInwardOrderByPlan(@RequestParam Integer planId);
 }
 

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1055,7 +1055,7 @@
 
     <select id="getSaleAreaByLike" parameterType="java.lang.String" resultType="java.util.Map" >
         SELECT RSA.AREA_ID "id",
-               RSA.AREA_ID "value",
+               RSA.AREA_NAME "value",
                RSA.AREA_ID "areaId",
                RSA.AREA_NAME "label"
         FROM RMS_SALE_AREA RSA