'销售'

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

@@ -298,15 +298,18 @@ public class OMSController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getDriverInfoForSale")
-    public Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            Integer apiId,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            Integer orderStatus,
-                                            String con
+    public Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer orderType,
+                                                   Integer orderStatus,
+                                                   String con,
+                                                   String carrierSsoId,
+                                                   Integer shipperId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderStatus, con);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,orderType,orderStatus, con,carrierSsoId,shipperId);
     }
     @PostMapping("/getDriverInfoForSale1")
     public Map<String,Object> getDriverInfoForSale1(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -836,4 +839,18 @@ public class OMSController {
     public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map) {
         return omsFeign.updateMaterialMes(map);
     }
+
+    @ApiOperation(value = "展示销售订单下的运输订单")
+    @PostMapping("getDriverInfoForSale2")
+    public Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer saleOrderId,
+                                                     String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return omsFeign.getDriverInfoForSale2(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId),con);
+    }
 }

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

@@ -1106,4 +1106,20 @@ public class RMScontroller {
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
         return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());
     }
+
+    @ApiOperation("罗棒的")
+    @PostMapping("/getInwardContractMaterial")
+    public RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String,Object> map,
+                                                   Integer apiId,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   String con){
+        return rmsFeign.getInwardContractMaterial(map!=null?map:new HashMap<>(),apiId,pageNum,pageSize,con);
+    }
+
+    @ApiOperation("罗棒的")
+    @PostMapping("/insertMaterialType")
+    public RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String,Object> map){
+        return rmsFeign.insertMaterialType(map);
+    }
 }

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

@@ -1956,9 +1956,10 @@ public class TMSController extends BaseRESTfulController {
                                           String carrierSsoId,
                                                 Integer orderType,
                                                 Integer shipperId,
-                                                String receiveName
+                                                String receiveName,
+                                                String materialName
     ){
-        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName);
+        return tmsTruckFeign.getAllSaleReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime, carrierSsoId,orderType,shipperId,receiveName,materialName);
     }
 
     @ApiOperation(value="查询销售统计报表筛选过后的总净重")

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

@@ -130,12 +130,15 @@ public interface OmsFeign {
      * 销售物流司机接收新的订单
      */
     @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
-    Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("apiId")      Integer apiId,
-                                            @RequestParam("pageNum")    Integer pageNum,
-                                            @RequestParam("pageSize")   Integer pageSize,
-                                            @RequestParam("orderStatus")Integer orderStatus,
-                                            @RequestParam("con")        String con
+    Map<String,Object> getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam Integer orderType,
+                                            @RequestParam Integer orderStatus,
+                                            @RequestParam String con,
+                                            @RequestParam String carrierSsoId,
+                                            @RequestParam Integer shipperId
     );
 
 
@@ -493,5 +496,12 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckmatetialorders/updateMaterialMes")
     public Map<String, Object> updateMaterialMes(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/oms/omstruckorders/getDriverInfoForSale2")
+    Map<String, Object> getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam BigDecimal saleOrderId,
+                                              @RequestParam String con);
 }
 

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

@@ -605,4 +605,14 @@ public interface RmsFeign {
     @ApiOperation("解除承运商和车辆的绑定关系")
     @PostMapping("api/v1/rms/rmscapacity/deleteCapacityCarrier")
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("api/v1/rms/rmsmaterialtype/getInwardContractMaterial")
+    RESTfulResult getInwardContractMaterial(@RequestBody(required = false) Map<String, Object> map,
+                                            @RequestParam Integer apiId,
+                                            @RequestParam Integer pageNum,
+                                            @RequestParam Integer pageSize,
+                                            @RequestParam String con);
+
+    @PostMapping("api/v1/rms/rmsmaterialtype/insertMaterialType")
+    RESTfulResult insertMaterialType(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -393,7 +393,8 @@ public interface TmsTruckFeign {
                                       @RequestParam("carrierSsoId")   String carrierSsoId,
                                          @RequestParam("orderType") Integer orderType,
                                          @RequestParam("shipperId") Integer shipperId,
-                                         @RequestParam("receiveName") String receiveName
+                                         @RequestParam("receiveName") String receiveName,
+                                         @RequestParam String materialName
     );
 
     @PostMapping("api/v1/truckTms/statisticalReport/getAllSaleReportTotal")

src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8079}
+    url: ${AMSFEIGN_URL:172.16.33.166:8079}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmstrainFeign:
@@ -23,7 +23,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:192.168.1.105:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.166:8090}
   WMSHFeign:
@@ -31,9 +31,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.166:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8095}
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:192.168.1.105:8060}
+    url: ${RMSFEIGN_URL:172.16.33.166:8060}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   OTMSFeign: