|
@@ -978,7 +978,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
|
order by "insertTime" desc
|
|
order by "insertTime" desc
|
|
@@ -1055,7 +1055,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
|
order by "insertTime" desc
|
|
order by "insertTime" desc
|
|
@@ -1195,7 +1195,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
|
order by "orderReceiveRefuseTime" desc
|
|
order by "orderReceiveRefuseTime" desc
|
|
@@ -1311,7 +1311,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
|
order by "insertTime" desc
|
|
order by "insertTime" desc
|
|
@@ -1625,7 +1625,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
|
order by "orderReceiveRefuseTime" desc
|
|
order by "orderReceiveRefuseTime" desc
|
|
@@ -1986,7 +1986,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
|
order by "orderNumber" desc
|
|
order by "orderNumber" desc
|
|
@@ -2110,7 +2110,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
<if test="orderField == null ">
|
|
<if test="orderField == null ">
|
|
|
order by "orderNumber" desc
|
|
order by "orderNumber" desc
|
|
@@ -2175,7 +2175,7 @@
|
|
|
LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
|
|
LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
|
|
|
WHERE
|
|
WHERE
|
|
|
ASOM.SALE_ORDER_MATERIAL_ID=#{saleOrderMaterialId}
|
|
ASOM.SALE_ORDER_MATERIAL_ID=#{saleOrderMaterialId}
|
|
|
- <include refid="orderBy"></include>
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy"></include>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2265,7 +2265,7 @@
|
|
|
<!-- </if>-->
|
|
<!-- </if>-->
|
|
|
<!-- </if>-->
|
|
<!-- </if>-->
|
|
|
<!--</where>-->
|
|
<!--</where>-->
|
|
|
- <!-- <include refid="orderBy">-->
|
|
|
|
|
|
|
+ <!-- <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">-->
|
|
|
<!-- </include>-->
|
|
<!-- </include>-->
|
|
|
<!-- <if test="orderField == null ">-->
|
|
<!-- <if test="orderField == null ">-->
|
|
|
<!-- order by "insertTime" desc-->
|
|
<!-- order by "insertTime" desc-->
|
|
@@ -2327,7 +2327,7 @@
|
|
|
<!-- </if>-->
|
|
<!-- </if>-->
|
|
|
<!-- </if>-->
|
|
<!-- </if>-->
|
|
|
<!--</where>-->
|
|
<!--</where>-->
|
|
|
- <include refid="orderBy"></include>
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy"></include>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
|
|
|
|
@@ -2411,7 +2411,7 @@
|
|
|
and OO.ORDER_TYPE = #{orderTypee}
|
|
and OO.ORDER_TYPE = #{orderTypee}
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy"></include>
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy"></include>
|
|
|
</select>
|
|
</select>
|
|
|
<!--销售查询已经形成水渣日计划 -->
|
|
<!--销售查询已经形成水渣日计划 -->
|
|
|
<select id="selectWaterSlagForOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
<select id="selectWaterSlagForOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
@@ -2454,7 +2454,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
)
|
|
)
|
|
|
- <include refid="orderBy"></include>
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy"></include>
|
|
|
</select>
|
|
</select>
|
|
|
<!--销售查询已经形成订单得水渣日计划-->
|
|
<!--销售查询已经形成订单得水渣日计划-->
|
|
|
<select id="selectCokeRailPlanForOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
<select id="selectCokeRailPlanForOrder" resultType="java.util.Map" parameterType="java.util.Map">
|
|
@@ -2499,7 +2499,7 @@
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
)
|
|
)
|
|
|
- <include refid="orderBy"></include>
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy"></include>
|
|
|
</select>
|
|
</select>
|
|
|
<!-- 根据承运商查找销售订单-->
|
|
<!-- 根据承运商查找销售订单-->
|
|
|
<select id="selectSteelSaleForCarrier" resultType="java.util.LinkedHashMap" parameterType="java.lang.Integer">
|
|
<select id="selectSteelSaleForCarrier" resultType="java.util.LinkedHashMap" parameterType="java.lang.Integer">
|
|
@@ -2870,7 +2870,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy"></include>
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy"></include>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="getResultList" parameterType="DECIMAL" resultType="java.util.Map">
|
|
<select id="getResultList" parameterType="DECIMAL" resultType="java.util.Map">
|
|
@@ -3668,7 +3668,7 @@
|
|
|
</foreach>
|
|
</foreach>
|
|
|
</if>
|
|
</if>
|
|
|
</where>
|
|
</where>
|
|
|
- <include refid="orderBy">
|
|
|
|
|
|
|
+ <include refid="com.steerinfo.dil.mapper.CommonMapper.orderBy">
|
|
|
</include>
|
|
</include>
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|