|
@@ -1940,6 +1940,7 @@
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
ON RM.MATERIAL_ID = ASM.MATERIAL_ID
|
|
ON RM.MATERIAL_ID = ASM.MATERIAL_ID
|
|
<where>
|
|
<where>
|
|
|
|
+ ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
<if test="orderStatus!=null">
|
|
<if test="orderStatus!=null">
|
|
AND OO.ORDER_STATUS = #{orderStatus}
|
|
AND OO.ORDER_STATUS = #{orderStatus}
|
|
</if>
|
|
</if>
|
|
@@ -2068,10 +2069,10 @@
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
LEFT JOIN RMS_MATERIAL RM
|
|
ON RM.MATERIAL_ID = ASM.MATERIAL_ID
|
|
ON RM.MATERIAL_ID = ASM.MATERIAL_ID
|
|
<where>
|
|
<where>
|
|
|
|
+ ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
<if test="saleOrderId!=null">
|
|
<if test="saleOrderId!=null">
|
|
AND ASO.SALE_ORDER_ID = #{saleOrderId}
|
|
AND ASO.SALE_ORDER_ID = #{saleOrderId}
|
|
</if>
|
|
</if>
|
|
-
|
|
|
|
<if test="numberPlate!=null">
|
|
<if test="numberPlate!=null">
|
|
AND RC.CAPACITY_NUMBER LIKE #{numberPlate}
|
|
AND RC.CAPACITY_NUMBER LIKE #{numberPlate}
|
|
</if>
|
|
</if>
|
|
@@ -3010,6 +3011,7 @@
|
|
LEFT JOIN AMS_SALE_MATERIAL AMS
|
|
LEFT JOIN AMS_SALE_MATERIAL AMS
|
|
ON AMS.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
|
|
ON AMS.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
|
|
WHERE OOM.ORDER_ID=#{orderId}
|
|
WHERE OOM.ORDER_ID=#{orderId}
|
|
|
|
+ and AMS.SALE_MATERIAL_ID IS NOT NULL
|
|
</select>
|
|
</select>
|
|
<!-- 内转原料司机接单 -->
|
|
<!-- 内转原料司机接单 -->
|
|
<select id="getInwardOrderMap" parameterType="DECIMAL" resultType="java.util.Map">
|
|
<select id="getInwardOrderMap" parameterType="DECIMAL" resultType="java.util.Map">
|