Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/dao/TsaRendererDao.java

@@ -99,6 +99,17 @@ public interface TsaRendererDao {
 	 */
 	Collection<CommonCode> getDeliveryLocList(DeliveryLoc delvLoc);
 
+	/**
+	 * 출고처 자사 전체 목록
+	 * @param delvLoc - 출고처 정보
+	 * @return 출고처 목록
+	 * @author moon
+	 * @since 2021. 07. 12
+	 */
+	Collection<CommonCode> getDeliveryLocAllList();
+	
+	
+	
 //	/**
 //	 * 정보고시 목록
 //	 * @param goodsCd

src/main/java/com/style24/admin/biz/dao/TsaWithdrawDao.java

@@ -169,136 +169,7 @@ public interface TsaWithdrawDao {
 	 */
 	Collection<Withdraw> getOrdChgDtlList(Withdraw withdraw);
 	
-	
-	
-	/**
-	 * 회수등록 - 조회(송장번호용)
-	 * 
-	 * @param Withdraw
-	 * @return Collection<Withdraw>
-	 * @author yujung
-	 * @since 2020. 02. 11
-	 */
-	//Collection<Withdraw> getWithdrawRegisterInvoiceList(Withdraw withdraw);
-
-	/**
-	 * 회수등록 - 조회(상품코드용)
-	 * 
-	 * @param Withdraw
-	 * @return Collection<Withdraw>
-	 * @author yujung
-	 * @since 2020. 02. 12
-	 */
-	//Collection<Withdraw> getWithdrawRegisterGoodsList(Withdraw withdraw);
-
-	/**
-	 * 회수등록 - 회수 마스터 등록처리
-	 * 
-	 * @param Withdraw
-	 * @author yujung
-	 * @since 2020. 02. 12
-	 */
-	//void saveWithdrawInfo(Withdraw withdraw);
-
-	/**
-	 * 회수등록 - 회수 상세 등록처리
-	 * 
-	 * @param Withdraw
-	 * @author yujung
-	 * @since 2020. 02. 12
-	 */
-	//void createWithdrawDetailInfo(Withdraw withdraw);
-
-	/**
-	 * 주문변경 마스터 회수종료일 저장
-	 * 
-	 * @param Withdraw
-	 * @author yujung
-	 * @since 2020. 02. 12
-	 */
-	//void updateOrderChangeInfo(Withdraw withdraw);
-
-	/**
-	 * 회수송장번호 수정
-	 * 
-	 * @param withdraw
-	 * @author yujung
-	 * @since 2020. 02. 27
-	 */
-	//void updateRegisterWdInvoiceNo(Withdraw withdraw);
-
-	/**
-	 * 회수송장번호 조회
-	 * 
-	 * @param withdraw
-	 * @author yujung
-	 * @since 2020. 05. 31
-	 */
-	//Collection<Withdraw> getWdInvoiceNo(Withdraw withdraw);
-
-	/**
-	 * 회수관리 회수데이터 삭제처리
-	 * 
-	 * @param withdraw
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	void deleteWithdraw(Withdraw withdraw);
-
-	/**
-	 * 회수관리 회수 상세 데이터 삭제처리
-	 * 
-	 * @param withdraw
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	void deleteWithdrawDetail(Withdraw withdraw);
-
-	/**
-	 * 환불등록 팝업 목록
-	 * 
-	 * @param withdraw
-	 * @return Collection<Withdraw>
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	Collection<Withdraw> getRefundRegisterPopupList(Withdraw withdraw);
-	//Collection<Withdraw> getWithdrawRegisterPopupList(Withdraw withdraw);
-	/**
-	 * 회수관리 아웃바운드 수정
-	 * 
-	 * @param withdraw
-	 * @author yujung
-	 * @since 2020. 03. 25
-	 */
-	//void updateWithdrawOutbound(Withdraw withdraw);
 
-	/**
-	 * 주문변경 수정
-	 * 
-	 * @param withdraw
-	 * @author yujung
-	 * @since 2020. 03. 25
-	 */
-	//void updateWithdrawOrderChange(Withdraw withdraw);
-
-	/**
-	 * 회수상세 상품정보 수정
-	 * 
-	 * @param withdraw
-	 * @author yujung
-	 * @since 2020. 03. 25
-	 */
-	//void updateWithdrawDetailGoodsInfo(Withdraw withdraw);
-
-	/**
-	 * 회수상세 정보 수정
-	 * 
-	 * @param withdraw
-	 * @author yujung
-	 * @since 2020. 03. 25
-	 */
-	//void updateWithdrawDetailInfo(Withdraw withdraw);
 
 	/**
 	 * 환불관리 - 상세 정보 조회
@@ -310,299 +181,8 @@ public interface TsaWithdrawDao {
 	 */
 	Collection<Withdraw> getRefundDetailList(Withdraw withdraw);
 
-	/**
-	 * 회수배송비 등록
-	 * 
-	 * @param withdraw - 회수배송비 정보
-	 * @author yujung
-	 * @since 2020. 02. 20
-	 */
-	//void createWithdrawDeliveryFeeInfo(Withdraw withdraw);
-
-	/**
-	 * 쿠폰정보 조회
-	 * 
-	 * @param withdraw - 쿠폰정보
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	Withdraw getCouponInfo(Withdraw withdraw);
-
-	/**
-	 * 남은주문 리스트
-	 * 
-	 * @param withdraw - 주문번호, 주문변경번호
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	Collection<Withdraw> getWithdrawRemainOrderDetailList(Withdraw withdraw);
-
-	/**
-	 * 회원포인트 이력 등록
-	 * 
-	 * @param withdraw - 회원 포인트 정보
-	 * @author yujung
-	 * @since 2020. 02. 24
-	 */
-	//void createWithdrawCustPointHst(Withdraw withdraw);
-
-	/**
-	 * 회원포인트 조회
-	 * 
-	 * @param custNo
-	 * @author yujung
-	 * @since 2020. 02. 24
-	 */
-	//Withdraw getCustPointInfo(int custNo);
-
-	/**
-	 * 회원포인트 수정
-	 * 
-	 * @param withdraw - 포인트정보
-	 * @author yujung
-	 * @since 2020. 02. 24
-	 */
-	//void updateWithdrawCustPoint(Withdraw withdraw);
-
-	/**
-	 * 주문상세정보 수정
-	 * 
-	 * @param withdraw - 주문상세 정보
-	 * @author yujung
-	 * @since 2020. 02. 20
-	 */
-	//void updateWithdrawOrderDetailInfo(Withdraw withdraw);
-
-	/**
-	 * 주문상세이력 등록
-	 * 
-	 * @param withdraw - 주문상세번호
-	 * @author yujung
-	 * @since 2020. 02. 20
-	 */
-	//void createWithdrawOrderDetailHstInfo(Withdraw withdraw);
-
-	/**
-	 * 주문상세이력 등록2
-	 * 
-	 * @param withdraw - 주문상세번호
-	 * @author yujung
-	 * @since 2020. 02. 20
-	 */
-	//void createWithdrawOrderDetailHstInfo2(Withdraw withdraw);
-
-	/**
-	 * 주문변경상세 수정
-	 * 
-	 * @param withdraw - 주문상세번호
-	 * @author yujung
-	 * @since 2020. 02. 20
-	 */
-	//void updateWithdrawOrderChangeDetailInfo(Withdraw withdraw);
-
-	/**
-	 * 정산 등록
-	 * 
-	 * @param withdraw - 정산 정보
-	 * @author yujung
-	 * @since 2020. 02. 21
-	 */
-	//void createWithdrawUsac(Withdraw withdraw);
-
-	/**
-	 * 판매분재고 등록
-	 * 
-	 * @param withdraw - 판매분재고 정보
-	 * @author yujung
-	 * @since 2020. 02. 21
-	 */
-	//void createWithdrawSellQty(Withdraw withdraw);
-
-	/**
-	 * 환불정보 계산
-	 * 
-	 * @param ordNo
-	 * @return Withdraw
-	 * @author yujung
-	 * @since 2020. 02. 21
-	 */
-	//Withdraw getRefundInfo(Long ordNo);
-
-	/**
-	 * 주문마스터 수정
-	 * 
-	 * @param withdraw - 주문상태
-	 * @author yujung
-	 * @since 2020. 02. 24
-	 */
-	//void updateWithdrawOrderInfo(Withdraw withdraw);
-
-	/**
-	 * 환불정보 등록
-	 * 
-	 * @param withdraw - 환불정보
-	 * @author yujung
-	 * @since 2020. 02. 21
-	 */
-	//void createWithdrawRefund(Withdraw withdraw);
-
-	/**
-	 * 결제정보 조회
-	 * 
-	 * @param ordNo - 결제정보
-	 * @return Withdraw
-	 * @author yujung
-	 * @since 2020. 02. 24
-	 */
-	//Withdraw getPaymentInfo(Long ordNo);
-
-	/**
-	 * 기존결제 정보 수정
-	 * 
-	 * @param withdraw - 결제정보
-	 * @author yujung
-	 * @since 2020. 02. 25
-	 */
-	//void updateWithdrawPayment(Withdraw withdraw);
-
-	/**
-	 * 결제정보 등록
-	 * 
-	 * @param withdraw - 결제정보
-	 * @author yujung
-	 * @since 2020. 02. 21
-	 */
-	//void createWithdrawPayment(Withdraw withdraw);
-
-	/**
-	 * 남은 상품 정보
-	 * 
-	 * @param withdraw
-	 * @return Withdraw
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	Withdraw getRemainGoodsInfo(Withdraw withdraw);
 
-	/**
-	 * 남은 회수 수량
-	 * 
-	 * @param ordChgSq
-	 * @return 남은회수수량
-	 * @author yujung
-	 * @since 2020. 02. 20
-	 */
-	//int getRemainWithdrawCount(Long ordChgSq);
-
-	/**
-	 * 취소가 아닌 수량
-	 * 
-	 * @param
-	 * @throws DataAccessException
-	 * @author swkim
-	 * @since 2020. 04. 14
-	 */
-	//public int getOrderNotCancelCnt(Long ordNo);
 
-	/**
-	 * 동봉비 수정
-	 * 
-	 * @param
-	 * @throws DataAccessException
-	 * @author swkim
-	 * @since 2020. 04. 14
-	 */
-	//public void updateWithdrawEncloseFee(Withdraw withdraw);
 
-	/**
-	 * 반품 매출반영 차수
-	 * 
-	 * @param delvLocCd
-	 * @return 반품 매출반영 차수
-	 * @author yujung
-	 * @since 2020. 02. 20
-	 */
-	//int getIfOnlineSalesMaxOutSeq(String delvLocCd);
 
-	/**
-	 * 반품 매출반영
-	 * 
-	 * @param
-	 * @throws DataAccessException
-	 * @author swkim
-	 * @since 2020. 05. 11
-	 */
-	//public void createReturnIfOnlineSales(Withdraw withdraw);
-
-	/**
-	 * 주문번호에 대한 합계 금액
-	 * 
-	 * @param withdraw
-	 * @return Withdraw
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	Withdraw getOrderDetailSumAmt(String ordNo);
-
-	/**
-	 * 환불완료 목록
-	 * 
-	 * @param 검색조건
-	 * @return Collection<Withdraw>
-	 * @author yujung
-	 * @since 2020. 05. 29
-	 */
-	//Collection<Withdraw> getRefundCompleteList(Withdraw withdraw);
-
-	/**
-	 * 반품신청, 회수수량 비교 데이터
-	 * 
-	 * @param 검색조건
-	 * @return Withdraw
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	Withdraw getSumChgQtyWdQty(Withdraw withdraw);
-
-	/**
-	 * ERP 환입매출 반영
-	 * 
-	 * @param 검색조건
-	 * @return Withdraw
-	 * @author cjs
-	 * @since 2020. 08. 04
-	 */
-	//void createIfEcpTbSalesReturn(Withdraw withdraw);
-
-	/**
-	 * 교환출고처 지정대기를 출고처예정상태로 변경
-	 * 
-	 * @param 검색조건
-	 * @return Withdraw
-	 * @author cjs
-	 * @since 2020. 08. 04
-	 */
-	//void updateExchangeLocAssignStatus(Withdraw withdraw);
-
-	/**
-	 * 아이템 단위 상세정보
-	 * 
-	 * @param 검색조건
-	 * @return Withdraw
-	 * @author cjs
-	 * @since 2020. 08. 04
-	 */
-	//Collection<Withdraw> getWithdrawDetailList2(Withdraw withdraw);
-
-	/**
-	 * 교환배송비 등록
-	 * 
-	 * @param TsaOrder
-	 * @return
-	 * @author cjs
-	 * @since 2020. 08. 23
-	 */
-	//void mergeDeliveryFee(TsaOrder setParams);
-
-	
 }

src/main/java/com/style24/admin/biz/service/TsaDeliveryService.java

@@ -272,11 +272,13 @@ public class TsaDeliveryService {
 		}
 		coreDeliveryService.cancelSoldout(ordSoldoutList,userNo, "N"); 
 		
+		/*
 		for(Delivery data : soldoutList) {
 			data.setSoldoutMemo("수동 품절처리");
 			data.setUpdNo(userNo);
 			deliveryDao.updateSoldOut(data);
 		}
+		*/
 		
 	}	
 	
@@ -473,11 +475,12 @@ public class TsaDeliveryService {
 			Integer productNo = item.getProductNo();
 			String skuCode    = item.getOptCd();
 			String styleCd    = item.getGoodsCd();
+			String itemCd     = item.getItemCd();
 			String colorCd    = item.getOptCd1();
 			String sizeCd     = item.getOptCd2();
 			supplyCompCd = item.getSupplyCompCd();
 			// 실재고 조회 
-			Collection<WmsDelivery> stockList = wmsService.getRealStock(productNo, skuCode, styleCd, colorCd, sizeCd);
+			Collection<WmsDelivery> stockList = wmsService.getRealStock(productNo, skuCode, itemCd, colorCd, sizeCd);
 			
 			if(stockList != null ) {
 				for(WmsDelivery relStock : stockList) {

src/main/java/com/style24/admin/biz/service/TsaRendererService.java

@@ -332,6 +332,19 @@ public class TsaRendererService {
 		return rendererDao.getDeliveryLocList(delvLoc);
 	}
 
+	/**
+	 * 출고처 자사 전체 목록
+	 * @param delvLoc - 출고처 정보
+	 * @return 출고처 목록
+	 * @author gagamel
+	 * @since 2020. 11. 4
+	 */
+	public Collection<CommonCode> getDeliveryLocAllList() {
+		return rendererDao.getDeliveryLocAllList();
+	}
+	
+	
+	
 //	/**
 //	 * 출고처 목록
 //	 * @return 출고처 목록

src/main/java/com/style24/admin/biz/service/TsaWithdrawService.java

@@ -335,26 +335,6 @@ public class TsaWithdrawService {
 
 
 
-	/**
-	 * 환불관리 회수데이터 삭제처리
-	 *
-	 * @param
-	 * @return
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	@Transactional("shopTxnManager")
-	public void deleteWithdrawInfo(Withdraw withdraw) {
-		Withdraw search = new Withdraw();
-		search.setWdInvoiceNo(withdraw.getWdInvoiceNo());
-		Collection<Withdraw> withdrawList = withdrawDao.getRefundList(search);
-		// 마지막 회수 리스트 일 때 마스터 정보 삭제
-		if (withdrawList.size() == 1) {
-			withdrawDao.deleteWithdraw(withdraw);
-		}
-
-		withdrawDao.deleteWithdrawDetail(withdraw);
-	}
 
 	/**
 	 * 환불관리 상세정보
@@ -368,41 +348,9 @@ public class TsaWithdrawService {
 		return withdrawDao.getRefundDetailList(withdraw);
 	}
 
-	/**
-	 * 환불관리 남은상품정보
-	 *
-	 * @param withdraw - 변경주문번호, 주문번호
-	 * @return
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	public Withdraw getRemainGoodsInfo(Withdraw withdraw) {
-		return withdrawDao.getRemainGoodsInfo(withdraw);
-	}
 
-	/**
-	 * 환불관리 남은상품리스트
-	 *
-	 * @param withdraw - 변경주문번호, 주문번호
-	 * @return
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	public Collection<Withdraw> getWithdrawRemainOrderDetailList(Withdraw withdraw) {
-		return withdrawDao.getWithdrawRemainOrderDetailList(withdraw);
-	}
 
-	/**
-	 * 회수관리 쿠폰정보
-	 *
-	 * @param withdraw - 변경주문번호, 주문번호
-	 * @return
-	 * @author moon
-	 * @since 2020. 11. 15
-	 */
-	public Withdraw getCouponInfo(Withdraw withdraw) {
-		return withdrawDao.getCouponInfo(withdraw);
-	}
+
 
 
 	/**
@@ -532,40 +480,6 @@ public class TsaWithdrawService {
 		}
 	}
 
-	/**
-	 * 환불관리 - 주문번호 전체 금액
-	 *
-	 * @param ordNo
-	 * @return
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	public Withdraw getOrderDetailSumAmt(String ordNo) {
-		return withdrawDao.getOrderDetailSumAmt(ordNo);
-	}
 
-	/**
-	 * 환불목록
-	 *
-	 * @param withdraw
-	 * @return Withdraw List
-	 * @author yujung
-	 * @since 2020. 05. 29
-	 */
-//	public Collection<Withdraw> getRefundCompleteList(Withdraw withdraw) {
-//		return withdrawDao.getRefundCompleteList(withdraw);
-//	}
-
-	/**
-	 * 반품신청, 회수수량 비교 데이터
-	 *
-	 * @param withdraw
-	 * @return Withdraw
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	public Withdraw getSumChgQtyWdQty(Withdraw withdraw) {
-		return withdrawDao.getSumChgQtyWdQty(withdraw);
-	}
 
 }

src/main/java/com/style24/admin/biz/web/TsaDeliveryController.java

@@ -75,13 +75,13 @@ public class TsaDeliveryController extends TsaBaseController {
 		// 주문상세상태코드
 		mav.addObject("ordDtlStatList", rendererService.getAvailCommonCodeList("G013"));
 		// 출고처
-		mav.addObject("deliveryLocList", rendererService.getDeliveryLocList(""));
+		mav.addObject("deliveryLocList", rendererService.getDeliveryLocAllList());
 		// 사이트구분
 		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));
 		// 택배사명 목록
 		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
 		// 출고처분류
-		mav.addObject("delvTypeList", rendererService.getAvailCommonCodeList("G024"));
+		// mav.addObject("delvTypeList", rendererService.getAvailCommonCodeList("G024"));
 		
 		String supplyCompCd = "";
 		if ("G001_B000".equals(TsaSession.getInfo().getRoleCd())) {
@@ -89,7 +89,7 @@ public class TsaDeliveryController extends TsaBaseController {
 		}
 		
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList(supplyCompCd));
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList("","Y"));
         //mav.addObject("vendorList", rendererService.getVendorCommonCodeList(TsaSession.getInfo().getRoleCd()));
 
 		mav.setViewName("delivery/DeliveryListForm");
@@ -248,10 +248,10 @@ public class TsaDeliveryController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList("","Y"));
 		// 출고처 목록
-		DeliveryLoc deliLoc = new DeliveryLoc(); 
-		mav.addObject("getDeliveryLocList", rendererService.getDeliveryLocList(deliLoc));
+		mav.addObject("getDeliveryLocList", rendererService.getDeliveryLocAllList());
+		
 		mav.setViewName("delivery/BangoodsListForm");
 
 		return mav;
@@ -304,10 +304,10 @@ public class TsaDeliveryController extends TsaBaseController {
 		ModelAndView mav = new ModelAndView();
 
 		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
+		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList("","Y"));
 		// 출고처 목록
-		DeliveryLoc deliLoc = new DeliveryLoc();
-		mav.addObject("getDeliveryLocList", rendererService.getDeliveryLocList(deliLoc));
+		mav.addObject("getDeliveryLocList", rendererService.getDeliveryLocAllList());
+		
 		// 상품상태
 		mav.addObject("goodsStatList", rendererService.getAvailCommonCodeList("G008"));
 
@@ -418,8 +418,7 @@ public class TsaDeliveryController extends TsaBaseController {
 		mav.addObject("deliveryLocList", rendererService.getDeliveryLocList(""));
 		// 사이트구분
 		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));
-		// 정상이월
-		mav.addObject("formalGbList", rendererService.getAvailCommonCodeList("G009"));
+
 		
 		
 		mav.setViewName("delivery/AssignListForm");

src/main/java/com/style24/admin/biz/web/TsaWithdrawController.java

@@ -173,7 +173,7 @@ public class TsaWithdrawController extends TsaBaseController {
 	}
 
 	/**
-	 * 환불관리상세 - 회수처리
+	 * 환불관리상세 - 환불
 	 * 
 	 * @param withdraw
 	 * @return GagaResponse
@@ -432,283 +432,6 @@ public class TsaWithdrawController extends TsaBaseController {
 		withdrawService.reRecallOrder(param);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
-	
-	
-	
-	/**
-	 * 회수등록 화면
-	 * 
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 02. 10
-	 */
-//	@RequestMapping(value = "/register/form")
-//	public ModelAndView withdrawRegisterForm() throws Exception {
-//		ModelAndView mav = new ModelAndView();
-//
-//		// 택배사명 목록
-//		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
-//
-//		// 회수요청사유
-//		mav.addObject("wdReqReasonList", rendererService.getAvailCommonCodeList("G688"));
-//
-//		mav.setViewName("withdraw/WithdrawRegisterTriForm");
-//
-//		return mav;
-//	}
-
-	/**
-	 * 회수등록 - 조회(송장번호용)
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 02. 11
-	 */
-//	@PostMapping("/register/invoicelist")
-//	@ResponseBody
-//	public Collection<Withdraw> getWithdrawRegisterInvoiceList(@RequestBody Withdraw withdraw) {
-//		Collection<Withdraw> dataList = withdrawService.getWithdrawRegisterInvoiceList(withdraw);
-//		return dataList;
-//	}
-
-	/**
-	 * 회수등록 - 조회(상품코드용)
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 02. 12
-	 */
-//	@PostMapping("/register/goodslist")
-//	@ResponseBody
-//	public Collection<Withdraw> getWithdrawRegisterGoodsList(@RequestBody Withdraw withdraw) {
-//
-//		log.debug("goodsCd = {} ", withdraw.getGoodsCd());
-//		Collection<Withdraw> dataList = withdrawService.getWithdrawRegisterGoodsList(withdraw);
-//		return dataList;
-//	}
-
-	/**
-	 * 회수등록 - 등록처리
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 02. 12
-	 */
-//	@PostMapping("/register/create")
-//	@ResponseBody
-//	public GagaResponse createWithdrawInfo(@RequestBody Collection<Withdraw> withdrawList) {
-//		Withdraw withdraw = withdrawList.iterator().next();
-//		String goodsCd = withdraw.getGoodsCd();
-//		withdraw.setGoodsCd(null);
-//		//withdraw.setOrdNo(null);
-//		Collection<Withdraw> withdrawCount = withdrawService.getWithdrawRegisterList(withdraw);
-//		withdraw.setGoodsCd(goodsCd);
-//
-//		if (CollectionUtils.isEmpty(withdrawCount)) {
-//			withdrawService.createWithdrawInfo(withdrawList);
-//		} else {
-//			return super.error("이미 등록된 회수송장번호가 존재합니다.");
-//		}
-//
-//		log.debug("withdraw = {}", withdrawList);
-//
-//		return super.ok(message.getMessage("SUCC_0001"));
-//	}
-
-	/**
-	 * 회수송장번호 변경 팝업 화면
-	 * 
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 02. 27
-	 */
-//	@RequestMapping(value = "/register/wdinvoicenochange/form")
-//	public ModelAndView wdInvoiceNoChangeForm() throws Exception {
-//		ModelAndView mav = new ModelAndView();
-//
-//		mav.setViewName("withdraw/WdInvoiceNoChange");
-//
-//		return mav;
-//	}
-
-	/**
-	 * 회수송장번호 변경
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 02. 27
-	 */
-//	@PostMapping("/register/withdrawinvoiceno/update")
-//	@ResponseBody
-//	public GagaResponse updateRegisterWdInvoiceNo(@RequestBody Withdraw withdraw) {
-//		withdrawService.updateRegisterWdInvoiceNo(withdraw);
-//		return super.ok(message.getMessage("SUCC_0002"));
-//	}
-
-
-
-	/**
-	 * 환불관리 회수 데이터 삭제처리
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author moon
-	 * @since 2020. 11. 16
-	 */
-	@PostMapping(value = "/refund/Withdraw/delete")
-	@ResponseBody
-	public GagaResponse deleteWithdrawInfo(@RequestBody Withdraw withdraw) {
-		withdrawService.deleteWithdrawInfo(withdraw);
-		return super.ok(message.getMessage("SUCC_0003"));
-	}
-
-	/**
-	 * 회수등록 팝업 화면
-	 * 
-	 * @param
-	 * @return 회수등록 팝업 화면
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 03. 03
-	 */
-//	@GetMapping("/register/popup/form")
-//	@ResponseBody
-//	public ModelAndView withdrawRegisterPopupForm(Withdraw withdraw) {
-//		ModelAndView mav = new ModelAndView();
-//
-//		mav.addObject("wdInvoiceNo", withdraw.getWdInvoiceNo());
-//
-//		mav.addObject("goodsCd", withdraw.getGoodsCd());
-//
-//		mav.addObject("sizeCd", withdraw.getSizeCd());
-//
-//		if (StringUtils.isNotBlank(withdraw.getOrdDtlNo().toString())) {
-//			mav.addObject("ordDtlNo", withdraw.getOrdDtlNo());
-//		}
-//
-//		// 주문상세 상태
-//		mav.addObject("ordDtlStatList", rendererService.getAvailCommonCodeList("G013"));
-//
-//		mav.setViewName("withdraw/WithdrawRegisterPopupForm");
-//		return mav;
-//	}
-
-
-	/**
-	 * 회수등록 팝업 목록
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 03. 03
-	 */
-//	@PostMapping("/register/popup/list")
-//	@ResponseBody
-//	public Collection<Withdraw> getWithdrawRegisterPopupList(@RequestBody Withdraw withdraw) {
-//		Collection<Withdraw> dataList = withdrawService.getWithdrawRegisterPopupList(withdraw);
-//		return dataList;
-//	}
-
-
-	/**
-	 * 회수등록팝업 주문매핑(송장번호 수정)
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 03. 03
-	 */
-//	@PostMapping("/register/popup/wdinvoiceno/update")
-//	@ResponseBody
-//	public GagaResponse updateOrderChangeWdInvoiceNo(@RequestBody Withdraw withdraw) {
-//		withdrawService.updateOrderChangeWdInvoiceNo(withdraw);
-//		return super.ok(message.getMessage("SUCC_0002"));
-//	}
-
-	/**
-	 * 회수등록팝업 주문매핑(주문상세일련번호 수정)
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author rladbwnd5
-	 * @since 2020. 03. 03
-	 */
-//	@PostMapping("/register/popup/orddtlno/update")
-//	@ResponseBody
-//	public GagaResponse updateWithdrawOrdDtlNo(@RequestBody Withdraw withdraw) {
-//		withdrawService.updateWithdrawOrdDtlNo(withdraw);
-//		return super.ok(message.getMessage("SUCC_0002"));
-//	}
-
-
-
-	/**
-	 * 회수송장전송목록 화면
-	 * 
-	 * @return ModelAndView
-	 * @throws Exception
-	 * @author Daehyoung
-	 * @since 2020. 02. 25
-	 */
-//	@RequestMapping(value = "/invoice/send/list/form")
-//	public ModelAndView invoiceSendListForm() throws Exception {
-//		ModelAndView mav = new ModelAndView();
-//
-//		// 사이트구분
-//		mav.addObject("siteCdList", rendererService.getAvailCommonCodeList("G000"));
-//
-//		mav.setViewName("withdraw/InvoiceSendListForm");
-//
-//		return mav;
-//	}
 
-	/**
-	 * 환불완료 화면
-	 * 
-	 * @return ModelAndView
-	 * @throws Exception
-	 * @author yujung
-	 * @since 2020. 05. 29
-	 */
-//	@RequestMapping(value = "/refundcomplete/list/form")
-//	public ModelAndView refundCompleteListListForm() throws Exception {
-//		ModelAndView mav = new ModelAndView();
-//
-//		mav.setViewName("withdraw/RefundCompleteListForm");
-//
-//		return mav;
-//	}
-
-	/**
-	 * 환불완료 목록
-	 * 
-	 * @param
-	 * @return
-	 * @throws Exception
-	 * @author yujung
-	 * @since 2020. 05. 29
-	 */
-//	@PostMapping("/refundcomplete/list")
-//	@ResponseBody
-//	public Collection<Withdraw> getRefundCompleteList(@RequestBody Withdraw withdraw) {
-//		Collection<Withdraw> dataList = withdrawService.getRefundCompleteList(withdraw);
-//		return dataList;
-//	}
-
-	
 
 }

src/main/java/com/style24/persistence/mybatis/shop/TsaDelivery.xml

@@ -109,8 +109,7 @@
 							, A.SALE_AMT       -- 판매금액
 							, A.REAL_ORD_AMT   -- 실결제금액
 							, A.ORD_DTL_STAT   -- 주문상세상태
-							, FN_GET_CODE_NM('G024', (SELECT B.DELV_LOC_CLSF FROM TB_DELIVERY_LOC B WHERE  A.DELV_LOC_CD = B.DELV_LOC_CD AND A.SUPPLY_COMP_CD = B.SUPPLY_COMP_CD ) ) AS DELV_LOC_CLSF           -- 출고처 분류 G024  물류창고, 일반매장, 직송매장, 입점업체 
-				            , A.DELV_LOC_CD   -- 출고처
+							, A.DELV_LOC_CD
 							, A.SHIP_COMP_CD  -- 출고택배사
 							, A.INVOICE_NO    -- 출고송장
 							-- 송장등록수정
@@ -130,6 +129,9 @@
 						    , A.ACCOUNT_NO 
 						    , A.ACCOUNT_NM 
 						    , A.ORD_PHNNO
+							, A.RECIP_ZIPCODE 
+							, A.RECIP_BASE_ADDR 
+							, A.RECIP_DTL_ADDR
 					  FROM (
 							SELECT 
 								  A.ORD_NO     -- 주문번호
@@ -178,6 +180,9 @@
 							    , T.ACCOUNT_NO 
 							    , T.ACCOUNT_NM 
 							    , A.ORD_PHNNO
+							    , D.RECIP_ZIPCODE 
+							    , D.RECIP_BASE_ADDR 
+							    , D.RECIP_DTL_ADDR
 							FROM  TB_ORDER A 
 							      INNER JOIN TB_ORDER_DETAIL B        ON A.ORD_NO       = B.ORD_NO
 								  INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON B.ORD_DTL_NO   = ODI.ORD_DTL_NO
@@ -238,6 +243,9 @@
 							    , T.ACCOUNT_NO 
 							    , T.ACCOUNT_NM 
 							    , A.ORD_PHNNO
+							    , D.RECIP_ZIPCODE 
+							    , D.RECIP_BASE_ADDR 
+							    , D.RECIP_DTL_ADDR
 							FROM  TB_ORDER A 
 							      INNER JOIN TB_ORDER_DETAIL B        ON A.ORD_NO       = B.ORD_NO
 							      INNER JOIN TB_GOODS C               ON B.GOODS_CD     = C.GOODS_CD
@@ -255,9 +263,6 @@
 				AND A.DELV_DELAY_DAYS >= #{delvDelayDays}
 				]]>
 				</if>
-				<if test='delvLocClsf != null and delvLocClsf != ""'>
-				AND   A.DELV_LOC_CLSF = #{delvLocClsf}
-				</if>
 				ORDER BY A.ORD_NO DESC, A.ORD_DTL_NO
 	<include refid="getListPagingCondition_sql"/>
 	</select>
@@ -282,6 +287,9 @@
 		<if test='orderNm != null and orderNm != ""'>
 		AND   A.ORD_NM = #{orderNm}
 		</if>
+		<if test='shotDelvYn != null and shotDelvYn != ""'>
+		AND   B.SHOT_DELV_YN = #{shotDelvYn}
+		</if>
 		<if test='orderPhnno != null and orderPhnno != ""'>
 		AND   REPLACE(A.ORDER_PHNNO, '-', '') = REPLACE(#{orderPhnno}, '-', '')
 		</if>
@@ -325,9 +333,6 @@
 		     #{item}
 		    </foreach>
 		</if>		
-		<if test='soldoutYn != null and soldoutYn != ""'>
-		AND  B.SOLDOUT_YN = #{soldoutYn}
-		</if>
 		<if test='termGb == "ordDt"'>
 		    <if test='stDate != null and stDate != ""'>
 		AND   A.ORD_DT >= STR_TO_DATE(REPLACE(#{stDate},'-',''), '%Y%m%d%H%i%s')    
@@ -1009,13 +1014,13 @@
 			  #{useGb}
 			, #{delvLocCd}
 			, (SELECT DELV_ASSIGN_ORD FROM TB_DELIVERY_LOC LC WHERE LC.DELV_LOC_CD = #{delvLocCd} AND LC.SUPPLY_COMP_CD = #{supplyCompCd})
-			, TRUNCATE(#{locQty}/#{ordQty})
+			, TRUNCATE(#{locQty}/#{ordQty},0)
 			, 0
 			, 1
 		) ON DUPLICATE KEY
 		UPDATE 
-			GOODS_LOC_SET_CNT = A.GOODS_LOC_SET_CNT+1
-		  ,	LOC_QTY = CASE WHEN LOC_QTY > TRUNCATE(#{locQty}/#{ordQty})THEN TRUNCATE(#{locQty}/#{ordQty}) ELSE LOC_QTY END 		
+			GOODS_LOC_SET_CNT = GOODS_LOC_SET_CNT+1
+		  ,	LOC_QTY = CASE WHEN LOC_QTY > TRUNCATE(#{locQty}/#{ordQty},0)THEN TRUNCATE(#{locQty}/#{ordQty},0) ELSE LOC_QTY END 		
 	</insert>
 	
 	<!-- 출고처 지정 임시테이블 세트상품갯수 max값 조회      -->	

src/main/java/com/style24/persistence/mybatis/shop/TsaRenderer.xml

@@ -198,6 +198,28 @@
 		</if>
 		ORDER  BY DELV_LOC_NM
 	</select>
+	
+	<!-- 출고처 자사 목록 -->
+	<select id="getDeliveryLocAllList" parameterType="DeliveryLoc" resultType="CommonCode">
+		/* TsaRenderer.getDeliveryLocAllList */
+		SELECT DISTINCT 
+		       DELV_LOC_CD AS CD
+		     , DELV_LOC_NM AS CD_NM
+		FROM   TB_DELIVERY_LOC A
+		WHERE  USE_YN = 'Y'
+		AND    EXISTS (
+				SELECT SUPPLY_COMP_CD  
+				FROM   TB_SUPPLY_COMPANY
+				WHERE  SUPPLY_COMP_CD = A.SUPPLY_COMP_CD
+				AND    USE_YN = 'Y'
+				AND    DISTRIBUTION_GB IN ('G065_10','G065_11','G065_12')
+				)
+		ORDER  BY DELV_LOC_NM
+	</select>
+		
+
+		
+		
 
 	<!-- 정보고시 목록 -->
 	<select id="getCateInfoList" parameterType="String" resultType="CommonCode">

src/main/webapp/WEB-INF/views/delivery/AssignListForm.html

@@ -85,11 +85,12 @@
 							<td>
 								<input type="text" class="" name="goodsCd" placeholder="" maxlength="20" />
 							</td>
-							<th>정상/이월</th>
+							<th>주문교환</th>
 							<td>
-								<select name="formalGb" id="formalGb">
+								<select name="ordExchGb" id="ordExchGb">
 									<option value="">[전체]</option>
-									<option th:if="formalGbList" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+									<option value="Y">교환</option>
+									<option value="N">주문</option>
 								</select>
 							</td>
 						</tr>
@@ -109,25 +110,8 @@
 									<option th:if="${deliveryLocList}" th:each="oneData, status : ${deliveryLocList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
 								</select>
 							</td>
-							<!-- <th>주문상세상태</th>
-							<td>
-								<select name="ordDtlStat" id="ordDtlStat">
-									<option value="">[전체]</option>
-									<option th:if="${ordDtlStatList}" th:each="oneData, status : ${ordDtlStatList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
-								</select>
-							</td> -->
-							<th>교환여부</th>
-							<td td colspan="4">
-								<select name="ordExchGb" id="ordExchGb">
-									<option value="">[전체]</option>
-									<option value="Y">Yes</option>
-									<option value="N">No</option>
-								</select>
-							</td>
-						</tr>
-						<tr>
 							<th>주문등록일</th>
-							<td colspan="7">
+							<td colspan="3">
 								<span id="terms"></span>
 							</td>
 						</tr>
@@ -244,9 +228,7 @@
 		},
 		{headerName: "주문금액", 		field: "ordAmt", 			width: 80, 	cellClass: 'text-center', valueFormatter: function (params) { return params.value.addComma(); }	},
 		{headerName: "주문상세상태", 	field: "ordDtlStatNm",		width: 100, cellClass: 'text-center'},
-		{headerName: "교환여부", 		field: "ordExchNm",			width: 80,  cellClass: 'text-left'},
-		{headerName: "물류비고", 		field: "dstrbtNote",		width: 300, cellClass: 'text-left'},
-		{headerName: "정상/이월",	 	field: "formalGbNm",		width: 80, cellClass: 'text-center'}
+		{headerName: "주문교환", 		field: "ordExchNm",			width: 80,  cellClass: 'text-center'}
 	];
 	
 	//Get GridOptions

src/main/webapp/WEB-INF/views/delivery/BanGoodsRegistForm.html

@@ -97,7 +97,7 @@
 			</table>
 			</div>
 
-			<div id="gridBanGoodsList" style="width: 100%; height: 500px; padding-top:10PX;" class="ag-theme-balham"></div>
+			<div id="gridBanGoodsList" style="width: 100%; height: 500px; padding-top:10PX;" class="ag-theme-balham lh60"></div>
 		
 		</form>
 		<!-- 버튼 배치 영역 -->
@@ -118,7 +118,7 @@
 	var columnBanDefs = [
 		{width: 42, minWidth: 42, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 		{headerName: "브랜드",	field: "brandKnm", width: 150, minWidth: 80, cellClass: 'text-center'},
-		{headerName: "이미지",	field: "sysImgNm", width: 130, height: 80, cellClass: 'text-center'
+		{headerName: "이미지",	field: "sysImgNm", width: 100, height: 60, cellClass: 'text-center'
 			,cellRenderer: function(params) {
 				return '<img width="60" src="'+ _goodsUrl+ "/" +params.value + '" alt=""/>';
 			}
@@ -135,7 +135,7 @@
 
 	// Add on options
 	popGridOptions.rowSelection = 'multiple';
-	popGridOptions.rowHeight = 80; //이미지가 있을경우 높이 지정해야함.
+	popGridOptions.rowHeight = 60; //이미지가 있을경우 높이 지정해야함.
 
 	$(document).ready(function() {
 		gagaAgGrid.createGrid('gridBanGoodsList', popGridOptions);

src/main/webapp/WEB-INF/views/delivery/BangoodsListForm.html

@@ -77,7 +77,7 @@
 							<td class="dashR">
 								<select name="delYn" id="delYn" class="w80">
 									<option value="">전체</option>
-									<option value="N">N</option>
+									<option value="N" selected>N</option>
 									<option value="Y">Y</option>
 								</select>
 							</td>
@@ -123,7 +123,7 @@
 				</li>
 			</ul>
 			<div class="panelContent" style="overflow: hidden;">
-				<div id="gridList" style="width:100%; height: 500px;" class="ag-theme-balham"></div>
+				<div id="gridList" style="width:100%; height: 500px;" class="ag-theme-balham lh60"></div>
 			</div>
 		</div>
 		<!-- //리스트 영역 -->
@@ -150,7 +150,7 @@
 		{headerName: "삭제",					field: "delYn",			width: 50,	cellClass: 'text-center'},
 		{headerName: "브랜드",				field: "brandKnm",		width: 150,	cellClass: 'text-center'},
 		{headerName: "출고처명",				field: "delvLocNm",		width: 150,	cellClass: 'text-center'},
-		{headerName: "이미지",				field: "sysImgNm",		width: 100,	cellClass: 'text-center', 
+		{headerName: "이미지",				field: "sysImgNm",		width: 100,	height: 60, cellClass: 'text-center', 
 			cellRenderer: function(params) {
 
 				return '<img width="60" src="'+ _goodsUrl+ "/" +params.value + '" alt=""/>';
@@ -179,11 +179,12 @@
 	];
 
 	var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
-	gridOptions.rowSelection = 'multiple';
-	gridOptions.suppressRowClickSelection = true;
+	//gridOptions.rowSelection = 'multiple';
+	//gridOptions.suppressRowClickSelection = true;
 	gridOptions.isRowSelectable = function(rowNode) {
 		return rowNode.data.delYn == 'N';
 	}
+	gridOptions.rowHeight = 60; //이미지가 있을경우 높이 지정해야함.
 	
 	//gridOptions.rowHeight = 60;
 	/*************************************************************************
@@ -326,6 +327,8 @@
 
 	$(document).ready(function() {
 		gagaAgGrid.createGrid('gridList', gridOptions);
+		gridOptions.api.hideOverlay();
+		
 		var hideList = ["btnThisWeek", "btnYesterWeek", "btnRecentMonth", "btnThisMonth", "btnYesterMonth", "btnRecent3Month"];
 		
 		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '출고금지상품관리');

src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -69,22 +69,26 @@
 
 						<th>업체/브랜드<em class="required" title="필수"></em></th>
 						<td colspan="3">
-							<label class="rdoBtn"><input type="radio" name="selfYn" id="selfYnY" value="Y"  >자사</label>
-							<label class="rdoBtn"><input type="radio" name="selfYn" id="selfYnN" value="N" >입점</label>
-							<select name="supplyCompCd" id="supplyCompCd">
-								<option value="" th:if="${sessionInfo.roleCd} != 'G001_B000'">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-							<span id="multiBrand"></span>
+								<select name="supplyCompCd" id="supplyCompCd">
+									<option value="">[전체]</option>
+									<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+								</select>
+								/
+								<span id="multiBrand"></span>
 						</td>
 												
-						<th>브랜드<em class="required" title="필수"></em></th>
+						<th>주문상세상태</th>
 						<td>
-							<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
-							<button type="button" class="btn icn" id="btnSearchBrand"><i class="fa fa-search"></i></button>
-							<!-- <input type="text" class="w100" name="brandCd" readonly="readonly"/> -->
-							<span id="brandText"></span>
-							<input type="hidden" name="brandList"/>
+							<div class="multiCheckBox" style="width:270px">
+								<button type="button" class="sltBtn" data-name="[전체]" style="overflow-x: hidden; padding-right:5px;">[전체]</button>
+								<ul style="display: none; box-shadow: 3px 3px 3px; overflow-y: scroll; height: 112px;" id="group1">
+									<li th:if="${ordDtlStatList}" th:each="oneData, status : ${ordDtlStatList}">
+										<label class="chkBox" data-group="group1">
+											<input type="checkbox" name="multiOrdDtlStat" th:value="${oneData.cd}" th:text="|[${oneData.cd}] ${oneData.cdNm}|">
+										</label>
+									</li>
+								</ul>
+							</div>
 						</td>
 					</tr>
 					<tr>
@@ -124,48 +128,27 @@
 						</td>
 					</tr>
 					<tr>
-						<th>출고처유형</th>
+						<th>출고유형</th>
 						<td>
-							<select class="w150" name="delvLocClsf" id="delvLocClsf">
-								<option value="">[전체]</option>
-								<option th:if="${delvTypeList}" th:each="oneData, status : ${delvTypeList}" th:value="${oneData.cd}" th:text="| ${oneData.cdNm}|"></option>
+							<select class="w150" name="shotDelvYn" id="shotDelvYn">
+								<option value="">전체</option>
+								<option value="N">일반배송</option>
+								<option value="Y">총알배송</option>
 							</select>
+								
 						</td>
 						<th>출고처</th>
 						<td>
 							<select name="delvLocCd" id="delvLocCd">
 								<option value="">[전체]</option>
-								<option th:if="${deliveryLocList}" th:each="oneData, status : ${deliveryLocList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+								<option th:if="${deliveryLocList}" th:each="oneData, status : ${deliveryLocList}" th:value="${oneData.cd}" th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
 							</select>
 						</td>
-						<th>주문상세상태</th>
-						<td>
-							<div class="multiCheckBox" style="width:270px">
-								<button type="button" class="sltBtn" data-name="[전체]" style="overflow-x: hidden; padding-right:5px;">[전체]</button>
-								<ul style="display: none; box-shadow: 3px 3px 3px; overflow-y: scroll; height: 112px;" id="group1">
-									<li th:if="${ordDtlStatList}" th:each="oneData, status : ${ordDtlStatList}">
-										<label class="chkBox" data-group="group1">
-											<input type="checkbox" name="multiOrdDtlStat" th:value="${oneData.cd}" th:text="|[${oneData.cd}] ${oneData.cdNm}|">
-										</label>
-									</li>
-								</ul>
-							</div>
-						</td>
-					</tr>
-					<tr>
 						<th>배송지연일</th>
 						<td>
 							<input type="text" class="" name="delvDelayDays" data-valid-type="integer" placeholder="" maxlength="3" style="width:20%;"/>일
 							이상(결제일 기준)
 						</td>
-						<th>결품여부</th>
-						<td>
-							<select name="soldoutYn" id="soldoutYn">
-								<option value="">[전체]</option>
-								<option value="Y">Yes</option>
-								<option value="N" selected>No</option>
-							</select>
-						</td>
 					</tr>
 					<tr>
 						<th>기간</th>
@@ -182,7 +165,7 @@
 				<ul class="panelBar">
 					<li class="center">
 					<button type="button" class="btn btn-base btn-lg" id="btnSearch">조회</button>
-					<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset(); fnInitCalendar();">초기화</button>
+					<button type="button" class="btn btn-gray btn-lg" onclick="$('#searchForm')[0].reset(); fnInitCalendar(); $('#multiBrand').empty();">초기화</button>
 					<button type="button" id="btnExcel" class="btn btn-info btn-lg">엑셀다운로드</button>
 					</li>
 				</ul>
@@ -241,7 +224,7 @@
 			headerCheckboxSelectionFilteredOnly: true
 			,
 			checkboxSelection: function (params) {
-				return (params.data.ordDtlStat == 'G013_20' || params.data.ordDtlStat == 'G013_25') ? true : false;
+				return (params.data.ordDtlStat == 'G013_20') ? true : false;
 			}
 		},
 		{headerName: "지연일",	field: "delvDelayDays", 	width: 70, cellClass: 'text-center'},
@@ -365,9 +348,11 @@
 			}
 		},
 		{headerName: "외부몰주문번호", 	field: "extmallOrderId",width: 150, cellClass: 'text-left'},
-		{headerName: "에이전트주문번호", field: "agentOrderId", 	width: 150, cellClass: 'text-left'},
-		{headerName: "결품여부", 		field: "soldoutYn", 	width: 80, cellClass: 'text-center'},
+		{headerName: "샵링커주문번호", field: "agentOrderId", 	width: 150, cellClass: 'text-left'},
 		{headerName: "배송메모", 		field: "delvMemo", 		width: 200, cellClass: 'text-left'},
+		{headerName: "우편번호", 		field: "recipZipcode", 		width: 80, cellClass: 'text-center'},
+		{headerName: "기본주소", 		field: "recipBaseAddr", 	width: 200, cellClass: 'text-left'},
+		{headerName: "상세주소", 		field: "recipDtlAddr", 		width: 200, cellClass: 'text-left'},
 		{headerName: "product_no", 	field: "productNo", 	width: 100, cellClass: 'text-center'},
 		{headerName: "product_code",field: "productCode", 	width: 100, cellClass: 'text-center'}
 		
@@ -553,44 +538,25 @@
 		cfnOpenModalPopup(actionUrl, 'popupChangeInvoice');
 	};
 
-
 	/*************************************************************************
-	* 자사/입점 변경여부
-	**************************************************************************/		
-	$("#searchForm input[name=selfYn]").bind('click change', function () {
-		var radioValue = $(this).val();
-		var selfGb = "S";	// 자사 공급 업체
+	*  업체 콤보박스 변경 시
+	**************************************************************************/	
+	$('#searchForm select[name=supplyCompCd]').on('change', function() {
+		var actionUrl = '/renderer/supplyCompany/brand/list/'+ $(this).val();
 		
-		if (radioValue == "N"){
-			selfGb = "E";	//입점 공급업체
-		}
+		cfnCreateMultiCombo(actionUrl, "multiBrand",  "[전체]", null, 'Y');
 		
-		var actionUrl = '/renderer/supply/company/list/'+ selfGb;	
-
-		$('#searchForm').find('#multiBrand').empty();
-
-		cfnCreateCombo(actionUrl, $('#searchForm select[name=supplyCompCd]'), "[전체]", "");
-	});
-	
-	/*************************************************************************
-	* 업체변경시
-	**************************************************************************/		
-	$('#searchForm select[name=supplyCompCd]').on('change', function() {
-		var actionUrl = '/renderer/supplyCompany/brand/list/' + $(this).val();
-
-		if(roleCd == "G001_B000"){
-			actionUrl = '/renderer/brand/AuthBrandlist';
-		}
-
-		cfnCreateMultiCombo(actionUrl,"multiBrand",  "[전체]",null, 'Y');
 		
 		var actionUrl2 = '/renderer/delvloc/list/'+ $(this).val();	
 
 		cfnCreateCombo(actionUrl2, $('#searchForm select[name=delvLocCd]'), "[전체]");
-		
+
+
 		
 	});
 	
+
+	
 	/*************************************************************************
 	* init
 	**************************************************************************/	
@@ -600,9 +566,7 @@
 		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '주문', '', hideList);
 		$(".btnToday").trigger('click');
 		$('#searchForm select[name=mallGb]').trigger('change');
-		$("#searchForm input[name=selfYn]").trigger('click');
-		$("#searchForm input[name='selfYn']:radio[value='Y']").prop('checked',true);
-
+		$('#searchForm').find('#multiBrand').empty();
 	});
 
 	/*]]>*/

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

@@ -73,7 +73,7 @@
 							<td>
 								<select name="chgStat" class="w100">
 									<option value="">전체</option>
-									<option th:if="${chgStatList}" th:each="oneData, status : ${chgStatList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>									
+									<option th:if="${chgStatList}" th:each="oneData, status : ${chgStatList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>	
 								</select>
 							</td>
 							<th>반품방식</th>
@@ -228,7 +228,6 @@
 		
 		{headerName: "변경자명", 		field: "chgerNm", 		width: 100, cellClass: "text-center"},
 		{headerName: "변경자휴대전화", 	field: "chgerPhnno", 	width: 120, cellClass: "text-center"},
-		{headerName: "변경자전화번호", 	field: "chgerTelno", 	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"},

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

@@ -176,9 +176,7 @@
 		{headerName: "삭제여부",			field: "isdeleted",			width: 80,	cellClass: 'text-center',
 			cellRenderer: function (params) { return params.value == '0' ? 'N' : 'Y'; }		
 		},
-		{headerName: "도로명주소",		field: "deliveryaddrnew",	width: 300,	cellClass: 'text-left'},
-		{headerName: "상품번호",			field: "productno",			width: 100,	cellClass: 'text-center'},
-		{headerName: "상품코드",			field: "productcode",		width: 100,	cellClass: 'text-center'},
+		{headerName: "상품코드",			field: "goodsCd",			width: 100,	cellClass: 'text-center'},
 		{headerName: "상품명",			field: "productname",		width: 250,	cellClass: 'text-left',
 			cellRenderer: function (params) {
 				if (roleCd.indexOf("C") < 0) {
@@ -188,6 +186,8 @@
 				}
 			}					
 		},
+		{headerName: "productno",			field: "productno",			width: 100,	cellClass: 'text-center'},
+		{headerName: "productcode",			field: "productcode",		width: 100,	cellClass: 'text-center'},		
 		{headerName: "옵션코드",			field: "skucode",			width: 100,	cellClass: 'text-center'},
 		{headerName: "옵션 내용",		field: "skuvalue",			width: 100,	cellClass: 'text-center'},
 		{headerName: "수량",				field: "recallqty",			width: 100,	cellClass: 'text-center'},