|
|
@@ -183,7 +183,7 @@
|
|
|
INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON B.ORD_DTL_NO = ODI.ORD_DTL_NO
|
|
|
INNER JOIN TB_GOODS C ON ODI.ITEM_CD = C.GOODS_CD
|
|
|
INNER JOIN TB_DELIVERY_ADDR D ON B.DELV_ADDR_SQ = D.DELV_ADDR_SQ
|
|
|
- INNER JOIN TB_PAYMENT P ON A.ORD_NO = P.ORD_NO AND P.PAY_STAT = 'G016_30'
|
|
|
+ INNER JOIN TB_PAYMENT P ON A.ORD_NO = P.ORD_NO AND P.PAY_STAT = 'G016_30' AND P.PAY_GB = 'O'
|
|
|
LEFT OUTER JOIN TB_CUST_ACCOUNT T ON A.CUST_NO = T.CUST_NO AND T.DEFAULT_YN = 'Y' AND T.DEL_YN = 'N'
|
|
|
WHERE 1=1
|
|
|
AND B.GOODS_TYPE NOT IN ('G056_S')
|
|
|
@@ -1042,7 +1042,7 @@
|
|
|
, DELV_LOC_CD
|
|
|
, LOC_QTY AS STOCK_QTY
|
|
|
, (SELECT DELV_LOC_CLSF FROM TB_DELIVERY_LOC WHERE DELV_LOC_CD = A.DELV_LOC_CD AND SUPPLY_COMP_CD = #{supplyCompCd} ) AS DELV_LOC_CLSF
|
|
|
- , IFNULL((SELECT CASE WHEN DELV_AR_GB ='N' THEN 'Y' ELSE 'N' END FROM TB_DELIVERY_ASSIGN WHERE DELV_LOC_CD = A.DELV_LOC_CD AND ORD_DTL_NO = #{ordDtlNo}),'N') AS DELV_AR_GB
|
|
|
+ , IFNULL((SELECT CASE WHEN MAX(DELV_AR_GB) ='N' THEN 'Y' ELSE 'N' END FROM TB_DELIVERY_ASSIGN WHERE DELV_LOC_CD = A.DELV_LOC_CD AND ORD_DTL_NO = #{ordDtlNo}),'N') AS DELV_AR_GB
|
|
|
FROM TB_DELIVERY_LOC_TMP A
|
|
|
WHERE USE_GB = #{useGb}
|
|
|
AND GOODS_LOC_CNT = #{goodsLocCnt}
|
tsit05