Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.QmsFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -238,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){
@@ -434,5 +440,33 @@ public class QMSController extends BaseRESTfulController {
 //                                                       String con
 //    ){return qmsFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
 //    }
+    @ApiOperation(value="查看所有物资")
+    @GetMapping("/getAllModel")
+    public Map<String, Object>  getAllModel(String index){
+        return qmsFeign.getAllModel(index);
+    }
+
+    @ApiOperation(value="查看所有未轧物资")
+    @GetMapping("/getAllModelUnrolled")
+    public Map<String, Object>  getAllModelUnrolled(String index){
+        return qmsFeign.getAllModelUnrolled(index);
+    }
 
+    @ApiOperation(value="添加未轧物资")
+    @PostMapping("/addModel")
+    public Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.addModel(mapValue);
+    }
+
+    @ApiOperation(value="修改未轧物资")
+    @PostMapping("/updateModel")
+    public Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.updateModel(mapValue);
+    }
+
+    @ApiOperation(value="删除未轧物资")
+    @PostMapping("/deleteModel")
+    public Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue){
+        return qmsFeign.deleteModel(mapValue);
+    }
 }

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);
 
@@ -218,5 +221,18 @@ public interface QmsFeign {
 //                                                @RequestParam("pageSize") Integer pageSize,
 //                                                @RequestParam("con")String con
 //    );
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModel")
+    Map<String, Object> getAllModel(@RequestParam String index);
+
+    @GetMapping("api/v1/queueTruck/qmsqueueresults/getAllModelUnrolled")
+    Map<String, Object> getAllModelUnrolled(@RequestParam String index);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/addModel")
+    Map<String, Object> addModel(@RequestBody(required=false) Map<String,Object> mapValue);
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/updateModel")
+    Map<String, Object> updateModel(@RequestBody(required=false) Map<String,Object> mapValue);
 
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/deleteModel")
+    Map<String, Object> deleteModel(@RequestBody(required=false) Map<String,Object> mapValue);
 }

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,