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

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

@@ -1978,6 +1978,12 @@ public class AMScontroller{
         return amsFeign.updateCapacityNumberInFactory(mapValue);
     }
 
+    @ApiModelProperty(value = "修改收货客户的电话(销售)")
+    @PostMapping("/updateConsigneeTel")
+    public Map<String,Object> updateConsigneeTel(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateConsigneeTel(mapValue);
+    }
+
     @ApiModelProperty(value = "展示下发给承运商的车序号和物资")
     @PostMapping("/getCarrierTruckNoAndMaterialList")
     public Map<String,Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String,Object> map) {

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

@@ -239,6 +239,11 @@ public class QMSController extends BaseRESTfulController {
         return qmsFeign.allowEnFactory(mapValue);
     }
 
+    @PostMapping("/modifyLoadWarehouse")
+    public Map<String, Object> modifyLoadWarehouse(@RequestBody(required=false) Map<String, Object> mapValue){
+        return qmsFeign.modifyLoadWarehouse(mapValue);
+    }
+
     @ApiOperation(value="APP端司机查看排队信息")
     @GetMapping("getQueueResultByTotalId")
     public Map<String, Object> getQueueResultByTotalId(String resultTotalId){

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

@@ -861,9 +861,9 @@ public class RMScontroller {
 
     @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
-    @PostMapping(value = "/updateOilPrice/{id}")
-    public Map<String, Object> updateOilPrice(@PathVariable("id") Integer id) {
-        return rmsFeign.updateOilPrice(id);
+    @PostMapping(value = "/updateOilPrice")
+    public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> mapValue) {
+        return rmsFeign.updateOilPrice(mapValue);
     }
 
     @ApiOperation(value="删除", notes="根据url的id来指定删除对象")

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

@@ -2666,4 +2666,14 @@ public class TMSController extends BaseRESTfulController {
     public Map<String,Object> getWagonWork(@RequestBody(required = false) Map<String, Object> map){
         return tmsshipFeign.getWagonWork(map);
     }
+
+    @PostMapping("/queryNumber")
+    public Map<String,Object> queryNumber(@RequestParam String orderNumber){
+        return tmsTruckFeign.queryNumber(orderNumber);
+    }
+
+    @PostMapping("/changeNumber")
+    public Map<String,Object> changeNumber(@RequestParam String orderNumber){
+        return tmsTruckFeign.changeNumber(orderNumber);
+    }
 }

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

@@ -1719,6 +1719,10 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amssaleorders/updateCapacityNumberInFactory")
     Map<String,Object> updateCapacityNumberInFactory(@RequestBody Map<String, Object> mapValue);
 
+    // 修改厂内未装货车辆的运单车牌号
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateConsigneeTel")
+    Map<String,Object> updateConsigneeTel(@RequestBody Map<String,Object> mapValue);
+
     // 展示下发给承运商的车序号和物资
     @PostMapping(value = "/api/v1/ams/amssaleorders/getCarrierTruckNoAndMaterialList")
     Map<String, Object> getCarrierTruckNoAndMaterialList(@RequestBody Map<String, Object> map);

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

@@ -130,6 +130,9 @@ public interface QmsFeign {
     @PostMapping("api/v1/queueTruck/qmsqueuelists/allowEnFactory")
     Map<String, Object> allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue);
 
+    @PostMapping("api/v1/queueTruck/qmsqueuelists/modifyLoadWarehouse")
+    Map<String, Object> modifyLoadWarehouse(@RequestBody(required=false) Map<String, Object> mapValue);
+
     @GetMapping("api/v1/queueTruck/qmsqueueresults/getQueueResultByTotalId")
     Map<String, Object> getQueueResultByTotalId(@RequestParam("resultTotalId") String resultTotalId);
 

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

@@ -455,8 +455,8 @@ public interface RmsFeign {
     Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id);
 
     //更新油价
-    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice/{id}")
-    Map<String, Object> updateOilPrice(@PathVariable("id") Integer id);
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice")
+    Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> mapValue);
 
     //根据id获取油价
     @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPriceById/{id}")

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

@@ -377,6 +377,12 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/selfMachine/getDeliveryOrder")
     Map<String, Object> getDeliveryOrder(@RequestParam String orderNumber);
 
+    @PostMapping("api/v1/truckTms/selfMachine/queryNumber")
+    Map<String, Object> queryNumber(@RequestParam String orderNumber);
+
+    @PostMapping("api/v1/truckTms/selfMachine/changeNumber")
+    Map<String, Object> changeNumber(@RequestParam String orderNumber);
+
     @PostMapping("api/v1/truckTms/statisticalReport/getRLFLReport")
     Map<String, Object> getRLFLReport(@RequestBody(required=false) Map<String,Object> mapValue,
                                       @RequestParam("apiId") Integer apiId,