tijiao

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

@@ -43,8 +43,24 @@ public class OmstrainOrderController extends BaseRESTfulController {
     @PostMapping("getWagonShippingDetails")
     public RESTfulResult getWagonShippingDetails(@RequestBody(required = false) Map<String,Object> map,
                                                  String startTime,
-                                                 String endTime){
+                                                 String endTime,
+                                                 String sendStation,
+                                                 String toTheStation,
+                                                 String consigneeName,
+                                                 String wagonNo){
         DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        if(sendStation != null && !"null".equals(sendStation)){
+            map.put("sendStation",sendStation);
+        }
+        if(toTheStation != null && !"null".equals(toTheStation)){
+            map.put("toTheStation",toTheStation);
+        }
+        if(consigneeName != null && !"null".equals(consigneeName)){
+            map.put("consigneeName",consigneeName);
+        }
+        if(wagonNo != null && !"null".equals(wagonNo)){
+            map.put("wagonNo",wagonNo);
+        }
         List<Map<String,Object>> mapList = omstrainOrderService.getWagonShippingDetails(map);
         return success(mapList);
     }

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -1987,7 +1987,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             BigDecimal orderLineSequence = DataChange.dataToBigDecimal(seqMap.get("orderLineSequence"));
             BigDecimal maxSegmentSqe = DataChange.dataToBigDecimal(seqMap.get("segmentSqe"));
             int i = maxSegmentSqe.intValue() - orderLineSequence.intValue();
-            if( i != 1 || i != 2){
+            if( i != 1 && i != 2){
                 return 0;
             }
         }

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

@@ -564,7 +564,8 @@
                                    R_CAPACITY.CAPACITY_NUMBER                       "capacityNum",
                                    RW.WAREHOUSE_NAME                                "unloadPoint",
                                    RAR1.RAILWAY_BUREAU                              "railwayBureau",
-                                   OTO.STRAWMATS                                    "strawMats"
+                                   OTO.STRAWMATS                                    "strawMats",
+                                   TWR.RESULT_POUND_NO                              "number"
                    FROM AMS_SALE_ORDER ASO
                           LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                           LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
@@ -597,6 +598,18 @@
                             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <=  ASO.INSERT_TIME
                             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASO.INSERT_TIME
                           </if>
+                          <if test="wagonNo != null">
+                            and OTO.ORDER_WAGON_NO like #{wagonNo}
+                          </if>
+                          <if test="consigneeName != null">
+                            and RC.CONSIGNEE_COMPANY_NAME like #{consigneeName}
+                          </if>
+                          <if test="toTheStation != null">
+                            and RAR1.ARRIVAL_NAME like #{toTheStation}
+                          </if>
+                          <if test="sendStation != null">
+                            and RAR.ARRIVAL_NAME  like #{sendStation}
+                          </if>
                           )
   </select>