tsit14 5 лет назад
Родитель
Сommit
41a047ac0a

+ 5 - 0
src/main/java/com/style24/core/biz/service/TscOrderChangeService.java

@@ -1530,6 +1530,11 @@ public class TscOrderChangeService {
 		String wdInvoiceNo					= map.getString("wdInvoiceNo");									// 회수송장번호
 		String chgStat						= TscConstants.OrderChangeStat.RETURN.value();					// 주문변경상태
 		int ordChgSq						= 0;															// 주문변경일련번호
+		
+		// 2021.05.25 회수구분이 직접일때 상품검수중 설정
+		if ("D".equals(wdGb)) {
+			chgStat = TscConstants.OrderChangeStat.WITHDRAW_GOODS_CHECK.value();
+		}
 
 		// 2. 주문상세단위 처리
 		List<Order> cancelOrderDetailList = new ArrayList<>();

+ 2 - 0
src/main/java/com/style24/persistence/mybatis/shop/TscOrderChange.xml

@@ -273,6 +273,7 @@
 		                    ELSE OD.DELV_FEE_CD
 		                    END  DELV_FEE_CD
 		             , X.CHG_QTY AS ORD_CAN_CHG_QTY
+		             , X.CHG_STAT
 		        FROM   TB_ORDER_DETAIL OD
 		        INNER  JOIN TB_GOODS G1
 		        ON     OD.GOODS_CD = G1.GOODS_CD
@@ -311,6 +312,7 @@
 		        LEFT OUTER JOIN (
 		            SELECT OCD.ORD_DTL_NO
 		                 , OCD.CHG_QTY
+		                 , OCD.CHG_STAT
 		              FROM TB_ORDER_CHANGE_DETAIL OCD
 		             WHERE OCD.DEL_YN = 'N'
 		               AND OCD.ORD_CHG_SQ = #{ordChgSq}