|
@@ -709,11 +709,6 @@
|
|
|
AND OO.ORDER_TYPE = 1
|
|
|
AND OO.ORDER_STATUS = 2
|
|
|
AND OO.ORDER_NUMBER != #{orderNumber}
|
|
|
- AND to_date(to_char(OO.ORDER_ISSUE_TIME,'yyyy-mm-dd'),'yyyy-mm-dd') =
|
|
|
- (SELECT to_date(TO_CHAR(ORDER_ISSUE_TIME,'yyyy-mm-dd'),'yyyy-mm-dd') FROM OMSTRUCK_ORDER
|
|
|
- WHERE ORDER_NUMBER = #{orderNumber}
|
|
|
- ORDER BY ORDER_ID DESC
|
|
|
- FETCH NEXT 1 ROWS ONLY)
|
|
|
AND OO.CAPACITY_ID = (SELECT CAPACITY_ID FROM OMSTRUCK_ORDER WHERE ORDER_NUMBER = #{orderNumber}
|
|
|
ORDER BY ORDER_ID DESC
|
|
|
FETCH NEXT 1 ROWS ONLY)
|
|
@@ -721,7 +716,7 @@
|
|
|
FETCH NEXT 1 ROWS ONLY
|
|
|
</select>
|
|
|
<select id="getSaleType" resultType="java.math.BigDecimal">
|
|
|
- SELECT ASO.SALE_TYPE FROM OMSTRUCK_ORDER OO
|
|
|
+ SELECT DISTINCT ASO.SALE_TYPE FROM OMSTRUCK_ORDER OO
|
|
|
LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
|
|
|
ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
|
|
|
LEFT JOIN AMS_SALE_ORDER ASO
|