|
@@ -884,7 +884,17 @@
|
|
|
order by "insertTime" desc
|
|
|
</if>
|
|
|
</sql>
|
|
|
-
|
|
|
+ <sql id="orderBySteel">
|
|
|
+ <if test="orderField != null and orderField != ''">
|
|
|
+ order by "${orderField}"
|
|
|
+ <if test="orderType != null and orderType != ''">
|
|
|
+ ${orderType}
|
|
|
+ </if>
|
|
|
+ </if>
|
|
|
+ <if test="orderField == null ">
|
|
|
+ order by "orderId" desc
|
|
|
+ </if>
|
|
|
+ </sql>
|
|
|
<!-- 根据运单id查询运单类型 -->
|
|
|
<select id="getOrderType" parameterType="DECIMAL" resultType="DECIMAL">
|
|
|
SELECT ORDER_TYPE
|
|
@@ -1627,7 +1637,6 @@
|
|
|
and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
|
|
|
and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
|
|
|
</if>
|
|
|
-
|
|
|
order by twr.result_tare_weight_time desc
|
|
|
)
|
|
|
<where>
|
|
@@ -2008,30 +2017,30 @@
|
|
|
rsa.area_name "areaName",
|
|
|
aso.sale_order_receive_customer "receiveMoneyCus",
|
|
|
ASM.EAS_PRIMARY_ID "easPrimaryId",
|
|
|
- oo.ORDER_ISSUE_TIME "orderissuetime",
|
|
|
+ to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderDate",
|
|
|
bdo.PRICEIDS "priceids"
|
|
|
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
|
|
|
+ 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
|
|
|
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
|
|
|
+ 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 AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
|
|
|
+ LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID AND ASM.MATERIAL_ID = TWR.MATERIAL_ID
|
|
|
+ LEFT 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
|
|
|
+ LEFT JOIN RMS_CARRIER RC2 ON RC2.CARRIER_ID = ADSO.CARRIER_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 = ASM.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
|
|
@@ -2045,15 +2054,16 @@
|
|
|
and RC2.CARRIER_ID = #{carrierId}
|
|
|
</if>
|
|
|
<if test="oneDate != null">
|
|
|
- and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') <= bdo.INSERT_TIME
|
|
|
+ and to_date(#{oneDate}, 'yyyy-mm-dd') < = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
</if>
|
|
|
<if test="startDate != null">
|
|
|
- and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= bdo.INSERT_TIME
|
|
|
- and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= bdo.INSERT_TIME
|
|
|
+ and to_date(#{startDate}, 'yyyy-mm-dd') <= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
+ and to_date(#{endDate}, 'yyyy-mm-dd') >= to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
|
|
|
</if>
|
|
|
order by oo.order_id desc
|
|
|
)
|
|
|
<where>
|
|
|
+ "shipperName" is not null and "priceValue" is not null
|
|
|
<if test="preparationDate!= null">
|
|
|
and
|
|
|
<foreach collection="preparationDate" item="item" open="(" separator="or" close=")">
|
|
@@ -2156,14 +2166,8 @@
|
|
|
"receiveMoneyCus" like '%${item}%'
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="orderissuetime!= null">
|
|
|
- and
|
|
|
- <foreach collection="orderissuetime" item="item" open="(" separator="or" close=")">
|
|
|
- "orderissuetime" like '%${item}%'
|
|
|
- </foreach>
|
|
|
- </if>
|
|
|
</where>
|
|
|
- <include refid="orderBy"></include>
|
|
|
+ <include refid="orderBySteel"></include>
|
|
|
</select>
|
|
|
<select id="selectDetailsByOrder" resultType="java.lang.Integer" parameterType="decimal">
|
|
|
SELECT count(BDO.DETAILS_ID) FROM BMSTRUCK_DETAILS_ORDER BDO
|
|
@@ -2290,4 +2294,32 @@
|
|
|
ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
|
|
|
where oo.ORDER_ID = #{orderId}
|
|
|
</select>
|
|
|
+ <select id="getIsHaveDetailsOrder" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
|
|
|
+ SELECT COUNT(BDO.DETAILS_ID) FROM BMSTRUCK_DETAILS_ORDER BDO
|
|
|
+ WHERE BDO.WEIGHT_TASK_RESULT_ID = #{weightTaskResultId}
|
|
|
+ </select>
|
|
|
+ <select id="getSteelWeightTaskResultId" resultType="java.util.Map">
|
|
|
+ SELECT
|
|
|
+ TWR.WEIGHT_TASK_RESULT_ID AS "weightTaskResultId",
|
|
|
+ TWR.RESULT_NET_WEIGHT AS "netWeight"
|
|
|
+ FROM OMSTRUCK_ORDER OO
|
|
|
+ LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
|
|
|
+ ON TTR.ORDER_ID = OO.ORDER_ID
|
|
|
+ LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
|
|
|
+ ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
|
|
|
+ WHERE OO.ORDER_ID = #{orderId}
|
|
|
+ order by twr.GROSS_SEGMENT_SQE desc
|
|
|
+ </select>
|
|
|
+ <select id="getDetailIds" resultType="java.math.BigDecimal" parameterType="decimal">
|
|
|
+ SELECT BDO.DETAILS_ID "detailId" FROM BMSTRUCK_DETAILS_ORDER BDO
|
|
|
+ WHERE BDO.ORDER_ID = #{orderId}
|
|
|
+ </select>
|
|
|
+ <update id="updatePlace" parameterType="map">
|
|
|
+ update AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
+ set asom.SALE_SHIPPING_ADDRESS_ID = #{placeId}
|
|
|
+ where ASOM.SALE_ORDER_MATERIAL_ID = (SELECT oo.order_plan_id FROM
|
|
|
+ OMSTRUCK_ORDER OO
|
|
|
+ WHERE OO.ORDER_ID = #{orderId}
|
|
|
+ )
|
|
|
+ </update>
|
|
|
</mapper>
|