09.14 품절배치 수정 및 wms update시 수정일 비고 추가

src/main/java/com/style24/core/biz/service/TscDeliveryService.java

@@ -121,11 +121,15 @@ public class TscDeliveryService {
 			change.setCnclRtnReqQtyArr(change.getCnclRtnReqQtyList().stream().mapToInt(i->i).toArray());
 
 			// 무통장입금 주문 중 환불계좌정보 없을 경우 취소신청
-			if(TscConstants.PgGb.KCP.value().equals(change.getPgGb()) && TscConstants.PayMeans.BANK_DEPOSIT.value().equals(change.getPayMeans()) && StringUtils.isEmpty(change.getAccountNo())) {
+			if((TscConstants.PgGb.KCP.value().equals(change.getPgGb()) && TscConstants.PayMeans.BANK_DEPOSIT.value().equals(change.getPayMeans()) && StringUtils.isEmpty(change.getAccountNo()))
+				|| TscConstants.PayMeans.CELL_PHONE.value().equals(change.getPayMeans())
+				|| TscConstants.PayMeans.BANK_DEPOSIT.value().equals(change.getPayMeans())) {
 				// 취소신청
 				change.setChgGb(TscConstants.OrderChangeGb.CANCEL.value());
+				change.setUserNo(userNo);
 				orderChangeService.cancelRequest(change);
 			} else {		// 무통장입금 주문 중 환불계좌정보 없을 경우 제외는 취소처리
+			
 				// 취소완료
 				GagaMap cancelInfo = orderChangeService.orderCancelPreInfo(change, userNo);
 				

src/main/java/com/style24/persistence/mybatis/wms/TscWmsDelivery.xml

@@ -102,6 +102,8 @@
 			  StatusCd = CASE WHEN (Qty - Cqty) = #{itemQty} THEN '60' ELSE StatusCd END 
 			, IsCancel = CASE WHEN (Qty - Cqty) = #{itemQty} THEN 1    ELSE IsCancel END 
 			, Cqty     = CASE WHEN (SELECT COUNT(*) FROM istyle24_Wmsif.dbo.TB_IF_RecallExceptionItem B WHERE B.OrderDtlNo = #{ordDtlNo} AND B.ProductNo = #{productNo} AND B.SKUCode = #{optCd}   AND B.ReasonCode IN ('08','10') ) > 0 THEN Cqty ELSE  Cqty + #{itemQty} END
+			, DateLastModified = GETDATE()
+			, ExceptionDesc = '배송취소'
 			WHERE 1=1
 			  <if test='ordDtlNo != null and ordDtlNo != ""'>
 			  AND OrderDtlNo = #{ordDtlNo}