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

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

@@ -1890,4 +1890,22 @@ public class AMScontroller{
     ) {
         return amsFeign.getFuSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,con);
     }
+
+    @ApiOperation(value = "修改销售订单中的物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "修改销售订单中的物资", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/updateAllMaterialInSale")
+    public RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.updateAllMaterialInSale(mapValue);
+    }
+
+    @ApiOperation(value = "同步关闭金蝶订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "同步关闭金蝶订单", required = false, dataType = "java.util.Map")
+    })
+    @PostMapping(value = "/deleteSaleOrderSame")
+    public Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue) {
+        return amsFeign.deleteSaleOrderSame(mapValue);
+    }
 }

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

@@ -213,6 +213,18 @@ public class OTMSController {
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception{
         return otmsFeign.getCurrentLocation(capcityNumber);
     }
+    //获取地图顶点
+    @GetMapping(value = "/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex(){
+        return  otmsFeign.findAllAvailableVertex();
+    }
+
+    //获取最佳路径
+    @GetMapping(value = "/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception{
+        return otmsFeign.getObtainTheOptimalPath(startPoint,endPoint);
+    }
+
 
     //在途订单列表
     @PostMapping("/transportationPerformance")
@@ -222,5 +234,4 @@ public class OTMSController {
                                                    @RequestParam(required = false,name = "pageSize")Integer pageSize){
         return otmsFeign.transportationPerformance(mapValue!=null?mapValue:new HashMap<>(),apiId,pageNum,pageSize);
     }
-
 }

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

@@ -2021,6 +2021,83 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getPurchaseInwardList")
+    public Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String startTime,
+                                                        String endTime,
+                                                        String orgCode,
+                                                        String isPage,
+                                                        String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getPurchaseOrderList")
+    public Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime,
+                                             String orgCode,
+                                                    String isPage,
+                                                    String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getInwardInFactory")
+    public Map<String, Object> getInwardInFactory(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode,
+                                                    String isPage,
+                                                  String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardInFactory(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+    @ApiOperation(value="获取销售订单列表")
+    @PostMapping("/getSaleOrderList")
+    public Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode,
+                                                    String isPage,
+                                                   String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);

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

@@ -1663,4 +1663,12 @@ public interface AmsFeign {
                                            @RequestParam Integer pageSize,
                                            @RequestParam Integer apiId,
                                            @RequestParam String con);
+
+    // 展示副产品销售订单列表
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateAllMaterialInSale")
+    RESTfulResult updateAllMaterialInSale(@RequestBody Map<String, Object> mapValue);
+
+    // 同步关闭金蝶订单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/deleteSaleOrderSame")
+    Map<String,Object> deleteSaleOrderSame(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -7,8 +7,8 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
+
 @FeignClient(value = "DAL-OTMS-API-DEV", url = "${openfeign.OTMSFeign.url}")
 public interface OtmsFeign {
     //在途订单列表
@@ -115,10 +115,20 @@ public interface OtmsFeign {
     @GetMapping("/api/v1/otms/pathDisplay/getCurrentLocation")
     public RESTfulResult getCurrentLocation(@RequestParam("capcityNumber") String capcityNumber) throws Exception;
 
+    //获取地图顶点
+    @GetMapping(value = "/api/v1/otms/mapvertexs/findAllAvailableVertex")
+    public RESTfulResult findAllAvailableVertex();
+
+    //获取最佳路径
+    @GetMapping(value = "/api/v1/otms/mapvertexs/getObtainTheOptimalPath")
+    public RESTfulResult getObtainTheOptimalPath(@RequestParam("startPoint") String startPoint,@RequestParam("endPoint")  String endPoint) throws Exception;
+
     @PostMapping("/api/v1/otms/pathDisplay/offLineWarn")
     public String offLineWarn(@RequestParam(value = "data") String data) throws Exception;
+
     @PostMapping("/api/v1/otms/pathDisplay/parkWarn")
     public String parkWarn(@RequestParam(value = "data",required = false) String data) throws Exception;
+
     @PostMapping("/api/v1/otms/pathDisplay/abnormalLineWarn")
     public String abnormalLineWarn(@RequestParam(value = "data") String data) throws Exception;
 }

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

@@ -626,6 +626,52 @@ public interface TmsTruckFeign {
     @ApiOperation(value = "获取收货作业照片")
     @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
     public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseInwardList")
+    Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("startTime") String startTime,
+                                      @RequestParam("endTime") String endTime,
+                                      @RequestParam("orgCode") String orgCode,
+                                      @RequestParam("isPage") String isPage,
+                                      @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("startTime") String startTime,
+                                              @RequestParam("endTime") String endTime,
+                                              @RequestParam("orgCode") String orgCode,
+                                              @RequestParam("isPage") String isPage,
+                                             @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleOrderList")
+    Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam("apiId") Integer apiId,
+                                         @RequestParam("pageNum") Integer pageNum,
+                                         @RequestParam("pageSize") Integer pageSize,
+                                         @RequestParam("startTime") String startTime,
+                                         @RequestParam("endTime") String endTime,
+                                         @RequestParam("orgCode") String orgCode,
+                                         @RequestParam("isPage") String isPage,
+                                         @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardInFactory")
+    Map<String, Object> getInwardInFactory(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("startTime") String startTime,
+                                           @RequestParam("endTime") String endTime,
+                                           @RequestParam("orgCode") String orgCode,
+                                           @RequestParam("isPage") String isPage,
+                                           @RequestParam("index") String index);
 }
 
 

src/main/resources/application-dev.yml

@@ -23,6 +23,7 @@ openfeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    #url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign: