luobang 1 年之前
父节点
当前提交
f06bd4aa3e

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

@@ -2020,6 +2020,7 @@
                     TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
                     ASM.MATERIAL_PLAN_NUMBER    "materialPlanNumber",
+                    ASO.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
                     (CASE
                         WHEN
                         ASOM.WARRANTY_NUMBER IS NULL

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

@@ -788,9 +788,12 @@
     LEFT JOIN RMS_CAPACITY_TYPE RCT
     ON RCT.CAPACITY_TYPE_ID=AIR.CAPACITY_TYPE_ID
     where TTTR.RESULT_TIME_TYPE = 3 AND TTTR.RESULT_VALUE IS NOT NULL
-    <if test="orderType!=null">
+    <if test="orderType!=null and orderType != 26">
       AND OO.ORDER_TYPE in (#{orderType},11)
     </if>
+    <if test="orderType!=null and orderType == 26">
+      AND OO.ORDER_TYPE = #{orderType}
+    </if>
     <if test="con!=null and con != ''">
       AND RC.CAPACITY_NUMBER || RM.MATERIAL_NAME ||  RS.SHIPPER_NAME LIKE CONCAT('%',CONCAT(#{con},'%'))
     </if>