浏览代码

修改销售汽运结算bug

luobang 2 年之前
父节点
当前提交
6774a9dd65
共有 1 个文件被更改,包括 50 次插入46 次删除
  1. 50 46
      src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

+ 50 - 46
src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

@@ -1933,52 +1933,56 @@
     </select>
     <select id="getSteelTruckDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT * FROM (SELECT DISTINCT
-                           bdo.INSERT_TIME AS "insertTime",
-                           bdo.DETAILS_ID AS "detailsId",
-                           oo.ORDER_ID AS "orderId",
-                           bdo.DETAILS_NO AS "detailsNo",
-                           oo.ORDER_NUMBER AS "orderNumber",
-                           bdo.DETAILS_TIME AS "detailsTime",
-                           rc.CAPACITY_NUMBER AS "capacityNumber",
-                           RC2.CARRIER_ABBREVIATION AS "carrierName",
-                           rs.SHIPPER_NAME AS "shipperName",
-                           rco.CONSIGNEE_COMPANY_NAME AS "companyName",
-                           actp.PRICE_VALUE AS "priceValue",
-                           bdo.DETAILS_AMOUNT AS "detailsAmount",
-                           RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "realAddress",
-                           twr.RESULT_NET_WEIGHT AS "resultNetWeight",
-                           twr.RESULT_GROSS_WEIGHT_TIME "preparationDate",
-                           RM.MATERIAL_NAME "materialName",
-                           RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "materialSpa",
-                           ASM.MATERIAL_NUMBER "materialNum",
-                           ASO.SALE_REMARK "saleRemark",
-                           ASM.MATERIAL_WEIGHT "theoryWeight",
-                           rsa.area_name "areaName",
-                           aso.sale_order_receive_customer "receiveMoneyCus",
-                           ASM.EAS_PRIMARY_ID	"easPrimaryId"
-                       FROM
-                           BMSTRUCK_DETAILS_ORDER bdo
-                               LEFT JOIN TMSTRUCK_WEIGHT_RESULT twr ON twr.WEIGHT_TASK_RESULT_ID = bdo.WEIGHT_TASK_RESULT_ID
-                               LEFT JOIN TMSTRUCK_TOTAL_RESULT ttl ON ttl.RESULT_TOTAL_ID = twr.RESULT_TOTAL_ID
-                               LEFT JOIN TMSTRUCK_LOAD_RESULT tlr ON tlr.RESULT_TOTAL_ID = ttl.RESULT_TOTAL_ID
-                               LEFT JOIN OMSTRUCK_ORDER oo ON oo.ORDER_ID = ttl.ORDER_ID
-                               LEFT JOIN AMS_SALE_ORDER_MATERIAL asom ON oo.ORDER_PLAN_ID = asom.SALE_ORDER_MATERIAL_ID
-                               LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO ON ADSO.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
-                               LEFT JOIN RMS_CARRIER RC2 ON RC2.CARRIER_ID = ADSO.CARRIER_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 rco ON rco.CONSIGNEE_ID = aso.RECEIVE_ID
-                               LEFT JOIN RMS_CAPACITY rc ON oo.CAPACITY_ID = rc.CAPACITY_ID
-                               LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp ON actp.PRICE_ID = bdo.PRICE_ID
-                               LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
-                               LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
-                               LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = TWR.MATERIAL_ID
-                               LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-                               AND ASM.MATERIAL_ID = RM.MATERIAL_ID
-                               LEFT JOIN RMS_SALE_AREA RSA ON RSA.AREA_ID = RCO.AREA_ID
-                       WHERE
-                           oo.ORDER_TYPE = 1
-                         AND bdo.WETHER_TO_STATEMENT = 0
+                        bdo.INSERT_TIME AS "insertTime",
+                        bdo.DETAILS_ID AS "detailsId",
+                        oo.ORDER_ID AS "orderId",
+                        bdo.DETAILS_NO AS "detailsNo",
+                        oo.ORDER_NUMBER AS "orderNumber",
+                        bdo.DETAILS_TIME AS "detailsTime",
+                        rc.CAPACITY_NUMBER AS "capacityNumber",
+                        RC2.CARRIER_ABBREVIATION AS "carrierName",
+                        rs.SHIPPER_NAME AS "shipperName",
+                        rco.CONSIGNEE_COMPANY_NAME AS "companyName",
+                        actp.PRICE_VALUE AS "priceValue",
+                        bdo.DETAILS_AMOUNT AS "detailsAmount",
+                        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "realAddress",
+                        twr.RESULT_NET_WEIGHT AS "resultNetWeight",
+                        twr.RESULT_GROSS_WEIGHT_TIME "preparationDate",
+                        RM.MATERIAL_NAME "materialName",
+                        RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' "materialSpa",
+                        ASM.MATERIAL_NUMBER "materialNum",
+                        ASO.SALE_REMARK "saleRemark",
+                        ASM.MATERIAL_WEIGHT "theoryWeight",
+                        rsa.area_name "areaName",
+                        aso.sale_order_receive_customer "receiveMoneyCus",
+                        ASM.EAS_PRIMARY_ID "easPrimaryId" ,
+                        ASO.SALE_ORDER_ID
+                        FROM
+                        BMSTRUCK_DETAILS_ORDER bdo
+                        JOIN TMSTRUCK_WEIGHT_RESULT twr ON twr.WEIGHT_TASK_RESULT_ID = bdo.WEIGHT_TASK_RESULT_ID
+                        JOIN TMSTRUCK_TOTAL_RESULT ttl ON ttl.RESULT_TOTAL_ID = twr.RESULT_TOTAL_ID
+                        JOIN TMSTRUCK_LOAD_RESULT tlr ON tlr.RESULT_TOTAL_ID = ttl.RESULT_TOTAL_ID
+                        AND TWR.MATERIAL_ID = TLR.MATERIAL_ID
+                        JOIN OMSTRUCK_ORDER oo ON oo.ORDER_ID = ttl.ORDER_ID
+                        JOIN AMS_SALE_ORDER_MATERIAL asom ON oo.ORDER_PLAN_ID = asom.SALE_ORDER_MATERIAL_ID
+                        JOIN AMS_DISPATCH_SALE_ORDER ADSO ON ADSO.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
+                        JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                        JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID AND ASM.MATERIAL_ID = TWR.MATERIAL_ID
+                        JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                        AND ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                        JOIN RMS_CARRIER RC2 ON RC2.CARRIER_ID = ADSO.CARRIER_ID
+                        JOIN RMS_SHIPPER rs ON rs.SHIPPER_ID = aso.SHIPPER_ID
+                        JOIN RMS_CONSIGNEE rco ON rco.CONSIGNEE_ID = aso.RECEIVE_ID
+                        JOIN RMS_CAPACITY rc ON oo.CAPACITY_ID = rc.CAPACITY_ID
+                        JOIN AMS_CONTRACT_TRANSPORT_PRICE actp ON actp.PRICE_ID = bdo.PRICE_ID
+                        JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
+                        JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+                        JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+                        JOIN RMS_SALE_AREA RSA ON RSA.AREA_ID = RCO.AREA_ID
+                        WHERE
+                        oo.ORDER_TYPE = 1
+                        AND bdo.WETHER_TO_STATEMENT = 0
+                        order by oo.order_id desc
                          <if test="carrierId != null">
                              and RC2.CARRIER_ID = #{carrierId}
                          </if>