Selaa lähdekoodia

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

luobang 3 vuotta sitten
vanhempi
commit
f50f8a7fe3

+ 26 - 3
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);
+    }
+
 }

+ 36 - 0
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -1128,4 +1128,40 @@ public class RMScontroller {
     public Map<String, Object> getCapacityInfoById(@PathVariable("id") Integer id){
         return rmsFeign.getCapacityInfoById(id);
     }
+
+   //获取货权转移送达单位列表
+    @PostMapping(value = "/getCargoDep")
+    public Map<String,Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     Integer apiId,
+                                     Integer pageNum,
+                                     Integer pageSize,
+                                     String con){
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return rmsFeign.getCargoDep(mapValue,apiId,pageNum,pageSize,con);
+    }
+    //删除货权转移送达单位
+    @PostMapping(value = "/deleteCargoDep")
+    public Map<String, Object> deleteCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.deleteCargoDep(map);
+    }
+    @PostMapping(value = "/getCargoDepById/{id}")
+    public Map<String,Object> getCargoDepById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getCargoDepById(id);
+    }
+
+    //更新货权转移送达单位
+    @PostMapping(value = "/updateCargoDep")
+    public Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.updateCargoDep(map);
+    }
+
+    //新增货权转移送达单位
+    @PostMapping(value = "/insertCargoDep")
+    public Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertCargoDep(map);
+    }
+
+
 }

+ 13 - 2
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -970,6 +970,16 @@ public class TMSController extends BaseRESTfulController {
         return tmsTrainFeign.getUnloadingPointName();
     }
 
+
+    //下拉框
+    @ApiOperation(value = "获取货权转移图片")
+    @ApiImplicitParams({
+    })
+    @PostMapping(value = "/downLoadDeilveryNotice")
+    public Map<String, Object> downLoadDeilveryNotice(@RequestParam Integer noticeId) {
+        return tmsshipFeign.downLoadDeilveryNotice(noticeId);
+    }
+
     @ApiOperation(value = "获取卸车路径名称")
     @ApiImplicitParams({
     })
@@ -1926,9 +1936,10 @@ public class TMSController extends BaseRESTfulController {
                                                Integer pageSize,
                                                String startTime,
                                                String endTime,
-                                               Integer orderType
+                                               Integer orderType,
+                                               String con
     ){
-        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType);
+        return tmsTruckFeign.getRLFLReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime,  orderType,con);
     }
     @ApiOperation(value="查询销售统计报表")
     @PostMapping("/getAllSaleReport")

+ 16 - 2
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);
 }

+ 19 - 0
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -618,4 +618,23 @@ public interface RmsFeign {
 
     @PostMapping("api/v1/rms/rmscapacity/getCapacityInfoById/{id}")
     Map<String,Object> getCapacityInfoById(@PathVariable("id") Integer id);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDep")
+    Map<String, Object> getCargoDep(@RequestBody(required = false) Map<String, Object> mapValue,
+                                    @RequestParam("apiId") Integer apiId,
+                                    @RequestParam("pageNum") Integer pageNum,
+                                    @RequestParam("pageSize") Integer pageSize,
+                                    @RequestParam("con") String con);
+
+    @PostMapping("api/v1/rms/rmscargodeps/deleteCargoDep")
+    Map<String,Object> deleteCargoDep(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/updateCargoDep")
+    Map<String, Object> updateCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/insertCargoDep")
+    Map<String, Object> insertCargoDep(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmscargodeps/getCargoDepById/{id}")
+    Map<String, Object> getCargoDepById(@PathVariable("id") BigDecimal id);
 }

+ 1 - 0
src/main/java/com/steerinfo/dil/feign/TmsTrainFeign.java

@@ -253,4 +253,5 @@ public interface TmsTrainFeign {
     @PostMapping(value = "api/v1/trainTms/tmstrainmeasurecommissions/batchSendMeasureCommission")
     Map<String, Object> batchSendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
+
 }

+ 2 - 1
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -372,7 +372,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("startTime") String startTime,
                                       @RequestParam("endTime")   String endTime,
-                                      @RequestParam("orderType") Integer orderType
+                                      @RequestParam("orderType") Integer orderType,
+                                      @RequestParam("con")String con
     );
 
     @PostMapping("api/v1/truckTms/tmstruckloadresults/cgNzLoadingResult")

+ 5 - 0
src/main/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.feign;
 
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -756,4 +757,8 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
+    @ApiOperation(value = "查看货权转移图片")
+    @PostMapping(value =  "api/v1/shipTms/amsshipdeliverynotices/downLoadDeilveryNotice")
+    Map<String, Object> downLoadDeilveryNotice(@RequestParam("noticeId") Integer noticeId);
+
 }