修改订单排序

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

@@ -1908,7 +1908,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public Map<String, Object> getMessageToApp(Map<String, Object> map){
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         Integer orderType;
-        String inwardType="";
         //获取订单类型
         if(map.get("orderType") == null){
             orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(orderId);
@@ -1949,13 +1948,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 11:
                 mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
-                inwardType += "计重";
-                mesMap.put("inwardType", inwardType);
+                mesMap.put("inwardType", "计重");
                 break;
             case 21:
                 mesMap = omstruckOrderMapper.getInwardTimeOrderMessageToApp(map);
-                inwardType += "计时";
-                mesMap.put("inwardType", inwardType);
+                mesMap.put("inwardType", "计时");
                 break;
             case 12:
             case 13:

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

@@ -698,6 +698,7 @@
                 OO.ORDER_ID "orderId",
                 APO.PURCHASE_ORDER_ID "purchaseOrderId",
                 APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+                APO.IS_MORE_TRIPS   "isMoreTrips",
                 RM.MATERIAL_NAME "materialName",
             <if test="orderTypee == 8">
                 AP.PLAN_NO "planNo",
@@ -2581,13 +2582,15 @@
 
     <!-- 物资信息 -->
     <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
-        SELECT RM.MATERIAL_NAME  "materialName",OOM.MATERIAL_PRIORITY "materialPriority",
+        SELECT RM.MATERIAL_NAME  "materialName",
+               RM.MATERIAL_ID   "materialId",
+               OOM.MATERIAL_PRIORITY "materialPriority",
                CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
                (case
-                    when OOM.ORDER_MATERIAL_WEIGHT is not null
-                        then OOM.ORDER_MATERIAL_WEIGHT  || '吨'
                     when OOM.ORDER_MATERIAL_NUMBER is not null
                         then OOM.ORDER_MATERIAL_NUMBER || '件'
+                    when OOM.ORDER_MATERIAL_WEIGHT is not null
+                        then OOM.ORDER_MATERIAL_WEIGHT  || '吨'
                    end
                    )
                    AS                                                                   "weightNum",
@@ -2602,7 +2605,7 @@
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = OOM.MATERIAL_ID
         WHERE ORDER_ID = #{orderId}
-        ORDER BY OOM.MATERIAL_PRIORITY
+        ORDER BY RM.MATERIAL_NAME
     </select>
 
     <!-- 内转原料司机接单 -->
@@ -3237,8 +3240,8 @@
                AIR.REQUIREMENT_ID     "requirementId",
                AIR.DUE_DATE             "saleDateOfReceipt",
                AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
-               RW1.WAREHOUSE_NAME       "loadName",
-               RW.WAREHOUSE_NAME        "unloadName"
+               RW1.WAREHOUSE_NAME       "shipperName",
+               RW.WAREHOUSE_NAME        "consigneeCompanyName"
               FROM OMSTRUCK_ORDER OO
               LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
               ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -3342,8 +3345,8 @@
         AIR.REQUIREMENT_ID     "requirementId",
         AIR.DUE_DATE             "saleDateOfReceipt",
         AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
-        RW1.WAREHOUSE_NAME       "loadName",
-        RW.WAREHOUSE_NAME        "unloadName",
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName",
         (
         SELECT TTTR2.RESULT_TIME
         FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
@@ -3421,7 +3424,7 @@
                     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
                     WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
                       AND TTTR2.RESULT_TIME_TYPE = 7
-                ) "pauseTime",
+                ) "pauseTime"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         ON OO.ORDER_ID=TTR.ORDER_ID

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

@@ -434,15 +434,19 @@
 
 <!--    查询当前车辆之前所有已完成的订单  -->
     <select id="getCapacityAllOrder" parameterType="string" resultType="java.util.Map">
-        select OO.ORDER_ID     "orderId",
-               OO.ORDER_NUMBER "orderNumber"
-
-        from OMSTRUCK_ORDER OO
-                 left join RMS_CAPACITY RC
-                           on RC.CAPACITY_ID = OO.CAPACITY_ID
-        where CAPACITY_NUMBER = #{capacityNumber}
-                and OO.ORDER_STATUS = 2
-        order by OO.ORDER_ID desc
+        select *
+        from (
+                 select OO.ORDER_ID     "orderId",
+                        OO.ORDER_NUMBER "orderNumber"
+
+                 from OMSTRUCK_ORDER OO
+                          left join RMS_CAPACITY RC
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 where CAPACITY_NUMBER = #{capacityNumber}
+                   and OO.ORDER_STATUS = 2
+                 order by OO.ORDER_RECEIVE_REFUSE_TIME desc
+             )
+        where rownum &lt;= 51
     </select>
 
 <!--  查询订单发货日期 （订单类型为2） -->