'司机接单'

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

@@ -866,6 +866,12 @@ public class AMScontroller{
         return amsFeign.updateRailOffsetDayplan(mapVal);
     }
 
+    //修改钢材发往异地库计划
+    @PostMapping("/getMaterialMesByDayPlanId/{dayPlanId}")
+    public Map<String,Object> getMaterialMesByDayPlanId(@PathVariable("dayPlanId")  Integer dayPlanId){
+        return amsFeign.getMaterialMesByDayPlanId(dayPlanId);
+    }
+
     //展示钢材发往异地库计划
     @PostMapping("/getRailOffsetDayplan")
     @ApiOperation(value = "展示钢材发往异地库计划")
@@ -888,9 +894,35 @@ public class AMScontroller{
         return amsFeign.addTruckPlan(mapVal);
     }
     //删除
-    @PostMapping("/deleteTruckRequirement/{planId}")
-    public Map<String,Object> deleteTruckPlan(@PathVariable("planId") BigDecimal planId) {
-        return amsFeign.deleteTruckPlan(planId);
+    @PostMapping("/deleteTruckPlan/{planId}")
+    public Map<String,Object> deleteTruckPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.deleteTruckPlan(new BigDecimal(planId));
+    }
+
+    //接收
+    @PostMapping("/receiveInwardPlan/{planId}")
+    public Map<String,Object> receiveInwardPlan(@PathVariable("planId") Integer planId) {
+        return amsFeign.receiveInwardPlan(new BigDecimal(planId));
+    }
+
+    /**
+     * 修改渲染
+     * @param planId
+     * @return
+     */
+    @PostMapping("/selectInwardPlanToUpdate/{planId}")
+    public Map<String,Object> selectInwardPlanToUpdate(@PathVariable("planId") Integer planId) {
+        return amsFeign.selectInwardPlanToUpdate(new BigDecimal(planId));
+    }
+
+    /**
+     * 下发
+     * @param mapList
+     * @return
+     */
+    @PostMapping("/downTruckPlan")
+    public Map<String,Object> downTruckPlan(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.downTruckPlan(mapList);
     }
     /**
      * 修改运输计划/下发运输计划/承运商接收运输计划
@@ -911,17 +943,20 @@ public class AMScontroller{
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "0:257/1,2:258", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckPlanList")
     public Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId) {
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                Integer planStatus,
+                                                Integer carrierId,
+                                                Integer planId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getTruckPlanList(mapValue, pageNum, pageSize, apiId,planStatus,carrierId,planId);
     }
     /**
      *用车单位提出需求
@@ -936,13 +971,31 @@ public class AMScontroller{
     public Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId) {
         return amsFeign.deleteTruckRequirement(requirementId);
     }
+    //下发用车需求
+    @PostMapping("/downRequirement")
+    public Map<String,Object> downRequirement(@RequestBody List<Map<String,Object>> requirementIds) {
+        return amsFeign.downRequirement(requirementIds);
+    }
+
+    //接收用车需求
+    @PostMapping("/receiveRequirement/{requirementId}")
+    public Map<String,Object> receiveRequirement(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.receiveRequirement(requirementId);
+    }
     /**
-     * 修改用车需求/下发用车需求
+     * 修改用车需求
      */
     @PostMapping("/updateTruckRequirement")
     public Map<String,Object> updateTruckRequirement(@RequestBody  Map<String, Object> mapVal){
         return amsFeign.updateTruckRequirement(mapVal);
     }
