tijaio

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

@@ -42,4 +42,10 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     BigDecimal getOldCapacityId(BigDecimal orderId);
 
+    int deleteSpellingList(Object listId);
+
+    int deleteQueueList(Object listId);
+
+    Map<String, Object> getSteelIsSpelling(BigDecimal orderId);
+
 }

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

@@ -1721,6 +1721,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         }
         if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
             //这是修改车牌号
+            //将排队信息删掉
+            Map<String, Object> isSpellingMap = omstruckOrderMapper.getSteelIsSpelling(DataChange.dataToBigDecimal(mapValue.get("orderId")));
+            int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
+            if(isSpelling == 1){
+                result += omstruckOrderMapper.deleteSpellingList(isSpellingMap.get("listId"));
+            }else{
+                result += omstruckOrderMapper.deleteQueueList(isSpellingMap.get("listId"));
+            }
             result += amsSaleOrderMapper.updateCapacityNumberInFactory(mapValue);
             //若是接单之后还需要删除实绩且将状态变为4
             //查询运输订单的状态和总实绩ID

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

@@ -1004,13 +1004,15 @@
         <include refid="whereLikeForeach"/>
         <include refid="orderBy"></include>
   </select>
-    <select id="selectInwardPrice" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+    <select id="selectInwardPrice" resultType="java.util.LinkedHashMap" parameterType="java.util.LinkedHashMap">
       select * from (select
       distinct
-      actp.price_id "priceId", actp.price_value "priceValue" ,actp.PRICE_DATE "priceDate"
+      actp.price_id "priceId", actp.price_value "priceValue" ,rop.PRICE_DATE "priceDate"
       from ams_contract_transport_price actp
       left join ams_contaact_price_material acpm
       on acpm.price_id = actp.price_id
+      left join RMS_OIL_PRICE ROP
+      on rop.PRICE_OIL_TYPE_ID = actp.OIL_TYPE_ID
       left join rms_trans_range rtr
       on rtr.trans_range_id = actp.line_id
       where type = #{type}

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

@@ -868,6 +868,12 @@
         SELECT OO.CAPACITY_ID FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getSteelIsSpelling" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        select LIST_ID  "listId",
+               IS_SPELLING "isSpelling",
+               RESULT_ID    "resultId"
+        from QMS_QUEUE_RESULT where RESULT_TOTAL_ID = (select ttr.RESULT_TOTAL_ID from TMSTRUCK_TOTAL_RESULT ttr where ttr.ORDER_ID = #{orderId})
+    </select>
 
     <delete id="deleteWeightResult" parameterType="java.math.BigDecimal">
         delete from TMSTRUCK_WEIGHT_RESULT
@@ -890,4 +896,12 @@
         delete from TMSTRUCK_ENFACTORY_RESULT
         where RESULT_TOTAL_ID = #{resultTotalId}
     </delete>
+    <delete id="deleteSpellingList" >
+        delete from QMS_QUEUE_SPELLING_LIST QQSL
+        where QQSL.SPELLING_RESULT_ID = #{listId}
+    </delete>
+    <delete id="deleteQueueList" >
+        delete from QMS_QUEUE_LIST QQL
+        where qql.LIST_ID = #{listId}
+    </delete>
 </mapper>