Merge remote-tracking branch 'origin/master'

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")
@@ -760,4 +761,28 @@ public class BMSController extends BaseRESTfulController {
         }
         return bmstruckFeign.getSteelTruckDetailsOrder(map,pageNum,pageSize,apiId,orderType,carrierSsoId,startTime,endTime,con);
     }
+
+    @PostMapping("/getShipFeeStatement")
+    public Map<String,Object> getShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.getShipFeeStatement(map);
+    }
+
+    @PostMapping("/addShipFeeStatement")
+    public Map<String,Object> addShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.addShipFeeStatement(map);
+    }
+
+    @PostMapping("/editShipFeeStatement")
+    public Map<String,Object> editShipFeeStatement(@RequestBody(required = false) Map<String,Object> map){
+        if(map == null){
+            map = new HashMap<>();
+        }
+        return bmsshipFeign.editShipFeeStatement(map);
+    }
 }

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

@@ -700,6 +700,33 @@ public class TMSController extends BaseRESTfulController {
         return tmsshipFeign.selectAllShipDynamaics(map,con);
     }
 
+    //万州港装车数据
+    @PostMapping("/getLoadData")
+    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getLoadData(map);
+    }
+
+    //万州港卸船数据
+    @PostMapping("/getUnloadData")
+    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getUnloadData(map);
+    }
+
+    //下游港口船舶动态表
+    @PostMapping("/getDownShipDynamaics")
+    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map){
+        if (map==null){
+            map=new HashMap<>();
+        }
+        return tmsshipFeign.getDownShipDynamaics(map);
+    }
+
     /**
      * 下拉框
      *
@@ -2544,6 +2571,13 @@ 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);
+    }
+
     /**
      * 修改三程船装船作业明细
      * @param
@@ -2556,4 +2590,49 @@ public class TMSController extends BaseRESTfulController {
         }
         return tmsshipFeign.updateThreeSectionDetails(mapVal);
     }
+
+    @PostMapping("/addPleaseResult")
+    public Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.addPleaseResult(mapVal);
+    }
+
+    @PostMapping("/editPleaseResult")
+    public Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.editPleaseResult(mapVal);
+    }
+
+    @PostMapping("/getAllPleaseResult")
+    public Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam Integer apiId,
+                                                  String con,
+                                                  String startTime,
+                                                  String endTime){
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return tmsshipFeign.getAllPleaseResult(mapVal,pageNum,pageSize,apiId,con,startTime,endTime);
+    }
+
+    @PostMapping("/getPleaseResult/{resultId}")
+    public Map<String,Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId){
+        return tmsshipFeign.getPleaseResult(resultId);
+    }
+
+    @PostMapping("/getRealNumber")
+    public Map<String,Object> getRealNumber(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.getRealNumber(map);
+    }
+
+    @PostMapping("/getWagonWork")
+    public Map<String,Object> getWagonWork(@RequestBody(required = false) Map<String, Object> map){
+        return tmsshipFeign.getWagonWork(map);
+    }
 }

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

@@ -280,6 +280,13 @@ public class UniversalController extends BaseRESTfulController {
         return success(list);
     }
 
+    @ApiModelProperty(value = "历史收货单位")
+    @PostMapping("/getConsigneeHistory")
+    public RESTfulResult getConsigneeHistory() {
+        List<Map<String, Object>> list = universalMapper.getConsigneeHistory();
+        return success(list);
+    }
+
 
     @ApiModelProperty(value = "通过订单ID查询订单下物资信息")
     @PostMapping("/getOrderMaterialMesByOrderId/{orderId}")

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

@@ -949,8 +949,11 @@ public class WMSController extends BaseRESTfulController {
                                              @RequestParam(value = "materialCode") String materialCode,
                                              @RequestParam(value = "materialSpecification") String materialSpecification,
                                              @RequestParam(value = "materialModel") String materialModel,
-                                             @RequestParam(value = "quantity") Integer quantity) {
-        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity);
+                                             @RequestParam(value = "quantity") Integer quantity,
+                                             @RequestParam String actuallyWeight,
+                                             @RequestParam String materialTheWeight,
+                                             @RequestParam(value = "remark") String remark) {
+        return wmsFeign.insertReserved(warehouseId,materialCode,materialSpecification,materialModel,quantity,actuallyWeight,materialTheWeight,remark);
     }
     //修改预留转入库作业,针对预留
     @PostMapping(value = "/insertInbounds")
@@ -1053,5 +1056,38 @@ public class WMSController extends BaseRESTfulController {
     public Map<String,Object> afterInwardOutbound(@RequestBody Map<String,Object> map){
         return wmsFeign.afterInwardOutbound(map);
     }
+
+    @ApiOperation("获取理重信息")
+    @PostMapping("getTheoreticalByInfo")
+    public Map<String,Object> getTheoreticalByInfo(@RequestParam String warehouseId,
+                                                   @RequestParam String  materialCode,
+                                                   @RequestParam String materialSpecification,
+                                                   @RequestParam String materialModel,
+                                                   @RequestParam Integer status,
+                                                   @RequestParam Integer num){
+        return wmsFeign.getTheoreticalByInfo(warehouseId,materialCode,materialSpecification,materialModel,status,num);
+    }
+
+    @ApiOperation("获取上传金蝶信息")
+    @PostMapping("getInboundEasInfo")
+    public Map<String,Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer warehouseId,
+                                                String startTime,
+                                                String endTime){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        return wmsFeign.getInboundEasInfo(mapValue,apiId,pageNum,pageSize,warehouseId,startTime,endTime);
+    }
+
+    @ApiOperation("撤销上传金蝶")
+    @PostMapping("reduceInboundEas")
+    public Map<String,Object> reduceInboundEas(Integer inboundEasId){
+        return wmsFeign.reduceInboundEas(inboundEasId);
+    }
+
 }
 

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

@@ -74,11 +74,14 @@ public class WMSHController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  String con) {
+                                                  String con,
+                                            String activeName,
+                                            String startTime,
+                                            String endTime) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con);
+        return wmshFeign.getUnLockPortStock(mapValue, pageNum, pageSize, apiId,con,activeName,startTime,endTime);
     }
 
 

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

@@ -313,4 +313,13 @@ public interface BmsshipFeign {
                                                 @RequestParam("pageSize")Integer pageSize,
                                                 @RequestParam("apiId") Integer apiId,
                                                 @RequestParam("batchId") BigDecimal batchId);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/getShipFeeStatement")
+    Map<String, Object> getShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/addShipFeeStatement")
+    Map<String, Object> addShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/bmsship/bmsporthandlingfee/editShipFeeStatement")
+    Map<String, Object> editShipFeeStatement(@RequestBody(required = false) Map<String, Object> map);
 }

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/java/com/steerinfo/dil/feign/TmsshipFeign.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -590,6 +591,18 @@ public interface TmsshipFeign {
     Map<String, Object> selectAllShipDynamaics(@RequestBody(required = false) Map<String,Object> map,
                                                @RequestParam("con") String con);
 
+    //万州港装车数据
+    @PostMapping("api/v1/shipTms/shipdynamics/getLoadData")
+    Map<String, Object> getLoadData(@RequestBody(required = false) Map<String,Object> map);
+
+    //万州港卸船数据
+    @PostMapping("api/v1/shipTms/shipdynamics/getUnloadData")
+    Map<String, Object> getUnloadData(@RequestBody(required = false) Map<String,Object> map);
+
+    //游港口船舶动态表
+    @PostMapping("api/v1/shipTms/shipdynamics/getDownShipDynamaics")
+    Map<String, Object> getDownShipDynamaics(@RequestBody(required = false) Map<String,Object> map);
+
     /**
      * 展示货权转移
      *
@@ -814,4 +827,29 @@ public interface TmsshipFeign {
 
     @PostMapping(value =  "api/v1/shipTms/dilbatchs/getNoticeContactNumberByPerson")
     Map<String, Object> getNoticeContactNumberByPerson(@RequestParam("personName") String personName);
+
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/addPleaseResult")
+    Map<String,Object> addPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/editPleaseResult")
+    Map<String,Object> editPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    @PostMapping("/api/v1/shipTms/tmsshiptotalresults/getAllPleaseResult")
+    Map<String,Object> getAllPleaseResult(@RequestBody(required = false) Map<String, Object> mapVal,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam String con,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getPleaseResult/{resultId}")
+    Map<String, Object> getPleaseResult(@PathVariable("resultId") BigDecimal resultId);
+
+    @PostMapping(value = "/api/v1/shipTms/tmsshiptotalresults/getRealNumber")
+    Map<String, Object> getRealNumber(Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/shipTms/shipdynamics/getWagonWork")
+    Map<String, Object> getWagonWork(Map<String, Object> map);
 }

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

@@ -821,10 +821,13 @@ public interface WMSFeign {
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/insertReserved")
     Map<String,Object> insertReserved(@RequestParam(value = "warehouseId") String warehouseId,
-                                         @RequestParam(value = "materialCode") String materialCode,
-                                         @RequestParam(value = "materialSpecification") String materialSpecification,
-                                         @RequestParam(value = "materialModel") String materialModel,
-                                         @RequestParam(value = "quantity") Integer quantity);
+                                      @RequestParam(value = "materialCode") String materialCode,
+                                      @RequestParam(value = "materialSpecification") String materialSpecification,
+                                      @RequestParam(value = "materialModel") String materialModel,
+                                      @RequestParam(value = "quantity") Integer quantity,
+                                      @RequestParam(value = "actuallyWeight") String actuallyWeight,
+                                      @RequestParam(value = "materialTheWeight") String materialTheWeight,
+                                      @RequestParam(value = "remark") String remark);
 
     @PostMapping("/api/v1/wms/wmspgridmaterials/insertInbounds")
     Map<String,Object> insertInbounds(@RequestParam(value = "warehouseId") String warehouseId,
@@ -892,4 +895,24 @@ public interface WMSFeign {
     @PostMapping("/api/v1/wms/platformWarehouse/afterInwardOutbound")
     Map<String, Object> afterInwardOutbound(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("/api/v1/wms/wmspgridmaterials/getTheoreticalByInfo")
+    Map<String, Object> getTheoreticalByInfo(@RequestParam String warehouseId,
+                                             @RequestParam String materialCode,
+                                             @RequestParam String materialSpecification,
+                                             @RequestParam String materialModel,
+                                             @RequestParam Integer status,
+                                             @RequestParam Integer num);
+
+    @PostMapping("/api/v1/wms/inboundEas/getInboundEasInfo")
+    Map<String, Object> getInboundEasInfo(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer apiId,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer warehouseId,
+                                          @RequestParam String startTime,
+                                          @RequestParam String endTime);
+
+    @PostMapping("/api/v1/wms/inboundEas/reduceInboundEas")
+    Map<String, Object> reduceInboundEas(@RequestParam Integer inboundEasId);
+
 }

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

@@ -140,7 +140,10 @@ public interface WMSHFeign {
                                           @RequestParam("pageNum") Integer pageNum,
                                           @RequestParam("pageSize") Integer pageSize,
                                           @RequestParam("apiId") Integer apiId,
-                                          @RequestParam("con") String con);
+                                          @RequestParam("con") String con ,
+                                     @RequestParam("activeName")String activeName,
+                                     @RequestParam("startTime")String startTime,
+                                     @RequestParam("endTime")String endTime);
 
     @PostMapping(value = "/api/v1/wmsh/wmshgridmaterials/selectLoadResult")
     Map<String,Object> selectLoadResult(@RequestBody(required = false) Map<String, Object> mapValue,

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -63,6 +63,8 @@ public interface UniversalMapper {
     // 收货单位
     List<Map<String, Object>> queryConsigneeByLike(Map<String, Object> mapValue);
 
+    List<Map<String, Object>> getConsigneeHistory();
+
     // 所有物资
     List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
 

src/main/resources/application-prod.yml

@@ -29,7 +29,7 @@ openfeign:
   WMSHFeign:
     url: ${WMSHFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:172.16.33.166:8095}
   OMSFeign:
     url: ${OMSFEIGN_URL:172.16.33.166:8095}
   RmsFeign:

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

@@ -534,6 +534,17 @@
         </where>
     </select>
 
+    <select id="getConsigneeHistory" resultType="java.util.Map">
+        SELECT distinct
+        RC.CONSIGNEE_ID "consigneeId",
+        RC.CONSIGNEE_COMPANY_NAME "value",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        FROM  AMS_SALE_ORDER ASO
+        LEFT JOIN RMS_CONSIGNEE RC
+        ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        WHERE ASO.SALE_TYPE=4 and RC.CONSIGNEE_COMPANY_NAME is not null
+    </select>
+
 <!--  通过订单ID查询订单下所有物资  -->
     <select id="getOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select RM.MATERIAL_NAME     "materialName",
@@ -1126,7 +1137,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
@@ -1239,14 +1256,18 @@
     </select>
 
     <select id="getInwardInboundResult" resultType="java.util.Map" parameterType="java.util.Map">
-        SELECT RC.CAPACITY_NUMBER "capacityNumber",
+        SELECT DISTINCT
+               RC.CAPACITY_NUMBER "capacityNumber",
                OO.ORDER_NUMBER "orderNumber",
                OO.ORDER_ID "orderId",
                RPG.INSERT_TIME "insertTime",
                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 +1279,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}