+    /**
+     * 查询修改渲染
+     */
+    @PostMapping("/selectRequirement/{requirementId}")
+    public Map<String,Object> selectRequirement(@PathVariable("requirementId") Integer requirementId) {
+        return amsFeign.selectRequirement(requirementId);
+    }
 
     /**
      * 展示用车需求
@@ -956,17 +1009,19 @@ public class AMScontroller{
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "还未知", required = false, dataType = "BigDecimal")
+            @ApiImplicitParam(name = "apiId", value = "207", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckRequirementList")
     public Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer apiId) {
+                                          Integer apiId,
+                                          Integer requirementStatus,
+                                          String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
     }
 
     @ApiOperation(value="查询app端公开抢单")
@@ -1033,4 +1088,56 @@ public class AMScontroller{
                                                       String con) {
         return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
     }
+
+    @ApiModelProperty(value = "展示批次信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "252", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getPurchaseIdByBatch")
+    public Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer apiId,
+                                                          String con) {
+        return amsFeign.getPurchaseIdByBatch(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiModelProperty(value = "仓库模代框")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "251", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getWareHouse")
+    public Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer apiId,
+                                                    String con) {
+        return amsFeign.getWareHouse(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiModelProperty(value = "车型下拉")
+    @GetMapping("/getCapacityType")
+    public Map<String,Object> getCapacityType() {
+         return amsFeign.getCapacityType();
+    }
+
+    @ApiModelProperty(value = "用车单位下拉")
+    @GetMapping("/getShipperUser")
+    public Map<String,Object> getShipperUser() {
+        return amsFeign.getShipperUser();
+    }
+
+    @ApiModelProperty(value = "承运商下拉")
+    @GetMapping("/getCarrierList")
+    public Map<String,Object> getCarrierList() {
+        return amsFeign.getCarrierList();
+    }
+
+
+
+
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -531,4 +532,38 @@ public class OMSController {
     public  Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map){
         return  omsFeign.CloseOrder(map);
     }
+
+    @ApiOperation(value = "分解内转计划（新增运输订单）")
+    @PostMapping("/addInwardOrder")
+    public Map<String,Object> addInwardOrder(@RequestBody Map<String,Object> mapValue) {
+        return omsFeign.addInwardOrder(mapValue);
+    }
+
+    @ApiOperation(value = "分派计划")
+    @PostMapping("/apportionInwardOrder")
+    public Map<String,Object> apportionInwardOrder(@RequestBody List<Map<String,Object>> mapList) {
+        return omsFeign.apportionInwardOrder(mapList);
+    }
+
+    @ApiOperation(value="分解计划查询")
+    @PostMapping("/getInwardOrderList")
+    public Map<String, Object> getInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer orderStatus,
+                                                  Integer carrierId,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con);
+        return map;
+    }
+
+    @ApiModelProperty(value = "司机APP端查询下发给自己运输订单")
+    @PostMapping("/sendOrderToApp")
+    public Map<String,Object> sendOrderToApp(@RequestParam String capacityNumber) {
+        return omsFeign.sendOrderToApp(capacityNumber);
+    }
 }

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

@@ -5,6 +5,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -1054,11 +1055,23 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amstruckinwardplan/addTruckPlan")
     Map<String,Object> addTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
     //删除运输计划
-    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/deleteTruckRequirement/{planId}")
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/deleteTruckPlan/{planId}")
     Map<String,Object> deleteTruckPlan(@PathVariable("planId") BigDecimal planId);
-    //修改运输计划/下发运输计划/承运商接收运输计划
+    //接收运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/receiveInwardPlan/{planId}")
+    Map<String,Object> receiveInwardPlan(@PathVariable("planId") BigDecimal planId);
+    //修改渲染
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/selectInwardPlanToUpdate/{planId}")
+    Map<String,Object> selectInwardPlanToUpdate(@PathVariable("planId") BigDecimal planId);
+    //下发运输计划
+    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/downTruckPlan")
+    Map<String,Object> downTruckPlan(@RequestBody List<Map<String,Object>> mapList);
+    //修改运输计划
     @PostMapping(value = "/api/v1/ams/amstruckinwardplan/updateTruckPlan")
     Map<String,Object> updateTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //修改运输计划
+//    @PostMapping(value = "/api/v1/ams/amstruckinwardplan/updateTruckPlan")
+//    Map<String,Object> updateTruckPlan(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
      * 展示运输计划
      */
