dengpan 1 год назад
Родитель
Сommit
ef0f4d91a9

+ 6 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -866,4 +866,10 @@ public class AMScontroller  extends BaseRESTfulController {
     RESTfulResult updateBalancePl(@RequestBody Map<String,Object> map) {
     RESTfulResult updateBalancePl(@RequestBody Map<String,Object> map) {
         return amsFeign.updateBalancePl(map);
         return amsFeign.updateBalancePl(map);
     }
     }
+
+    @ApiOperation("重导WMS")
+    @PostMapping("/addWMS")
+    RESTfulResult addWMS(@RequestBody Map<String,Object> map) {
+        return amsFeign.addWMS(map);
+    }
 }
 }

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

@@ -323,4 +323,7 @@ public interface AmsFeign {
 
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/updateBalancePl")
     @PostMapping(value = "api/v1/ams/amstransrequirements/updateBalancePl")
     RESTfulResult updateBalancePl(@RequestBody Map<String, Object> map);
     RESTfulResult updateBalancePl(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/addWMS")
+    RESTfulResult addWMS(@RequestBody Map<String, Object> map);
 }
 }

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -160,7 +160,7 @@
 
 
             </where>
             </where>
             <if test="noRow == null">
             <if test="noRow == null">
-                order by LENGTH(company_name)
+                order by rc.register_aptitudes,LENGTH(company_name)
             </if>
             </if>
             )
             )
             <where>
             <where>
@@ -168,7 +168,7 @@
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
                 <include refid="com.steerinfo.dil.mapper.CommonMapper.filterCompanyData"></include>
             </if>
             </if>
             </where>
             </where>
-            ORDER BY to_number("seqNo")
+            ORDER BY to_number("seqNo") desc
             FETCH NEXT 10 ROWS ONLY
             FETCH NEXT 10 ROWS ONLY
         )
         )
         <if test="id!=null and id.size>0">
         <if test="id!=null and id.size>0">