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

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

@@ -1887,9 +1887,10 @@ public class AMScontroller{
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String con
+                                                  String con,
+                                                  Integer deleted
     ) {
-        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
+        return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,new BigDecimal(deleted));
     }
 
     @ApiOperation(value = "修改销售订单中的物资")
@@ -1897,7 +1898,7 @@ public class AMScontroller{
             @ApiImplicitParam(name = "map", value = "修改销售订单中的物资", required = false, dataType = "java.util.Map")
     })
     @PostMapping(value = "/updateAllMaterialInSale")
-    public RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
+    public Map<String,Object> updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
         return amsFeign.updateAllMaterialInSale(mapValue);
     }
 
@@ -1909,4 +1910,26 @@ public class AMScontroller{
     public Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue) {
         return amsFeign.deleteSaleOrderSame(mapValue);
     }
+
+    @ApiOperation(value = "修改收货地址")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改收货地址", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/updateCarAddress")
+    public Map<String,Object> updateCarAddress(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateCarAddress(mapValue);
+    }
+
+    @ApiOperation(value = "展示反审批的钢材订单")
+    @PostMapping("/getSteelOrderDeletedList")
+    public Map<String, Object> getSteelOrderDeletedList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId,
+                                                  String con,
+                                                        String consigneeSsoId
+    ) {
+        return amsFeign.getSteelOrderDeletedList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con,consigneeSsoId);
+    }
+
 }

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

@@ -1663,13 +1663,27 @@ public interface AmsFeign {
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
-                                           @RequestParam String con);
+                                           @RequestParam String con,
+                                           @RequestParam BigDecimal deleted);
 
     // 展示副产品销售订单列表
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateAllMaterialInSale")
-    RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue);
+    Map<String,Object> updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue);
 
     // 同步关闭金蝶订单
     @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderSame")
     Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue);
+
+    // 修改收货地址
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateCarAddress")
+    Map<String, Object> updateCarAddress(Map<String, Object> mapValue);
+
+    // 展示反审批的钢材订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSteelOrderDeletedList")
+    Map<String, Object> getSteelOrderDeletedList(@RequestBody(required = false) Map<String, Object> objectMap,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam String con,
+                                                 @RequestParam String consigneeSsoId);
 }