add

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

@@ -2499,4 +2499,27 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsTruckFeign.getSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
     }
+
+
+
+
+    @ApiOperation(value = "销售钢材统计报表")
+    @PostMapping("/getInwardSaleSteelReport")
+    public Map<String,Object> getInwardSaleSteelReport(@RequestBody(required = false)Map<String,Object>map,
+                                                 String startTime,
+                                                 String endTime,
+                                                 String carrierSsoId,
+                                                 String receiveName,
+                                                 String materialName,
+                                                 String specification,
+                                                 String remark,
+                                                 String capacityNo,
+                                                 String carrierName,
+                                                 String consigneeName,
+                                                 String saler){
+        if(map==null){
+            map=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardSaleSteelReport(map,startTime,endTime,carrierSsoId,receiveName,materialName,specification,remark,capacityNo,carrierName,consigneeName,saler);
+    }
 }

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

@@ -718,6 +718,20 @@ public interface TmsTruckFeign {
                                            @RequestParam("consigneeName") String consigneeName,
                                            @RequestParam("saler") String saler
                                            );
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardSaleSteelReport")
+    Map<String, Object> getInwardSaleSteelReport(@RequestBody(required = false) Map<String, Object> map,
+                                                 @RequestParam("startTime") String startTime,
+                                                 @RequestParam("endTime") String endTime,
+                                                 @RequestParam("carrierSsoId") String carrierSsoId,
+                                                 @RequestParam("receiveName") String receiveName,
+                                                 @RequestParam("materialName") String materialName,
+                                                 @RequestParam("specification") String specification,
+                                                 @RequestParam("remark") String remark,
+                                                 @RequestParam("capacityNo") String capacityNo,
+                                                 @RequestParam("carrierName") String carrierName,
+                                                 @RequestParam("consigneeName") String consigneeName,
+                                                 @RequestParam("saler") String saler);
 }
 
 

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-api

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1224,13 +1224,16 @@
             and (INSTR(db.RESULT_FOREIGN_SHIP_NAME,#{index}) > 0 or INSTR(rm.MATERIAL_NAME,#{index}) > 0)
         </if>
     </select>
+    <!-- 获取发站-->
     <select id="getInwardSendStation" resultType="java.util.Map">
         select
             RAS.ARRIVAL_NAME "sendStation",
             RAS.ARRIVAL_ID		"sendStationId"
             from RMSTRAIN_ARRIVAL_SEND RAS
             WHERE RAS.ARRIVAL_TYPE_ID = 1
+
     </select>
+
     <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT RC.CAPACITY_NUMBER "capacityNumber",
                OO.ORDER_NUMBER "orderNumber",