修改内转

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

@@ -89,6 +89,14 @@ public class AMScontroller{
         return amsFeign.receptionPurPlan(planId);
     }
 
+    //停用运输计划
+    @PostMapping("/changePlanStatus/{planId}")
+    public Map<String,Object>changePlanStatus(@PathVariable("planId") BigDecimal planId){
+        return amsFeign.changePlanStatus(planId);
+    }
+
+
+
     @ApiOperation(value = "逻辑删除运输计划 状态：3")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
@@ -947,6 +955,11 @@ public class AMScontroller{
     public Map<String,Object> addTruckPlan(@RequestBody  Map<String, Object> mapVal) {
         return amsFeign.addTruckPlan(mapVal);
     }
+    //新增采购内转需求
+    @PostMapping("/addPurInwardRequirement")
+    public Map<String,Object>addPurInwardRequirement(@RequestBody Map<String,Object>mapval){
+        return amsFeign.addPurInwardRequirement(mapval);
+    }
     //删除
     @PostMapping("/deleteTruckPlan/{planId}")
     public Map<String,Object> deleteTruckPlan(@PathVariable("planId") Integer planId) {
@@ -1078,6 +1091,22 @@ public class AMScontroller{
         return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
     }
 
+    @PostMapping("/getPurRequirementList")
+    public Map<String, Object> getPurRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       Integer requirementStatus,
+                                                       String con,
+                                                       String userId,
+                                                       String carrierSsoId,
+                                                       String enableStatus,
+                                                       String planStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus);
+    }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")
     public Map<String, Object> getDispatchSaleOrderList() {
@@ -1283,6 +1312,7 @@ public class AMScontroller{
         return amsFeign.addSporadicOrders(mapValue);
     }
 
+
     @ApiOperation(value="零星一车多趟新增订单")
     @PostMapping("/addSporadicOrderTimes")
     public Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String,Object> mapValue) {

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

@@ -98,6 +98,12 @@ public class OMSController {
         return omsFeign.addPurOrder(mapValue);
     }
 
+    //采购内转派单
+    @ApiOperation(value = "采购内转派单")
+    @PostMapping("/addPurInwardOrder")
+    public Map<String,Object> addPurInwardOrder(@RequestBody(required = false) Map<String,Object>mapValue) {
+        return omsFeign.addPurInwardOrder(mapValue);
+    }
 
     @ApiOperation(value = "修改分派计划")
     @PostMapping("/updateOrder")
@@ -105,14 +111,12 @@ public class OMSController {
         return omsFeign.updateOrder(map);
     }
 
-
     @ApiOperation(value = "派单")
     @PostMapping("/dispatchOrder")
     public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
         return omsFeign.dispatchOrder(mapValue);
     }
 
-
     @ApiOperation(value = "销售派单")
     @PostMapping("/dispatchOrderForSale")
     public Map<String, Object> dispatchorderForSale(@RequestBody(required = false) Map<String, Object> map) {
@@ -120,7 +124,6 @@ public class OMSController {
     }
 
 
-
     @ApiOperation(value = "逻辑删除运单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
@@ -582,6 +585,23 @@ public class OMSController {
         return map;
     }
 
+    @ApiOperation(value="采购内转运单")
+    @PostMapping("/getPurInwardOrderList")
+    public Map<String, Object> getPurInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer orderStatus,
+                                                  String carrierId,
+                                                  String con,
+                                                     Integer planEnableStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus);
+        return map;
+    }
+
     @ApiOperation(value = "司机APP端查询下发给自己运输订单")
     @PostMapping("/sendOrderToApp")
     public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {

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

@@ -903,9 +903,15 @@ public interface AmsFeign {
     @PostMapping ("api/v1/ams/amstruckpurplans/getPurPlanById/{planId}")
     public Map<String, Object> getPurPlanById(@PathVariable("planId")Integer planId);
 
+    @PostMapping ("api/v1/ams/amstruckinwardplan/changePlanStatus/{planId}")
+    public Map<String, Object> changePlanStatus(@PathVariable("planId")BigDecimal planId);
+
+
     @PostMapping("api/v1/ams/amstruckpurplans/addPurPlan")
     public Map<String, Object> addPurPlan(@RequestBody Map<String, Object> map);
 
+
+
     @PostMapping("api/v1/ams/amstruckpurplans/sendPurPlan/{planId}")
     public Map<String, Object> sendPurPlan(@PathVariable("planId")Integer planId);
 
@@ -1451,4 +1457,23 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrderList")
     Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String, Object> mapValue);
+
+    //新增采购内转需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/addPurInwardRequirement")
+    Map<String, Object> addPurInwardRequirement(@RequestBody  Map<String, Object> mapval);
+
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getPurRequirementList")
+    Map<String, Object> getPurRequirementList(@RequestBody Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer requirementStatus,
+                                              @RequestParam String con,
+                                              @RequestParam String userId,
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String enableStatus,
+                                              @RequestParam String planStatus);
+
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
@@ -407,5 +408,21 @@ public interface OmsFeign {
     @ApiOperation(value = "查询订单是否确认")
     @PostMapping("api/v1/oms/omstruckorders/getDriverConfirmation")
     Map<String, Object> getDriverConfirmation(@RequestBody(required = false) Map<String,Object> map);
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/addPurInwardOrder")
+    Map<String, Object> addPurInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    //采购内转运输订单
+    @PostMapping("api/v1/oms/omstruckorders/getPurInwardOrderList")
+    Map<String, Object> getPurInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer orderStatus,
+                                           @RequestParam String carrierId,
+                                           @RequestParam String con,
+                                              @RequestParam Integer planEnableStatus);
+
 }
 

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,7 +30,7 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}