'出厂bug'

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

@@ -595,118 +595,123 @@
     <!--销售物流查询所有的出厂实绩-->
     <select id="selectAllLeaveFacatoryForSale" resultType="java.util.Map">
         SELECT
-            *
+        *
         FROM
-            (
-                SELECT
-                    -- 出厂时间
-                    TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
-                    --出厂抓拍图片
-                    TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture",
-                    -- 	出厂方式
-                    TLFR.RESULT_OUT_MODE "resultOutMode",
-                    -- 	门岗名称
-                    RG.GATEPOST_NAME "gatepostName",
-                    -- 运输订单号
-                    OO.ORDER_NUMBER "orderNumber",
-                    -- 车牌号
-                    RC.CAPACITY_NUMBER "capacityNumber",
-                    -- 运输订单id
-                    OO.ORDER_ID "orderId",
-                    -- 根据订单类型查询销售订单号/发运计划号
-                    ( CASE
-                        -- 	运输订单类型等于1的查询销售订单表
-                        WHEN OO.ORDER_TYPE = 1
-                            THEN (
-                                SELECT
-                                    -- 销售订单号
-                                    ASO.SALE_NUMBER
-                                FROM
-                                    -- 销售订单
-                                    AMS_SALE_ORDER ASO
-                                WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                            )
-                        -- 	运输订单类型等于2，3的查询发运计划表
-                        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-                            THEN(
-                                SELECT
-                                    -- 发运计划号
-                                    ARD.DAYPLAN_NO
-                                    -- 发运计划
-                                    FROM AMSTRUCK_RAIL_DAYPLAN ARD
-                                WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-                            )
-                    END) "saleNum",
-                    --根据订单类型查询发货单位
-                    (CASE
-                        WHEN OO.ORDER_TYPE = 1
-                            THEN (
-                                SELECT
-                                    -- 发货单位
-                                    RS.SHIPPER_NAME
-                                FROM
-                                    --销售订单
-                                    AMS_SALE_ORDER ASO --托运人
-                                LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
-                                WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                            )
-                        -- 	运输订单类型等于2，3的查询发运计划表
-                        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-                            THEN (
-                                SELECT
-                                    --发货单位
-                                    RS.SHIPPER_NAME
-                                    --发运计划
-                                FROM
-                                    AMSTRUCK_RAIL_DAYPLAN ARD
-                                    -- 托运人
-                                    LEFT JOIN RMS_SHIPPER RS ON ARD.SHIPMENT_UNIT_ID = RS.SHIPPER_ID
-                                 WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-                            )
-                    END) "shipperName",
-                    --根据订单类型查询收货单位
-                    ( CASE
-                        WHEN OO.ORDER_TYPE = 1
-                            THEN (
-                                SELECT
-                                    --收货单位
-                                    RS.SUPPLIER_NAME
-                                FROM
-                                    -- 销售订单
-                                    AMS_SALE_ORDER ASO
-                                    -- 托运人
-                                LEFT JOIN RMS_SUPPLIER RS ON ASO.SHIPPER_ID = RS.SUPPLIER_ID
-                                WHERE OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
-                            ) -- 	运输订单类型等于2，3的查询发运计划表
-                        WHEN OO.ORDER_TYPE IN ( 2, 3 )
-                            THEN (
-                                SELECT
-                                    --发货单位
-                                    RS.SUPPLIER_NAME --发运计划
-                                FROM
-                                    AMSTRUCK_RAIL_DAYPLAN ARD
-                                    --托运人
-                                    LEFT JOIN RMS_SUPPLIER RS ON ARD.SHIPMENT_UNIT_ID = RS.SUPPLIER_ID
-                                    WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
-                            )
-                    END) "supplierName"
-                FROM
-                    -- 出厂实绩
-                    TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                    -- 	门岗
-                    LEFT JOIN RMS_GATEPOST RG ON TLFR.GATEPOST_ID = RG.GATEPOST_ID
-                     -- 	总实绩
-                    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                    -- 运输订单
-                    LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
-                    -- 运力信息
-                    LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
-                WHERE
-                    -- 判断出厂实绩的出厂时间不为空
-                    TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
-                    -- 	并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
-                    AND OO.ORDER_TYPE IN ( 1, 2, 3 )
-            )
+        (
+        SELECT
+        -- 出厂时间
+        TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
+        --出厂抓拍图片
+        TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture",
+        -- 	出厂方式
+        TLFR.RESULT_OUT_MODE "resultOutMode",
+        -- 	门岗名称
+        RG.GATEPOST_NAME "gatepostName",
+        -- 运输订单号
+        OO.ORDER_NUMBER "orderNumber",
+        -- 车牌号
+        RC.CAPACITY_NUMBER "capacityNumber",
+        -- 运输订单id
+        OO.ORDER_ID "orderId",
+        -- 根据订单类型查询销售订单号/发运计划号
+        ( CASE
+        -- 	运输订单类型等于1的查询销售订单表
+        WHEN OO.ORDER_TYPE = 1
+        THEN (
+        SELECT
+        -- 销售订单号
+        ASO.SALE_NUMBER
+        FROM
+        -- 销售订单
+        AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        )
+        -- 	运输订单类型等于2，3的查询发运计划表
+        WHEN OO.ORDER_TYPE IN ( 2, 3 )
+        THEN(
+        SELECT
+        -- 发运计划号
+        ARD.DAYPLAN_NO
+        -- 发运计划
+        FROM AMSTRUCK_RAIL_DAYPLAN ARD
+        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+        )
+        END) "saleNum",
+        --根据订单类型查询发货单位
+        (CASE
+        WHEN OO.ORDER_TYPE = 1
+        THEN (
+        SELECT
+        -- 发货单位
+        RS.SHIPPER_NAME
+        -- 销售订单
+        FROM
+        AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        )
+        -- 	运输订单类型等于2，3的查询发运计划表
+        WHEN OO.ORDER_TYPE IN ( 2, 3 )
+        THEN (
+        SELECT
+        --发货单位
+        RS.SHIPPER_NAME
+        --发运计划
+        FROM
+        AMSTRUCK_RAIL_DAYPLAN ARD
+        -- 托运人
+        LEFT JOIN RMS_SHIPPER RS ON ARD.SHIPMENT_UNIT_ID = RS.SHIPPER_ID
+        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+        )
+        END) "shipperName",
+        --根据订单类型查询收货单位
+        ( CASE
+        WHEN OO.ORDER_TYPE = 1
+        THEN (
+        SELECT
+        --收货单位
+        RC.CONSIGNEE_COMPANY_NAME
+        FROM
+        AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        -- 托运人
+        LEFT JOIN RMS_CONSIGNEE RC ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+        WHERE OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        ) -- 	运输订单类型等于2，3的查询发运计划表
+        WHEN OO.ORDER_TYPE IN ( 2, 3 )
+        THEN (
+        SELECT
+        --发货单位
+        RS.SUPPLIER_NAME --发运计划
+        FROM
+        AMSTRUCK_RAIL_DAYPLAN ARD
+        --托运人
+        LEFT JOIN RMS_SUPPLIER RS ON ARD.SHIPMENT_UNIT_ID = RS.SUPPLIER_ID
+        WHERE OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+        )
+        END) "supplierName"
+        FROM
+        -- 出厂实绩
+        TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        -- 	门岗
+        LEFT JOIN RMS_GATEPOST RG ON TLFR.GATEPOST_ID = RG.GATEPOST_ID
+        -- 	总实绩
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        -- 运输订单
+        LEFT JOIN OMSTRUCK_ORDER OO ON TTR.ORDER_ID = OO.ORDER_ID
+        -- 运力信息
+        LEFT JOIN RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE
+        -- 判断出厂实绩的出厂时间不为空
+        TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+        -- 	并且订单类型等于1（销售订单），2（焦炭发运计划），3（水渣发运计划）
+        AND OO.ORDER_TYPE IN ( 1, 2, 3 )
+        )
         <where>
             <if test="resultOutGateTime != null">
                 <foreach collection="resultOutGateTime" item="item" open="(" separator="or" close=")">