提交代码

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

@@ -59,6 +59,11 @@ public interface QmsQueueListMapper extends IBaseMapper<QmsQueueList, BigDecimal
 
     Integer getListSequenceNumber(Map<String, Object> map);
 
+    //未扎/已轧
+    Map<String, Object> getSteelOrderMessageToApp(Integer orderId);
+
+    Integer getOrderId(String resultTotalId);
+
     Integer getSpellingSequenceNumber(Map<String, Object> map);
 
     Integer getListGridNumber(Map<String, Object> map);

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

@@ -187,7 +187,16 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
             }else {
                 num = qmsQueueListMapper.getSpellingSequenceNumber(map); //当前多拼队列排队人数
             }
-            map.put("orderSeqNum", num);
+            //获取是否已审批或者未轧/已轧
+            try{
+                //根据实绩主键去查询出运单主键
+                Integer orderId = qmsQueueListMapper.getOrderId(resultTotalId);
+                Map<String, Object> steelOrderMessageToApp = qmsQueueListMapper.getSteelOrderMessageToApp(orderId);
+                String capacityMessage = (String) steelOrderMessageToApp.get("capacityMessage");
+                map.put("orderSeqNum", num+capacityMessage);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
             map.put("status", 2);
         }else {
             //还未排队

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

@@ -654,6 +654,62 @@
     )
   </select>
 
+  <select id="getSteelOrderMessageToApp" resultType="map">
+    SELECT
+    OO.ORDER_ID "orderId",
+    OO.ORDER_TYPE "orderType",
+    OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+    OO.ORDER_NUMBER "orderNumber",
+    CASE
+    WHEN TEMP."orderId" IS NOT NULL
+    THEN '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':未轧' ||'）'
+    WHEN TEMP."orderId" IS NULL
+    THEN '（'|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || '）'
+    END
+    "capacityMessage",
+    RC.CAPACITY_TEL "capacityTel",
+    RS.SHIPPER_NAME "shipperName",
+    ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+    ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+    RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
+    CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
+    TTR.RESULT_TOTAL_ID "resultTotalId",
+    OO.CAN_WORK "canWork",
+    OO.ORDER_STATUS "orderStatus",
+    ASO.SALE_ORDER_ID   "saleOrderId",
+    OO.DELETED  "orderDeleted"
+    FROM
+    OMSTRUCK_ORDER OO
+    LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+    LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+    LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+    LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+    LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+    LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+    LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+    LEFT JOIN (
+    select OO.ORDER_ID "orderId"
+    from OMSTRUCK_ORDER OO
+    left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
+    left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
+    where OO.ORDER_STATUS in (4,5)
+    and
+    RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+    ) TEMP ON TEMP."orderId"=OO.ORDER_ID
+    WHERE
+    OO.ORDER_ID = #{orderId}
+    AND ASO.DELETED = 0
+    AND rownum =1
+  </select>
+
+  <select id="getOrderId" resultType="java.lang.Integer">
+     select OO.ORDER_ID from TMSTRUCK_TOTAL_RESULT TTR
+     LEFT JOIN OMSTRUCK_ORDER OO
+     ON OO.ORDER_ID=TTR.ORDER_ID
+     where TTR.RESULT_TOTAL_ID=#{resultTotalId}
+  </select>
+
   <select id="getSpellingSequenceNumber" parameterType="map" resultType="int">
     select COUNT(QQSL.SPELLING_RESULT_ID)
     from QMS_QUEUE_SPELLING_LIST QQSL