tijiao

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

@@ -650,12 +650,13 @@ public class BMSController extends BaseRESTfulController {
                                                            String capacityNo,
                                                            String shipperNames,
                                                            String transRangeValues,
-                                                           String materialTypeNames) {
+                                                           String materialTypeNames,
+                                                           String isPage) {
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
         return bmstruckFeign.getInwardWeightDetailsOrder(mapVal, pageNum, pageSize, apiId, carrierSsoId,detailStatus,orderType,userId, startTime,
-                 endTime,capacityNo,shipperNames,transRangeValues,materialTypeNames);
+                 endTime,capacityNo,shipperNames,transRangeValues,materialTypeNames,isPage);
     }
 
     @PostMapping("/getNoInwardDetails")

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

@@ -927,12 +927,16 @@ public class OMSController {
 
     @ApiOperation(value = "查询内转钢材火车发运明细")
     @PostMapping("getWagonShippingDetails")
-    public Map<String,Object> getWagonShippingDetails(@RequestBody(required = false) Map<String,Object> map,
+    public Map<String,Object> getWagonShippingDetails(@RequestBody(required = false)  Map<String,Object> map,
                                                       @RequestParam(required = false) String startTime,
-                                                      @RequestParam(required = false) String endTime){
+                                                      @RequestParam(required = false) String endTime,
+                                                      @RequestParam(required = false) String sendStation,
+                                                      @RequestParam(required = false) String toTheStation,
+                                                      @RequestParam(required = false) String consigneeName,
+                                                      @RequestParam(required = false) String wagonNo){
         if (map == null) {
             map = new HashMap<>();
         }
-        return omsFeign.getWagonShippingDetails(map,startTime,endTime);
+        return omsFeign.getWagonShippingDetails(map,startTime,endTime,sendStation,toTheStation,consigneeName,wagonNo);
     }
 }

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

@@ -2544,5 +2544,12 @@ public class TMSController extends BaseRESTfulController {
         return tmsTruckFeign.getInwardSaleSteelOrder(map,startTime,endTime,remark,capacityNo,consigneeName);
     }
 
+    @ApiOperation(value = "发送短信")
+    @PostMapping("sendMeaage")
+    public Map<String,Object> sendMeaage(@RequestParam String mobile,
+                                         @RequestParam String content){
+        return tmsTruckFeign.sendMeaage(mobile,content);
+    }
+
 
 }

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

@@ -248,7 +248,8 @@ public interface BmstruckFeign {
                                                     @RequestParam("capacityNo")String capacityNo,
                                                     @RequestParam("shipperNames")String shipperNames,
                                                     @RequestParam("transRangeValues")String transRangeValues,
-                                                    @RequestParam("materialTypeNames")String materialTypeNames);
+                                                    @RequestParam("materialTypeNames")String materialTypeNames,
+                                                    @RequestParam String isPage);
 
 
 

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

@@ -536,8 +536,12 @@ public interface OmsFeign {
     Map<String, Object> getOrderTrainMes(@RequestParam Integer orderId);
 
     @PostMapping("/api/v1/oms/omstrainorders/getWagonShippingDetails")
-    Map<String, Object> getWagonShippingDetails(@RequestBody(required = false) Map<String, Object> map,
+    Map<String, Object> getWagonShippingDetails(@RequestBody(required = false)  Map<String, Object> map,
                                                 @RequestParam(required = false) String startTime,
-                                                @RequestParam(required = false) String endTime);
+                                                @RequestParam(required = false) String endTime,
+                                                @RequestParam(required = false) String sendStation,
+                                                @RequestParam(required = false) String toTheStation,
+                                                @RequestParam(required = false) String consigneeName,
+                                                @RequestParam(required = false) String wagonNo);
 }
 

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

@@ -742,6 +742,10 @@ public interface TmsTruckFeign {
                                                  @RequestParam("consigneeName") String consigneeName
                                                  );
 
+    @PostMapping("/api/v1/truckTms/tmstrucksmsrusults/sendMeaage")
+    Map<String, Object> sendMeaage(@RequestParam String mobile,
+                                   @RequestParam String content);
+
 }
 
 

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

@@ -1126,7 +1126,13 @@
                RRA.ADDRESS_ID               "shipperAddressId",
                RRP.ADDRESS_DELIVERY_ADDRESS "place",
                RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
-               RRP.ADDRESS_DELIVERY_ADDRESS "adressAndPlace"
+               RRP.ADDRESS_DELIVERY_ADDRESS "adressAndPlace",
+               RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
+               RRP.ADDRESS_DELIVERY_ADDRESS "value",
+               RRA.ADDRESS_PROVINCE     "province",
+               RRA.ADDRESS_DISTRICT     "district",
+               RRA.ADDRESS_TOWN         "town",
+               RRP.ADDRESS_DELIVERY_ADDRESS "place"
         FROM RMS_RECEIVE_PLACE RRP
                  LEFT JOIN RMS_RECEIVE_ADDRESS RRA
                            ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
@@ -1246,7 +1252,10 @@
                DECODE(WGM.DELETED, 1, '已出库', '未出库') "gmStatus",
                OTO.ORDER_WAGON_NO "wagonNo",
                OTO.ORDER_ID     "trainOrderId",
-               RPG.INSERT_UPDATE_REMARK "remark"
+               RPG.INSERT_UPDATE_REMARK "remark",
+               RP.PERSONNEL_NAME    "personName",
+               RAS.ARRIVAL_NAME     "toTheStation",
+               RAS1.ARRIVAL_NAME    "sendStation"
         FROM WMSP_GRID_MATERIAL WGM
                  LEFT JOIN RMS_PWAREHOUSE_GRID RPG
                            ON RPG.GRID_ID = WGM.GRID_ID
@@ -1258,8 +1267,21 @@
                            ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
                  LEFT JOIN OMSTRAIN_ORDER OTO
                            ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
+                 LEFT JOIN RMS_PERSONNEL RP
+                           ON RP.PERSONNEL_SSO_ID = RPG.INSERT_USERNAME
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
+                           ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
+                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+                           ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS1
+                           ON RAS1.ARRIVAL_ID = TPAR.SEND_STATION_ID
         WHERE RPG.GRID_TYPE = 1
-          AND RPG.INSERT_USERNAME = #{userId}
           AND OO.ORDER_ID IS NOT NULL
         <if test="gmStatus != null and gmStatus != -1">
             AND WGM.DELETED = #{gmStatus}