|
@@ -900,7 +900,7 @@
|
|
LEFT JOIN RMS_CAPACITY RC
|
|
LEFT JOIN RMS_CAPACITY RC
|
|
ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
ON RC.CAPACITY_ID = OO.CAPACITY_ID
|
|
WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|
|
WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|
|
- AND OO.ORDER_TYPE = 1
|
|
|
|
|
|
+ AND OO.ORDER_TYPE in (1,4)
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="findEntriesByOrderId" parameterType="DECIMAL" resultType="java.util.Map" >
|
|
<select id="findEntriesByOrderId" parameterType="DECIMAL" resultType="java.util.Map" >
|
|
@@ -942,7 +942,7 @@
|
|
LEFT JOIN AMS_SALE_ORDER ASO
|
|
LEFT JOIN AMS_SALE_ORDER ASO
|
|
ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
|
|
WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|
|
WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
|
|
- and aso.SALE_TYPE = 1
|
|
|
|
|
|
+ and aso.SALE_TYPE in (1,4)
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
and ASM.SALE_MATERIAL_ID IS NOT NULL
|
|
</select>
|
|
</select>
|
|
<select id="selectOrderMes" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
|
|
<select id="selectOrderMes" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
|