txf пре 3 година
родитељ
комит
95fc9aa6b9

+ 14 - 9
src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -679,24 +679,29 @@
 
     <!--  通过运输订单号 查询实绩Id、总实绩ID -->
     <select id="selectTotalIdByOrderNo" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+
         select OO.ORDER_ID "orderId",
-                OO.ORDER_TYPE "orderTypee",
-                TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-                TTR.RESULT_TOTAL_ID "resultTotalId",
-                RC.CAPACITY_NUMBER  "capacityNumber",
-                TWR.TARE_SEGMENT_SQE "tareSegmentSqe",
-                TWR.GROSS_SEGMENT_SQE "grossSegmentSqe"
+        OO.ORDER_TYPE "orderTypee",
+        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        TWR.TARE_SEGMENT_SQE "tareSegmentSqe",
+        TWR.GROSS_SEGMENT_SQE "grossSegmentSqe"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
-            on OO.ORDER_ID = TTR.ORDER_ID
+        on OO.ORDER_ID = TTR.ORDER_ID
         left join TMSTRUCK_WEIGHT_RESULT TWR
-            on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_CAPACITY RC
-            on RC.CAPACITY_ID = OO.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
         <if test="materialId != null">
             and TWR.MATERIAL_ID = #{materialId}
         </if>
+            )
+        where rownum = 1
     </select>
 
     <!--  通过汽车衡编号查询对应的汽车衡ID  -->

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/UtilsMapper.xml

@@ -145,6 +145,6 @@
             on TTR.ORDER_ID = OO.ORDER_ID
         left join TMSTRUCK_RECEIPT_RESULT TRR
             on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
+        where OO.ORDER_NUMBER = #{orderNumber} and TRR.status = 1
     </select>
 </mapper>