@@ -1068,9 +1081,12 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckinwardplan/getTruckPlanList")
     Map<String, Object> getTruckPlanList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                       @RequestParam Integer pageNum,
-                                       @RequestParam Integer pageSize,
-                                       @RequestParam Integer apiId);
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer planStatus,
+                                         @RequestParam Integer carrierId,
+                                         @RequestParam Integer planId);
     /**
      *新增用车需求
      */
@@ -1079,9 +1095,18 @@ public interface AmsFeign {
     //用车需求
     @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/deleteTruckRequirement/{requirementId}")
     Map<String,Object> deleteTruckRequirement(@PathVariable("requirementId") BigDecimal requirementId);
-    //修改用车需求/下发用车需求
+    // 接收
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/receiveRequirement/{requirementId}")
+    Map<String,Object> receiveRequirement(@PathVariable("requirementId") Integer requirementId);
+    // 修改渲染
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/selectRequirement/{requirementId}")
+    Map<String, Object> selectRequirement(@PathVariable("requirementId")Integer requirementId);
+    //修改用车需/下发用车需求
     @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/updateTruckRequirement")
     Map<String,Object> updateTruckRequirement(@RequestBody(required = false) Map<String, Object> mapVal);
+    //下发
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/downRequirement")
+    Map<String,Object> downRequirement(@RequestBody List<Map<String,Object>> requirementIds);
     /**
      * 展示用车需求
      */
@@ -1093,7 +1118,9 @@ public interface AmsFeign {
     Map<String, Object> getTruckRequirementList(@RequestBody(required = false) Map<String, Object> mapValue,
                                    @RequestParam Integer pageNum,
                                    @RequestParam Integer pageSize,
-                                   @RequestParam Integer apiId);
+                                   @RequestParam Integer apiId,
+                                                @RequestParam Integer requirementStatus,
+                                                @RequestParam String con);
 
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
@@ -1122,4 +1149,37 @@ public interface AmsFeign {
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
                                                       @RequestParam String con) ;
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
+    Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId,
+                                             @RequestParam String con);
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getCapacityType")
+    Map<String, Object> getCapacityType();
+
+    @GetMapping("/api/v1/ams/amstruckinwardrequirement/getShipperUser")
+    Map<String, Object> getShipperUser();
+
+    @GetMapping("/api/v1/ams/amstruckinwardplan/getCarrierList")
+    Map<String, Object> getCarrierList();
+
+    @PostMapping("/api/v1/ams/amstruckinwardrequirement/getWareHouse")
+    Map<String, Object> getWareHouse(@RequestBody(required = false) Map<String,Object> mapValue,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam String con);
+
+    /**
+     * 钢材发运到异地库查询物资
+     * @param dayPlanId
+     * @return
+     */
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getMaterialMesByDayPlanId/{dayPlanId}")
+    Map<String, Object> getMaterialMesByDayPlanId(@PathVariable("dayPlanId") Integer dayPlanId);
+
+
 }

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

@@ -7,6 +7,7 @@ import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -294,5 +295,27 @@ public interface OmsFeign {
 
     @PostMapping("api/v1/oms/omstruckorders/CloseOrder")
     Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map);
+
+    // 分解内转计划
+    @PostMapping("api/v1/oms/omstruckorders/addInwardOrder")
+    Map<String, Object> addInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    // 分解计划查询
+    @PostMapping("api/v1/oms/omstruckorders/getInwardOrderList")
+    Map<String, Object> getInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer orderStatus,
+                                           @RequestParam Integer carrierId,
+                                           @RequestParam String con);
+
+    // 分派计划
+    @PostMapping("api/v1/oms/omstruckorders/apportionInwardOrder")
+    Map<String, Object> apportionInwardOrder(@RequestBody List<Map<String, Object>> mapList);
+
+    // 司机APP端查询下发给自己运输订单
+    @PostMapping("api/v1/oms/omstruckorders/sendOrderToApp")
+    Map<String, Object> sendOrderToApp(@RequestParam String capacityNumber);
 }