tsit05 4 лет назад
Родитель
Сommit
71d8d54035

+ 6 - 0
src/main/java/com/style24/admin/biz/web/TsaWithdrawController.java

@@ -35,10 +35,12 @@ import com.style24.admin.biz.service.TsaWithdrawService;
 import com.style24.admin.biz.service.TsaWmsWithdrawService;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.support.session.TscSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.core.biz.service.TscOrderChangeService;
 
 
+
 /**
  * 회수관리 Controller
  * 
@@ -348,6 +350,8 @@ public class TsaWithdrawController extends TsaBaseController {
 		GagaMap result = new GagaMap();
 		wmsWithdraw.setPageable(new TscPageRequest(wmsWithdraw.getPageNo() - 1, wmsWithdraw.getPageSize()));
 		wmsWithdraw.getPageable().setTotalCount(wmsWithdrawService.getWmsWithdrawListCount(wmsWithdraw));
+		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
+		
 		if ("N".equals(wmsWithdraw.getPageingYn())) {
 			wmsWithdraw.setPageable(null);
 		}
@@ -403,6 +407,8 @@ public class TsaWithdrawController extends TsaBaseController {
 		withdraw.setPageable(new TscPageRequest(withdraw.getPageNo() - 1, withdraw.getPageSize()));
 		
 		withdraw.getPageable().setTotalCount(withdrawService.getWithdrawDirectiveListCount(withdraw));
+		TscSession.setAttribute("maskingYn", TsaSession.getInfo().getMaskingYn());
+		
 		
 		if ("N".equals(withdraw.getPageingYn())) {
 			withdraw.setPageable(null);

+ 0 - 250
src/main/java/com/style24/persistence/domain/Delivery.java

@@ -202,255 +202,5 @@ public class Delivery extends TscBaseDomain {
 
 	
 	
-	 
-
-
-	
-	/* 위로  작성  ('' ) ( '')*/
-	
-	
-	
 	
-	/* 아래는 참고용!!*/
-	
-
-
-	
-
-//
-//	
-//	private String ordStat;
-//
-//	private String orderEmail;
-//	private String colorKnm;
-//
-//	//private Integer ordQty;
-//	private Integer cnclRtnQty;
-//	private Integer saleQty;
-//	private Integer saleAmt;
-//	
-//
-//
-//
-//	private String sbagEncloseYn;
-//
-//
-//	private String dstrbtNote;
-//	private String ordExchGbNm;
-//	
-//	private String extmallOrdDtlNo;
-//	private String supplyCompNm;
-//	private String supplyGoodsCd;
-////	private String ordExchGb;
-//	private String frontGb;
-//
-//
-//
-//
-//	private Long ordChgSq;
-//	private String chgGb;
-//	private String chgReason;
-//	private String chgMemo;
-//	private String chgerNm;
-//	private String chgerPhnno;
-//	private String chgerTelno;
-//	private String chgerEmail;
-//	private String chgerPostNo;
-//	private String chgerBaseAddr;
-//	private String chgerDtlAddr;
-//	private Integer chgQty;
-//	private String chgStat;
-//	private String whMemo;
-//	private Integer realOrdAmt;
-//	private Integer cnclRtnAmt;
-//	private Long orgOrdDtlNo;
-//	private String vendorId;
-//
-//	//private String formalGb;
-//	private String formalGbNm;
-//	private String setYn;
-//	private Integer tagPrice;
-//	private Integer listPrice;
-//	private Integer currPrice;
-//	private Integer dcRate;
-//	//private Integer ordAmt;
-//	private Long goodsCpnSq;
-//	private Integer goodsCpnDcAmt;
-//	private Long cartCpnSq;
-//	private Integer cartCpnDcAmt;
-//	private Integer pntDcAmt;
-//	private Integer prePntDcAmt;
-//	private Integer savePntAmt;
-//	private String agentOrderId;
-//	private String exchangableYn;
-//	private String exchangeFeeFreeYn;
-//	private String returnableYn;
-//	private String returnFeeFreeYn;
-//	private String soldoutMemo;
-//	private String soldoutRegId;
-//	private String soldoutRegDt;
-//	private String delvAssignDt;
-//	
-//	private String delvStdt;
-//	private String delvEddt;
-//	private String shipCompNm;
-//	private String invoiceSendYn;
-//	private String sellFeeRate;
-//	private String ithrCd;
-//	private String contentsLoc;
-//	private Integer paySq;
-//	private Integer payAmt;
-//	
-//	private String payStat;
-//	private String delvPayGb;
-//	private String pgCnclTid;
-//	
-//	private String delvFeeGb;
-//	private Integer delvFee;
-//	private String usacGb;
-//	private String prtnGb;
-//	private String orgUsacGb;
-//	private Integer sellQty;
-//	private String sellGb;
-//	private String workDay;
-//	private Integer chasu;
-//	
-//	private String productId;
-//
-//
-//	private String dasRecipStsCd;
-//	private String dasRecipIngDt;
-//	private String dasRecipCplDt;
-//	private String dasWorkCplDt;
-//	private Integer shipQty;
-//	private String soldoutDt;
-//	private String adminRecipYn;
-//	private String adminRecipDt;
-//	private String cncYn;
-//	private String cncDt;
-//	private String regStdt;
-//	private String regEddt;
-//	//private String extmallId;
-//	private Integer stockQty;
-//	//private Integer currStockQty;
-//	//private Integer baseStockQty;
-//
-//	private Integer assignQty;
-//	private String delvArId;
-//	private String rejectReason;
-//	private String chulgoQty;
-//	private String ordExchGbYn;
-//	private String payStDate;
-//	private String payEdDate;
-//
-//	private String stDt;
-//	private String edDt;
-//
-//	private String goodsGb;
-//
-//	private String colorGrpFile;
-//	private Integer invoiceQty;
-//
-//	private String delayDt;
-//	private String orgOrdDtlStat;
-//
-//	private String locCd;  //위치코드(물류로케이션)
-//	private int dispOrd;  //표시순서
-//	private String pickingNo;  //피킹번호
-//	private int pickingQty;  //피킹수량
-//	private String locGcd;  //위치그룹코드
-//	private String updDt;  //수정일시
-//	private String regDt;  //등록일시
-//
-//	private String cd;  //코드
-//	private String cdNm;  //코드명
-//
-//	private String supplyCompSelfYn;
-//	private Double delvFeeRate;
-//	private int delvAddrSq;
-//	private int outSeq;
-//
-//	private String applyStdtFrom;
-//	private String applyStdtTo;
-//	private String memoType;
-//	private String refVal;
-//
-//	private String delvMemoSq;
-//	private int baseAmt;
-//	private String applyStdt;
-//	private String applyStdthh;
-//	private String applyStdtmm;
-//	private String applyEddt;
-//	private String applyEddthh;
-//	private String applyEddtmm;
-//	private int memoQty;
-//	private String memo;
-//	private String useYn;
-//	private String brandCbs;
-//
-//	private String applySttmDip;
-//	private String applyEdtmDip;
-//
-//
-//
-//	private String pResult;
-//
-//	private Long plusCpnSq;
-//	private Integer plusCpnDcAmt; //플러스쿠폰할인금액 명칭바뀜 
-//	private String erpCdCompany;
-//	private String erpCdDepart;
-//
-//	private String ifNo;
-//	private String ifGb;
-//	private String styleCd;
-//
-//	private String chgReasonNm;
-//
-//	private String delvAssignOrd;
-//
-//	private String orderId;
-//
-//	private String custGb;
-//	private String goodsNum;
-//	private String cdCompany;
-//	private String cdDepart;
-//
-//	private Integer orgOrdAmt;
-//	private Integer orgGoodsCpnDcAmt;
-//	private Integer orgCartCpnDcAmt;
-//	private Integer orgPlusCpnDcAmt;
-//	private Integer orgPntDcAmt;
-//	private Integer orgPrePntDcAmt;
-//	private Integer orgSavePntAmt;
-//	private Integer orgRealOrdAmt;
-//	private String outCdTrans;
-//	private String outSongjang;
-//	private String outResult;
-//
-//
-//
-//
-//	private String regNm;
-//
-//	private String invoiceGb;
-//	private String apiGb;
-//	private String resultCd;
-//	private String custOrdNo;
-//	private String hstMemo;
-//
-//
-//
-//	
-//	// 출고처 정보
-//	private String delvAssignGrade;
-//	private String stockApplRate;
-//	private String delvLocZipcode;
-//	private String delvLocBaseAddr;
-//	private String delvLocDtlAddr;
-//	private String rtnLocZipcode;
-//	private String rtnLocBaseAddr;
-//	private String rtnLocDtlAddr;
-//	private String rtnLocTelno;
-//	private String rtnLocNm;
-//	private String invoicePrintType;
 }

+ 27 - 229
src/main/java/com/style24/persistence/domain/Withdraw.java

@@ -4,6 +4,9 @@ import lombok.Data;
 
 import com.style24.persistence.TscBaseDomain;
 import com.style24.persistence.TscPageRequest;
+import com.style24.core.support.session.TscSession;
+import com.style24.core.support.util.CryptoUtils;
+import com.style24.core.support.util.MaskingUtils;
 
 /**
  * 회수 Domain
@@ -112,241 +115,36 @@ public class Withdraw extends TscBaseDomain {
 	private String withdrawType;
 
 	
-	
-	/*
-	// 회수
-	private String wdInvoiceNo;				// 회수송장번호
-	private String senderNm;				// 발송자 명
-	private String senderPhnno;				// 발송자 휴대전화번호
-	private String senderTelno;				// 발송자 전화번호
-	private String senderPostNo;			// 발송자 우편번호
-	private String senderBaseAddr;			// 발송자 기본주소
-	private String senderDtlAddr;			// 발송자 상세주소
-	private String shipCompCd;				// 배송업체코드
-	private String wdReqReason;				// 회수요청사유(공통코드G688)
-	private Integer wdFee;					// 회수비
-	private Integer encloseFee;				// 동봉비
-	private Integer orgEncloseFee;
-	private Integer codFee;					// 착불비
-	private String wdMemo;					// 회수메모
-	private String sameYn;					// 동일여부(Y:동일)
-	private String arrivalDt;				// 도착일시
-	private String csMemo;					// CS메모
-	private String csObYn;					// CS아웃바운드 여부
-	private String csObDt;					// CS아웃바운드 DLFTL
-	private String csObId;					// CS아웃바운드 ID(사용자)
-	private String smsSendYn;				// SMS발송여부
-	private Long ordDtlNo;					// 주문상세번호
-	private Integer wdQty;					// 회수수량
-	private Integer sumWdQty;				// 등록된 회수수량
-	private Integer sumChgQty;				// 전체 반품신청수량
-	private String rtnLocCd;				// 반품처코드
-	private String sellStoreCd;				// 판매매장코드(판매매장)
-	private String returnType;				// 회수구분
-	private String tagCd;					// 택 코드
-	private String wdStat;					// 회수 상태
-	private Integer orgDelvFee;				// 최초 배송비
-	private Integer minOrdAmt;				// 무료배송 최소금액
-	private String pgStats;					// pg전송 여부(Y: 미전송)
-	private String completeDt;				// 회수 완료 일
-
-	// 주문 관련
-	private Long ordNo;						// 주문번호
-	private String mallGb;					// 몰구분(10:자사몰, 20:외부몰)
-	private String ordDt;					// 주문일시
-	private String payDt;					// 결제일시
-	private Integer custNo;					// 고객번호
-	private String orderNm;					// 주문자이름
-	private String orderPhnno;				// 주문자 휴대전화번호
-	private String orderTelno;				// 주문자 전화번호
-	private String orderEmail;				// 주문자 이메일
-	private String ordStat;					// 주문상태
-	private String siteCd;					// 사이트코드
-	private String frontGb;					// 프론트구분
-	private String afLinkCd;				// 제휴링크코드
-	private String sbagEncloseYn;			// 쇼핑백 동봉여부
-
-	// 주문 상세 관련
-	private String ordExchGb;				// 주문구분
-	private Long orgOrdDtlNo;				// 주문
-	private String supplyCompCd;			// 공급업체
-	private String formalGb;				// 정상이월구분
-	private String setYn;					// 세트여부
-	private Integer tagPrice;				// tag가
-	private Integer listPrice;				// 정상가
-	private Integer currPrice;				// 현재가
-	private String dcRate;					// 할인율
-	private Integer ordQty;					// 주문수량
-	private Integer ordAmt;					// 주문금액
-	private Integer cnclRtnQty;				// 취소반품 수량
-	private Integer cnclRtnAmt;				// 취소반품 금액
-	private String goodsCpnSq;				// 상품쿠폰 일련번호
-	private Integer goodsCpnDcAmt;			// 상품쿠폰 할인금액
-	private String cartCpnSq;				// 장바구니쿠폰 일련번호
-	private Integer cartCpnDcAmt;			// 장바구니쿠폰 할인 금액
-	private Integer pntDcAmt;				// 포인트 할인 금액
-	private Integer prePntDcAmt;			// 선 포인트 할인 금액
-	private Integer savePntAmt;				// 적입 예정 포인트
-	private Integer realOrdAmt;				// 실제 주문 결제 금액
-	private Integer totRealOrdAmt;			// 총 상품 실결제 금액
-	private String vendorId;				// 벤더ID
-	private String extmallId;				// 외부몰ID
-	private String agentOrderId;			// 에이전트주문번호
-	private String extmallOrderId;			// 외부몰주문번호(쇼핑몰주문번호)
-	private String ordDtlStat;				// 주문상세상태(공통코드G013)
-	private String ordDtlStatNm;			// 주문상세상태명(공통코드G013)
-	private String exchangableYn;			// 교환가능여부(Y:교환가능)
-	private String exchangeFeeFreeYn;		// 교환배송비무료여부(Y:교환배송비무료)
-	private String returnableYn;			// 반품가능여부(Y:반품가능)
-	private String returnFeeFreeYn;			// 반품배송비무료여부(Y:반품배송비무료)
-	private String soldoutYn;				// 결품여부(Y:결품)
-	private String soldoutMemo;				// 결품메모
-	private String soldoutRegId;			// 결품등록자ID
-	private String soldoutRegDt;			// 결품등록일시
-	private String delvAddrSq;				// 배송지일련번호(배송지)
-	private String delvLocCd;				// 출고처코드(출고처)
-	private String delvAssignDt;			// 출고지정일시
-	private String delvAssignStat;			// 출고지정상태
-	private String dstrbtNote;				// 물류비고(물류담당자에게 공지)
-	private String delvStdt;				// 배송시작일시
-	private String delvEddt;				// 배송완료일시
-	private String invoiceNo;				// 송장번호
-	private String invoiceSendYn;			// 송장전송여부
-	private String sellFeeRate;				// 판매매장코드(판매매장)
-	private String ithrCd;					// 유입경로(공통코드G027)
-	private String contentsLoc;				// 컨텐츠위치(공통코드G028)
-	private Integer custCpnSq;				// 고객쿠폰 일련번호
-	private Integer buyLimitAmt;			// 구매제한금액
-	private Integer sumOrdQty;				// 전체주문수량
-	private Integer totCnclRtnQty;			// 전체 취소수량
-	private Integer totCnclRtnAmt;			// 전체 취소금액
-	private Integer totGoodsCpnDcAmt;		// 전체 상품쿠폰금액
-	private Integer totCartCpnDcAmt;		// 전체 장바구니쿠폰금액
-	private Integer totPntDcAmt;			// 전체 포인트금액
-	private Integer totPrePntDcAmt;			// 전체 선포인특므액
-	private String plusCpnSq;				// 플러스 쿠폰 일련번호 
-	private Integer plusCpnDcAmt;			// 플러스 쿠폰 할인금액
-	private Integer totPlusCpnDcAmt;		// 전체 플러스 쿠폰 할인금액
+	// Masking
 
-	// 주문 변경 관련
-	private String chgGb;					// 변경구분
-	private String chgerNm;					// 요청자명
-	private String chgReason;				// 변경요청사유
-	private String orgChgReason;
-	private String chgerBaseAddr;			// 회수기본주소
-	private String chgerDtlAddr;			// 회수상세주소
-	private String chgerAddr;				// 회수주소
-	private Long ordChgSq;					// 주문변경번호
-	private Integer chgQty;					// 변경수량
-	private Integer delvFee;				// 배송비
-	private Integer custShipAmt;			// 고객부담 배송비
-	private String chgStat;					// 변경상태
-	private String chgStatNm;				// 변경상태명
-
-	// 환불 관련
-	private Integer totCnclGoodsAmt;		// 총 취소 상품 금액
-	private Integer totCnclPointAmt;		// 총 취소 사용 포입트
-	private Integer totCnclCouponAmt;		// 총 취소 사용 쿠폰
-	private Integer totCnclGoodsRefundAmt;	// 총 취소 상품 환불금액
-	private Integer payAmt;					// 결제금액
-	private Integer paySq;					// 결제일련번호
-	private String delvFeeGb;				// 배송비 유형(10:원주문배송비,	20:재결제배송비, 30:교환배송비, 40:반품배송비)
-	private String delvUsacYn;				// 배송비 정산 여부
-	private String delvUsacDt;				// 배송비 정산 일시
-	private Integer refundAmt;				// 환불금액
-	private String raNm;					// 환불계좌예금주명
-	private String raNo;					// 환불계좌번호
-	private String raBank;					// 환불계좌은행
-	private String occurGb;					// 포인트 발생구분
-	private String occurDtlDesc;			// 포인트 발생 상세설명
-	private String pntUploadStat;			// 포인트 반영상태
-	private String pntUploadDt;				// 포인트 반영일시
-	private Integer pntAmt;					// 포인트금액
-	private Integer availPntAmt;			// 가용포인트 금액
-	private Integer accumPntAmt;			// 누적포인트 금액
-	private Integer usePntAmt;				// 사용포인트 금액
-	private Integer expirePntAmt;			// 소멸포인트 금액
-	private String delvPayGb;				// 배송결제구분
-	private String payStat;					// 결제상태
+	public String getMaskingRecipNm() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(this.recipNm) : this.recipNm;
+	}
 	
+	public String getMaskingChgerNm() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(this.chgerNm) : this.chgerNm;
+	}
 	
-	private String pgCnclTid;				// PG취소거래ID
-	private String pgTradeNo;				// PG
-	private String pgShopId;				// PG가맹정ID
-	private String pgResultCd;
-	private String pgResultMsg;
-	private String pgFulltext;
-	private String checkcardType;
-	private String cardKind;
-	private String cardBank;
-	private String cardNm;
-	private String cardMips;
-	private String cardPcableYn;
-	private String vaNo;
-	private String vaNm;
-	private String vaBank;
-	private String vaDeadline;
-	private String recipNm;
-	private String recipPhnno;
-	private String chgMemo;
-
-	// 상품관련
-	private String goodsCd;					// 상품코드
-	private String orgGoodsCd;				// 원상품코드
-	private String sizeCd;					// 사이즈코드
-	private String goodsNm;					// 상품명
-	private String imgPath1;				// 이미지경로1
-	private String imgPath2;				// 이미지경로2
-	private String imgPath4;				// 이미지경로4
-	private String imgPath5;				// 이미지경로5
-
-	// 재고정산 관련
-	private Integer sellQty;				// 판매수량
-	private String sellGb;					// 판매구분
-	private String occurDt;					// 발생일시
-	private String usacGb;					// 정산구분(공통코드G019)
-	private String prtnGb;					// 환입구분(공통코드G020). 정산구분이 "20:환입"일 때 사용
+	public String getMaskingChgerPhnno() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.phoneNo(this.chgerPhnno) : this.chgerPhnno;
+	}
+	
+	public String getMaskingChgerDtlAddr() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.address(this.chgerDtlAddr) : this.chgerDtlAddr;
+	}
+	
+	public String getMaskingOrdNm() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.name(this.ordNm) : this.ordNm;
+	}
 	
-	private Integer usacQty;				// 정산수량
-	private String orgUsacGb;
-	private String planSq;					// 기획전일련번호
+	public String getMaskingOrdPhnno() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.phoneNo(this.ordPhnno) : this.ordPhnno;
+	}
 
-	// 회수송장전송 관련
-	private String rtnLocNm;				// 수취인명
-	private String rtnLocTelno;				// 수취인휴대전화번호
-	private String rtnLocPostNo;			// 수취인우편번호
-	private String rtnLocBaseAddr;			// 수취인기본주소
-	private String rtnLocDtlAddr;			// 수취인상세주소
-	private String chgerPhnno;				// 송화인휴대전화번호
-	private String chgerPostNo;				// 송화인우편번호
-	private String wdInvoiceSendYn;			// 택배사 전송여부
-	private String withdrawRegFlag;			// 등록 여부
+	public String getMaskingOrdEmail() {
+		return TscSession.getAttribute("maskingYn").equals("Y") ? MaskingUtils.email(this.ordEmail) : this.ordEmail;
+	}
 
-	// 검색
-	private String searchType;				// 조회
-	private String searchText;				// 조회
-	private String stDate;					// 조회 시작 기간
-	private String edDate;					// 조회 종료 기간
-	private String dtlStDate;				// 상세조회 시작 기간
-	private String dtlEdDate;				// 상세조회 종료 기간
-	private String withdrawType;			// 회수상태
-	private String withdrawText;			//
-	private String delayDt;					// 회수지연일
-	private String delayDtType;				// 회수유형
-	private String goodsInfo;				// 상품정보(상품코드+사이즈코드)
 
-	private int seq;
-	private String goodsType;				// 상품유형
-	private int rfPntAmt;	//환원 포인트
-	private int rfPrePntAmt;	//취소 선포인트
-	private int rfGoodsCpnAmt;	//취소 상품쿠폰금액
-	private int rfCartCpnAmt;	//취소 장바구니쿠폰금액
-	private int rfPlusCpnAmt;	//취소 플러스쿠폰금액
-	private int rfSavePntAmt;
-	private int realOrdQty;
-	private int orgRealOrdAmt;
-	private int itemQty;	// 단품수량
-	private int itemPrice;	// 단품단가
-	*/
 
 }

+ 1 - 0
src/main/java/com/style24/persistence/domain/WmsWithdraw.java

@@ -28,6 +28,7 @@ public class WmsWithdraw extends TscBaseDomain {
 	private Integer recallno;			// 반품 번호 
 	private Integer orderexceptionno;	// 주문변경번호  
 	private String recalltypecd;		// 반품타입
+	private String recalltypecdnm;		// 반품타입
 	private String receiver;			// 받는자
 	private String receivertelnum;		// 받는자 전화번호
 	private String receivercellnum;		// 받는자 핸드폰 번호

+ 2 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsaWithdraw.xml

@@ -396,6 +396,7 @@
 		     , CASE WHEN WD_SHIP_STATE = '12' THEN   FN_GET_CODE_NM('G321', Z.WD_REASON_CD)
 		            WHEN WD_SHIP_STATE = '84' THEN   FN_GET_CODE_NM('G322', Z.WD_REASON_CD) ELSE '' END AS WD_REASON_CD_NM
 		     , FN_GET_CODE_NM('G685', Z.CHG_STAT) AS CHG_STAT_NM
+		     , CASE WHEN Z.WD_GB = 'W' THEN '회수요청' ELSE '직접배송' END AS WD_GB_NM 
 		FROM (
 		    SELECT A.*, ROW_NUMBER() OVER(ORDER BY  A.ORD_CHG_SQ, A.ORD_NO DESC, A.ORD_DTL_NO )  RNUM 
 		    FROM ( 
@@ -447,7 +448,7 @@
 						WHERE  1=1 
 						<include refid="getWithdrawDirectiveCondition_sql"/>
 					) A
-				ORDER BY A.ORD_CHG_SQ, A.ORD_NO DESC, A.ORD_DTL_NO
+				ORDER BY A.ORD_CHG_SQ desc, A.ORD_NO DESC, A.ORD_DTL_NO
 				<include refid="getListPagingCondition_sql"/>
 	</select>
 

+ 1 - 0
src/main/java/com/style24/persistence/mybatis/wms/TsaWmsWithdraw.xml

@@ -42,6 +42,7 @@
 	<select id="getWmsWithdrawList" parameterType="WmsWithdraw" resultType="WmsWithdraw">
 		/* TsaWmsWithdraw.getWmsWithdrawList */
 		SELECT Z.*
+		, CASE WHEN Z.RecallTypeCd ='10' THEN '반품' ELSE '교환' END AS RecallTypeCdNm
 		FROM (
 		    SELECT A.*,  ROW_NUMBER() OVER (ORDER BY RecallNo DESC, RecallItemNo ) as RNUM 
 		    FROM (

+ 26 - 24
src/main/webapp/WEB-INF/views/withdraw/WithdrawDirectiveListForm.html

@@ -53,11 +53,11 @@
 							</td>
 							<th>주문번호</th>
 							<td>
-								<input type="text" class="w40p" name="ordNo" data-valid-type="integer" placeholder="" maxlength="20"/>
+								<input type="text" class="w40p" name="ordNo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="" maxlength="20"/>
 							</td>
 							<th>주문변경번호</th>
 							<td>
-								<input type="text" class="w40p" name="ordChgSq" data-valid-type="integer" placeholder="" maxlength="20"/>
+								<input type="text" class="w40p" name="ordChgSq" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="" maxlength="20"/>
 							</td>
 						</tr>
 						<tr>	
@@ -189,9 +189,7 @@
 			}
 		},
 		{headerName: "주문상세번호", 	field: "ordDtlNo", 		width: 100, cellClass: "text-center"},		
-		{headerName: "회수구분", 		field: "chgGb", 		width: 80, cellClass: "text-center",
-			cellRenderer: function (params) { return params.value == 'G680_30' ? '반품' : '교환'; }
-		},
+		{headerName: "회수구분", 		field: "chgGbNm", 		width: 80, cellClass: "text-center"},
 		
 		{headerName: "사유", 			field: "chgReasonNm", 	width: 150, cellClass: "text-left"},
 		{headerName: "회수요청일", 		field: "regDt", 	width: 100, cellClass: "text-center"},
@@ -199,17 +197,15 @@
 		{headerName: "상품코드", 		field: "goodsCd", 		width: 120, cellClass: "text-center",
 			cellRenderer: function(params) { return gagajf.isNull(params.value) ? '' : '<a href="javascript:void(0);">' + params.value + '</a>'; }
 		},
-		{headerName: "상품명", 		field: "goodsNm", 		width: 200, cellClass: "text-left"},
+		{headerName: "상품명", 			field: "goodsNm", 		width: 200, cellClass: "text-left"},
 		{headerName: "수량", 			field: "chgQty", 		width: 80, cellClass: "text-center"},
-		{headerName: "반품방식", 		field: "wdGb", 			width: 80, cellClass: "text-center",
-			cellRenderer: function (params) { return params.value == 'W' ? '방문회수' : '직접배송'; }
-		},
-		{headerName: "택배사전송", 	field: "sendYn", 		width: 80, cellClass: "text-center"},
+		{headerName: "반품방식", 		field: "wdGbNm", 			width: 80, cellClass: "text-center"},
+		{headerName: "택배사전송", 		field: "sendYn", 		width: 80, cellClass: "text-center"},
 		{headerName: "회수송장번호", 	field: "wdInvoiceNo", 	width: 100, cellClass: "text-center"},
 		{headerName: "회수상태", 		field: "wdShipStateNm", width: 120, cellClass: "text-center"},
 		{headerName: "회수상태수신일시", field: "wdStateDt", 	width: 120, cellClass: "text-center"},
-		{headerName: "미회수사유", 	field: "wdReasonCdNm", 	width: 100, cellClass: "text-center"},
-		{headerName: "재회수지시", 	field: "wdShipState", 		width: 100,	cellClass: 'text-center',
+		{headerName: "미회수사유", 		field: "wdReasonCdNm", 	width: 100, cellClass: "text-center"},
+		{headerName: "재회수지시", 		field: "wdShipState", 		width: 100,	cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return params.value == '12' && params.data.chgStat == 'G685_30' ? '<button type="button" class="btn btn-base btn-sm" onclick="fnReRecallOrder(\'' + params.data.chgGb + '\',\'' + params.data.ordDtlNo + '\',\''+params.data.ordChgSq+'\',\''+params.data.ordNo+'\');">&nbsp;재회수지시&nbsp;</button>' : "";
 			}
@@ -219,22 +215,22 @@
 		{headerName: "배송종료일시", 	field: "wdEddt", 		width: 120, cellClass: "text-center"},
 		{headerName: "수취인명", 		field: "recipNm", 		width: 120, cellClass: "text-center"},
 		
-		{headerName: "LMS", 			field: "chgerPhnno", 	width: 80, cellClass: "text-center",
+		{headerName: "LMS", 			field: "maskingChgerPhnno", 	width: 80, cellClass: "text-center",
 			cellRenderer: function(params) {
 				return '<button type="button" class="btn btn-base btn-sm" onclick="fnLms(\'' + params.data.chgerPhnno + '\',\'' + params.data.custNo + '\');">&nbsp;LMS&nbsp;</button>';
 			}			
 		},
 		
 		
-		{headerName: "변경자명", 		field: "chgerNm", 		width: 100, cellClass: "text-center"},
-		{headerName: "변경자휴대전화", 	field: "chgerPhnno", 	width: 120, cellClass: "text-center"},
-		{headerName: "변경자우편번호", 	field: "chgerZipcode", 	width: 120, cellClass: "text-center"},
-		{headerName: "변경자기본주소", 	field: "chgerBaseAddr", width: 300, cellClass: "text-left"},
-		{headerName: "변경자상세주소", 	field: "chgerDtlAddr", 	width: 200, cellClass: "text-left"},
-		{headerName: "주문자명", 		field: "ordNm", 		width: 100, cellClass: "text-center"},
-		{headerName: "주문자휴대전화", 	field: "ordPhnno", 		width: 120, cellClass: "text-center"},
-		{headerName: "주문자전화번호", 	field: "ordTelno", 		width: 120, cellClass: "text-center"},
-		{headerName: "주문자이메일", 	field: "ordEmail", 		width: 120, cellClass: "text-left"}
+		{headerName: "보내시는분", 			field: "maskingChgerNm", 		width: 100, cellClass: "text-center"},
+		{headerName: "반품회수지휴대전화", 	field: "maskingChgerPhnno", 	width: 120, cellClass: "text-center"},
+		{headerName: "반품회수지우편번호", 	field: "chgerZipcode", 			width: 120, cellClass: "text-center"},
+		{headerName: "반품회수지기본주소", 	field: "chgerBaseAddr", 		width: 300, cellClass: "text-left"},
+		{headerName: "변경자상세주소", 		field: "maskingChgerDtlAddr", 	width: 200, cellClass: "text-left"},
+		{headerName: "주문자명", 			field: "maskingOrdNm", 			width: 100, cellClass: "text-center"},
+		{headerName: "주문자휴대전화", 		field: "maskingOrdPhnno", 		width: 120, cellClass: "text-center"},
+		{headerName: "주문자전화번호", 		field: "ordTelno", 				width: 120, cellClass: "text-center"},
+		{headerName: "주문자이메일", 		field: "maskingOrdEmail", 		width: 120, cellClass: "text-left"}
 	];
 
 	var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
@@ -268,8 +264,7 @@
 	
 	// 조회
 	$('#btnSearch').on('click', function() {
-		// Fetch data
-		//gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
+		$("#searchForm input[name=pageNo]").val('1');
 		fnSearchList();
 	});
 
@@ -325,6 +320,13 @@
 		
 	}
 	
+	// 페이징
+	$('#searchForm select[name=pageSize]').on('change', function() {
+		$("#searchForm input[name=pageNo]").val('1');
+		fnSearchList();
+	});
+	
+	
 	/*************************************************************************
 	*  재회수지시
 	**************************************************************************/	

+ 9 - 4
src/main/webapp/WEB-INF/views/withdraw/WmsWithdrawListForm.html

@@ -71,7 +71,7 @@
 							<td class="dashR">
 								<select name="recalltypecd" id="recalltypecd" class="w100">
 									<option value="" selected>전체</option>
-									<option value="10">반</option>
+									<option value="10">반</option>
 									<option value="20">교환</option>
 								</select>
 							</td>
@@ -157,9 +157,7 @@
 		},
 		{headerName: "주문상세번호",		field: "orderdtlno",		width: 100,	cellClass: 'text-center'},
 		{headerName: "상태",				field: "statuscd",			width: 100,	cellClass: 'text-center'},
-		{headerName: "반품구분",			field: "recalltypecd",		width: 80,	cellClass: 'text-center',
-			cellRenderer: function (params) { return params.value == '10' ? '일반' : '교환'; }	
-		},
+		{headerName: "반품구분",			field: "recalltypecdnm",	width: 80,	cellClass: 'text-center'},
 		{headerName: "수취인",			field: "receiver",			width: 100,	cellClass: 'text-center'},
 		{headerName: "수취인전화번호",	field: "receivertelnum",	width: 120,	cellClass: 'text-center'},
 		{headerName: "수취인휴대폰번호",	field: "receivercellnum",	width: 120,	cellClass: 'text-center'},
@@ -227,6 +225,7 @@
 	*  조회 버튼 클릭 시
 	**************************************************************************/
 	$('#btnSearch').on('click', function() {
+		$("#searchForm input[name=pageNo]").val('1');
 		fnSearchList();
 	});
 
@@ -268,6 +267,12 @@
 		
 	}
 	
+	// 페이징
+	$('#searchForm select[name=pageSize]').on('change', function() {
+		$("#searchForm input[name=pageNo]").val('1');
+		fnSearchList();
+	});
+	
 	/*************************************************************************
 	*  달력 초기화 
 	**************************************************************************/