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

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

@@ -1419,11 +1419,12 @@ public class AMScontroller{
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String consigneeSsoId) {
+                                                  String consigneeSsoId,
+                                                  @RequestParam(required = false) String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId,con);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1432,11 +1433,12 @@ public class AMScontroller{
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
-                                               @RequestParam(required = false) String consigneeSsoId){
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId,con);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")

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

@@ -1351,7 +1351,8 @@ public interface AmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
-                                           @RequestParam(required = false) String consigneeSsoId);
+                                           @RequestParam(required = false) String consigneeSsoId,
+                                           @RequestParam(required = false) String con);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1362,7 +1363,8 @@ public interface AmsFeign {
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
                                                @RequestParam Integer apiId,
-                                               @RequestParam(required = false) String consigneeSsoId);
+                                               @RequestParam(required = false) String consigneeSsoId,
+                                               @RequestParam(required = false) String con);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,

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

@@ -872,7 +872,7 @@
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "materialCode" desc
+            order by "materialCode" ASC
         </if>
     </select>