合并冲突

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

@@ -511,16 +511,16 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderDetail(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
-    @PostMapping("uploadSaleOrder/{saleOrderId}")
-    Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    @PostMapping("uploadSaleOrder")
+    Map<String, Object> uploadSaleOrder(@RequestParam BigDecimal saleOrderId) {
         return amsFeign.uploadSaleOrder(saleOrderId);
     }
     @PostMapping("/addAmsSaleOrder")
     Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsSaleOrder(mapVal);
     }
-    @PostMapping("getAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    Map<String, Object> getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    @PostMapping("getAmsSaleOrderBySaleOrderId")
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
         return amsFeign.getAmsSaleOrderBySaleOrderId(saleOrderId);
     }
     @PostMapping("/updateAmsSaleOrder")
@@ -533,14 +533,14 @@ public class AMScontroller{
     }
     @PostMapping("getSaleOrderUpdateLog")
     @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSaleOrderUpdateLog(BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                             Integer pageNum,
                                             Integer pageSize,
                                             Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderUpdateLog(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
 
     @GetMapping(value = "getSalePlanName")
@@ -573,7 +573,7 @@ public class AMScontroller{
     Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
         return amsFeign.deleteAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
     }
-    @PostMapping("getAddress/{saleOrderMaterialId}")
+    @PostMapping("getAddress")
     Map<String, Object> getAddress(BigDecimal saleOrderMaterialId) {
         return amsFeign.getAddress(saleOrderMaterialId);
     }
@@ -960,6 +960,7 @@ public class AMScontroller{
     public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
         return amsFeign.getLockDispatchSaleOrderList(carrierId);
     }
+
     @PostMapping("/selectDispatchSaleOrderList")
     public Map<String, Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                            Integer apiId,
@@ -970,7 +971,22 @@ public class AMScontroller{
 
     //获取到站名称
     @GetMapping("/getArriveName")
-    public Map<String,Object> getArriveName(){
+    public Map<String,Object> getArriveName() {
         return amsFeign.getArriveName();
     }
+
+    @ApiModelProperty(value = "查询所有的钢材物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getAllSteelMaterialMes")
+    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con) {
+        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
 }

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

@@ -1099,6 +1099,43 @@ public class TMSController extends BaseRESTfulController {
 
     //******************************************TmstruckLoadResultController***********************************
 
+    @ApiOperation(value="查询所有正在排队的销售订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(227)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getSaleOrderOnQueue")
+    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con){
+        return tmsTruckFeign.getSaleOrderOnQueue(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="查询订单下的物资")
+    @GetMapping("getOrderMaterial/{orderId}")
+    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId){
+        return tmsTruckFeign.getOrderMaterial(orderId);
+    }
+
+    @ApiOperation(value="查询仓库下所有月台")
+    @GetMapping("getPlatformIdByWarehouse/{warehouseId}")
+    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId){
+        return tmsTruckFeign.getPlatformIdByWarehouse(warehouseId);
+    }
+
+    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("/updateLoadingIdAndLoadSq")
+    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map){
+        return tmsTruckFeign.updateLoadingIdAndLoadSq(map);
+    }
+
     @ApiOperation(value = "查询所有装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -1664,4 +1701,16 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsTruckFeign.getSmsResult(mapValue,apiId,pageNum,pageSize,con);
     }
+
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("/getEnfactoryResultList")
+    public Map<String ,Object> getEnfactoryResultList() {
+        return tmsTruckFeign.getEnfactoryResultList();
+    }
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("/getEnfactoryMessageByOrderId")
+    public Map<String ,Object> getEnfactoryMessageByOrderId(String orderNumber) {
+        return tmsTruckFeign.getEnfactoryMessageByOrderId(orderNumber);
+    }
 }

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

@@ -491,8 +491,8 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "saleOrderId", value = "销售订单ID", required = false, dataType = "java.math.BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrder/{saleOrderId}")
-    Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId);
+    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrder")
+    Map<String, Object> uploadSaleOrder(@RequestParam BigDecimal saleOrderId);
     /**
      * 新增销售订单
      */
@@ -512,8 +512,8 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    Map<String, Object> getAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId);
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderBySaleOrderId")
+    Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId);
     /**
      * 通过主键修改销售订单
      * @param map
@@ -541,7 +541,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderUpdateLog")
-    Map<String, Object> getSaleOrderUpdateLog(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderUpdateLog(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId);
@@ -638,7 +638,7 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress/{saleOrderMaterialId}")
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress")
     Map<String, Object> getAddress(@RequestParam BigDecimal saleOrderMaterialId);
 
 
@@ -1091,4 +1091,11 @@ public interface AmsFeign {
     @ApiOperation(value="查询app端已抢的销售订单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
+
+    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
+    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize,
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam String con) ;
 }

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

@@ -24,6 +24,26 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResultForConverted")
     Map<String,Object> addLoadResultForConverted(@RequestBody(required=false) Map<String,Object> map);
 
+
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/getSaleOrderOnQueue")
+    public Map<String, Object> getSaleOrderOnQueue(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("con") String con);
+
+    @ApiOperation(value="查询订单下的物资")
+    @GetMapping("api/v1/truckTms/dropDown/getOrderMaterial/{orderId}")
+    public Map<String, Object> getOrderMaterial(@PathVariable("orderId") Integer orderId);
+
+    @ApiOperation(value="查询仓库下所有月台")
+    @GetMapping("api/v1/truckTms/dropDown/getPlatformIdByWarehouse/{warehouseId}")
+    public Map<String, Object> getPlatformIdByWarehouse(@PathVariable("warehouseId") Integer warehouseId);
+
+    @ApiOperation(value="修改装车点和装车顺序：销售钢材专用 ")
+    @PostMapping("api/v1/truckTms/tmstruckloadresults/updateLoadingIdAndLoadSq")
+    public Map<String, Object> updateLoadingIdAndLoadSq(@RequestBody(required=false) Map<String, Object> map);
+
     @PostMapping("api/v1/truckTms/tmstruckloadresults/getAllLoadResult")
     public Map<String, Object> getAllLoadResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           @RequestParam("apiId") Integer apiId,
@@ -275,6 +295,14 @@ public interface TmsTruckFeign {
                                     @RequestParam("pageNum") Integer pageNum,
                                     @RequestParam("pageSize") Integer pageSize,
                                     @RequestParam("con") String con);
+
+    @ApiOperation(value="APP查询进厂实绩")
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryResultList")
+    Map<String, Object> getEnfactoryResultList();
+
+    @ApiOperation(value="APP通过运输订单id查询进厂实绩")
+    @PostMapping("api/v1/truckTms/tmstruckenfactoryresults/getEnfactoryMessageByOrderId")
+    Map<String, Object> getEnfactoryMessageByOrderId(@RequestParam String orderNumber);
 }