Merge remote-tracking branch 'origin/master'

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

@@ -14,7 +14,9 @@
         update OMSTRUCK_ORDER set TRIP_ID = #{rid} where ORDER_NUMBER = #{orderNumber}
   </update>
     <update id="orderClose">
-        update OMSTRUCK_ORDER set ORDER_STATUS = '2' where ORDER_NUMBER = #{orderNumber}
+        update OMSTRUCK_ORDER set ORDER_STATUS = '2',
+                                   INSERT_UPDATE_REMARK = 'tmsoffsiteXml将状态变为已完成,18行'
+        where ORDER_NUMBER = #{orderNumber}
     </update>
     
     <select id="getInTransitTransportation" resultType="java.util.Map">

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

@@ -2108,8 +2108,11 @@
                               ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                     LEFT JOIN TMSTRUCK_SMS_RUSULT TSR
                               ON TSR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
-                    WHERE ASO.SALE_TYPE = 1
-                          and ASM.SALE_MATERIAL_ID IS NOT NULL
+                    WHERE
+                    ASM.SALE_MATERIAL_ID IS NOT NULL
+                    and (aso.DELETED = 1 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED != 1 and aso.SALE_ORDER_STATUS between 0 and 4)
+
+                    and ASO.SALE_TYPE = 1
                     <if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
                     </if>
@@ -2393,7 +2396,7 @@
         LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
         ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
         WHERE ASO.SALE_TYPE = 1
-        AND ASO.DELETED = 0
+        and (aso.DELETED = 1 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED != 1 and aso.SALE_ORDER_STATUS between 0 and 4)
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         and (BDO.WETHER_TO_STATEMENT IS NULL or BDO.WETHER_TO_STATEMENT != 1)
         <if test="oneDate != null">
@@ -2666,7 +2669,7 @@
         LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
         ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
         WHERE ASO.SALE_TYPE = 1
-        AND ASO.DELETED = 0
+        and (aso.DELETED = 1 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED != 1 and aso.SALE_ORDER_STATUS between 0 and 4)
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         and BDO.WETHER_TO_STATEMENT = 1
         <if test="oneDate != null">

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

@@ -2883,7 +2883,8 @@
     </update>
     <update id="updateOrderStatus">
         update OMSTRUCK_ORDER
-        SET ORDER_STATUS=#{orderStatus}
+        SET ORDER_STATUS=#{orderStatus},
+            INSERT_UPDATE_REMARK = '继续装修改运单状态,twrxml2880行'
         where ORDER_ID=#{orderId}
     </update>
 </mapper>

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

@@ -19,7 +19,8 @@
 <!--  通过订单Id 或运输订单号 修改 订单状态  -->
     <update id="updateOrderStatusByOrderIdOrNum" parameterType="java.util.Map">
         update OMSTRUCK_ORDER OO
-        set OO.ORDER_STATUS = #{orderStatus}
+        set OO.ORDER_STATUS = #{orderStatus},
+            OO.INSERT_UPDATE_REMARK = '出厂或其他环节关闭运单'
         <where>
             <if test="orderId != null">
                 OO.ORDER_ID = #{orderId}