Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/java/com/style24/persistence/domain/SupplyCompFee.java

@@ -18,6 +18,7 @@ public class SupplyCompFee extends TscBaseDomain {
 	private Integer ordNo;				// 주문번호
 	private Integer ordDtlNo;			// 주문상세번호
 	private String supplyVendorCd;		// 공급벤더코드
+	private String supplyVendorNm;		// 공급벤더명
 	private String supplyCompCd;		// 공급업체코드
 	private String supplyCompNm;		// 공급업체명
 	private String settleDay;			// 정산주기

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

@@ -25,38 +25,33 @@
 		                              - GFCD_USE_AMT
 		                    ) / 1.1,0))          AS SALES_AMT      /*매출금액(VAT제외). 건별로 1.1로 나누고 소숫점을 절사하여 합계를 낸다.*/
 		FROM   (
-		        SELECT ODH.AF_LINK_CD                                              /*제휴링크코드*/
-		             , AL.AF_LINK_NM
-		             , DATE_FORMAT(ODH.REG_DT,'%Y-%m-%d %H:%i:%S') AS OCCUR_DT     /*발생일자*/
-		             , ODH.ORD_NO
-		             , ODH.ORD_DTL_NO
-		             , CASE WHEN ODH.ORD_DTL_STAT = 'G013_20' THEN
-		                        FN_GET_CODE_NM('G013',ODH.ORD_DTL_STAT)
-		                    ELSE
-		                        IFNULL(FN_GET_CODE_NM('G685',OCD.CHG_STAT),'주문취소')
-		               END                                         AS ORD_DTL_STAT /*주문상세상태*/
-		             , (ODH.ORD_AMT - ODH.CNCL_RTN_AMT)            AS SELL_AMT     /*판매금액(상품금액.배송비제외)*/
-		             , ODH.CPN1_DC_AMT                                             /*1차쿠폰(즉시할인쿠폰)할인금액*/
-		             , ODH.TMTB1_DC_AMT                                            /*다다익선할인금액(수량)*/
-		             , ODH.TMTB2_DC_AMT                                            /*다다익선할인금액(금액)*/
-		             , ODH.GOODS_CPN_DC_AMT                                        /*상품쿠폰할인금액*/
-		             , ODH.CART_CPN_DC_AMT                                         /*장바구니할인금액*/
-		             , 0                                           AS PG_CPN_AMT   /*PG쿠폰금액.TODO:바로 아래 쿼리문으로 대체해야 함*/
-		             -- , ODH.PG_CPN_AMT                                              /*PG쿠폰금액*/
-		             , ODH.PNT_DC_AMT                                              /*포인트할인금액*/
-		             , ODH.PRE_PNT_DC_AMT                                          /*선포인트할인금액*/
-		             , ODH.GFCD_USE_AMT                                            /*상품권사용금액*/
-		        FROM   TB_ORDER_DETAIL_HST ODH
-		        INNER JOIN TB_AF_LINK AL
-		                ON ODH.AF_LINK_CD = AL.AF_LINK_CD
-		        LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL OCD
-		                     ON ODH.ORD_DTL_NO = OCD.ORD_DTL_NO
-		                    AND OCD.CHG_STAT IN ('G685_18','G685_40','G685_60')	/*취소완료,교환완료,반품완료*/
-		        WHERE  ODH.ORD_DTL_STAT IN ('G013_20','G013_99') /*결제완료,주문취소*/
-		        AND    ODH.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{startDt},'%Y-%m-%d')
-		        AND    ODH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{endDt},'%Y-%m-%d'),INTERVAL 1 DAY)
+		        SELECT OD.AF_LINK_CD                                                                                                           /*제휴링크코드*/
+		             , AL.AF_LINK_NM                                                                                                           /*제휴링크명*/
+		             , DATE_FORMAT(ODIH.REG_DT,'%Y-%m-%d %H:%i:%S')                                                        AS OCCUR_DT         /*발생일자*/
+		             , ODIH.ORD_NO                                                                                                             /*주문번호*/
+		             , ODIH.ORD_DTL_NO                                                                                                         /*주문상세번호*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10','결제완료',IFNULL(FN_GET_CODE_NM('G685',OCD.CHG_STAT),'주문취소')) AS ORD_DTL_STAT     /*주문상세상태*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',ODIH.ORD_AMT,-1 * ODIH.CNCL_RTN_AMT)                               AS SELL_AMT         /*판매금액(상품금액.배송비제외)*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CPN1_DC_AMT                                           AS CPN1_DC_AMT      /*1차쿠폰(즉시할인쿠폰)할인금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.TMTB1_DC_AMT                                          AS TMTB1_DC_AMT     /*다다익선할인금액(수량)*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.TMTB2_DC_AMT                                          AS TMTB2_DC_AMT     /*다다익선할인금액(금액)*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.GOODS_CPN_DC_AMT                                      AS GOODS_CPN_DC_AMT /*상품쿠폰할인금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CART_CPN_DC_AMT                                       AS CART_CPN_DC_AMT  /*장바구니할인금액*/
+		             , 0                                                                                                   AS PG_CPN_AMT       /*PG쿠폰금액.TODO:바로 아래 쿼리문으로 대체해야 함*/
+		             -- , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.PG_CPN_AMT                                         AS PG_CPN_AMT       /*PG쿠폰금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.PNT_DC_AMT                                            AS PNT_DC_AMT       /*포인트할인금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.PRE_PNT_DC_AMT                                        AS PRE_PNT_DC_AMT   /*선포인트할인금액*/
+		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.GFCD_USE_AMT                                          AS GFCD_USE_AMT     /*상품권사용금액*/
+		        FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
+		        INNER JOIN TB_ORDER_DETAIL OD ON ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
+		        INNER JOIN TB_AF_LINK AL ON OD.AF_LINK_CD = AL.AF_LINK_CD
+		        LEFT OUTER JOIN TB_ORDER_CHANGE_DETAIL OCD ON ODIH.ORD_DTL_NO = OCD.ORD_DTL_NO
+		                                                  AND OCD.CHG_STAT IN ('G685_18','G685_40','G685_60')	/*취소완료,교환완료,반품완료*/
+		        WHERE  ODIH.ORD_DTL_STAT IN ('G720_10','G720_30','G720_40') /*판매-결제완료,환입-취소완료,환입-품절취소*/
+		        AND    ODIH.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{startDt},'%Y-%m-%d')
+		        AND    ODIH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{endDt},'%Y-%m-%d'),INTERVAL 1 DAY)
 		        <if test="ordNo != null and ordNo != ''">
-		        AND    ODH.ORD_NO = #{ordNo}
+		        AND    ODIH.ORD_NO = #{ordNo}
 		        </if>
 		        <if test="afLinkCd != null and afLinkCd != ''">
 		        AND    AL.AF_LINK_CD = #{afLinkCd}
@@ -72,6 +67,8 @@
 		/* TsaSettle.getSupplyCompanyGoodsFeeList */
 		SELECT ODIH.ORD_NO                                                                /*주문번호*/
 		     , ODIH.ORD_DTL_NO                                                            /*주문상세번호*/
+		     , ODIH.SUPPLY_VENDOR_CD                                                      /*공급벤더코드*/
+		     , ODIH.SUPPLY_VENDOR_NM                                                      /*공급벤더명*/
 		     , ODIH.SUPPLY_COMP_CD                                                        /*공급업체코드*/
 		     , ODIH.SUPPLY_COMP_NM                                                        /*공급업체명*/
 		     , ODIH.SETTLE_DAY                                                            /*정산주기*/
@@ -125,10 +122,12 @@
 		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                        /*주문상세단품이력일련번호*/
 		             , ODIH.ORD_NO                                                                                     /*주문번호*/
 		             , ODIH.ORD_DTL_NO                                                                                 /*주문상세번호*/
+		             , SC.SUPPLY_VENDOR_CD                                                                             /*공급벤더코드*/
+		             , SV.SUPPLY_VENDOR_NM                                                                             /*공급벤더명*/
 		             , OD.SUPPLY_COMP_CD                                                                               /*공급업체코드*/
 		             , SC.SUPPLY_COMP_NM                                                                               /*공급업체명*/
-		             , SC.SETTLE_DAY                                                                                   /*정산주기*/
-		             , FN_GET_CODE_NM('G075',SC.SETTLE_DAY)                                 AS SETTLE_DAY_NM           /*정산주기명*/
+		             , SV.SETTLE_DAY                                                                                   /*정산주기*/
+		             , FN_GET_CODE_NM('G075',SV.SETTLE_DAY)                                 AS SETTLE_DAY_NM           /*정산주기명*/
 		             , DATE_FORMAT(O.PAY_DT,'%Y-%m-%d %H:%i:%S')                            AS ORD_DT                  /*주문일시*/
 		             , ODIH.ORD_DTL_STAT                                                    AS SETTLE_GB               /*정산구분*/
 		             , FN_GET_CODE_NM('G720',ODIH.ORD_DTL_STAT)                             AS SETTLE_GB_NM            /*정산구분명*/
@@ -192,6 +191,7 @@
 		        INNER JOIN TB_ORDER_DETAIL OD ON ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
 		        INNER JOIN TB_ORDER O ON ODIH.ORD_NO = O.ORD_NO
 		        INNER JOIN TB_SUPPLY_COMPANY SC ON OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		        INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		        INNER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        LEFT OUTER JOIN TB_EXTMALL E ON OD.EXTMALL_ID = E.EXTMALL_ID
@@ -222,6 +222,8 @@
 	<select id="getSupplyCompanyDeliveryFeeList" parameterType="SupplyCompFee" resultType="SupplyCompFee">
 		/* TsaSettle.getSupplyCompanyDeliveryFeeList */
 		SELECT DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d')       AS OCCUR_DT           /*발생(출고/회수)일시*/
+		     , OD.SUPPLY_VENDOR_CD                                             /*공급벤더코드*/
+		     , OD.SUPPLY_VENDOR_NM                                             /*공급벤더명*/
 		     , OD.SUPPLY_COMP_CD                                               /*공급업체코드*/
 		     , OD.SUPPLY_COMP_NM                                               /*공급업체명*/
 		     , DF.DELV_FEE_GB                                                  /*배송비구분*/
@@ -230,15 +232,18 @@
 		     , SUM(DF.DELV_FEE)                          AS DELV_FEE           /*배송비*/
 		FROM   (
 		        SELECT DISTINCT
-		               ODIH.REG_DT       AS OCCUR_DT  /*발생일시*/
-		             , OD.SUPPLY_COMP_CD              /*공급업체코드*/
-		             , SC.SUPPLY_COMP_NM              /*공급업체명*/
-		             , ODIH.ORD_NO                    /*주문번호*/
-		             , ODIH.ORD_DTL_STAT AS SETTLE_GB /*정산구분*/
+		               ODIH.REG_DT         AS OCCUR_DT  /*발생일시*/
+		             , SC.SUPPLY_VENDOR_CD              /*공급벤더코드*/
+		             , SV.SUPPLY_VENDOR_NM              /*공급벤더명*/
+		             , OD.SUPPLY_COMP_CD                /*공급업체코드*/
+		             , SC.SUPPLY_COMP_NM                /*공급업체명*/
+		             , ODIH.ORD_NO                      /*주문번호*/
+		             , ODIH.ORD_DTL_STAT   AS SETTLE_GB /*정산구분*/
 		        FROM   TB_ORDER_DETAIL_ITEM_HST ODIH
 		        INNER JOIN TB_ORDER_DETAIL OD ON ODIH.ORD_DTL_NO = OD.ORD_DTL_NO
 		        INNER JOIN TB_GOODS G ON OD.GOODS_CD = G.GOODS_CD
 		        INNER JOIN TB_SUPPLY_COMPANY SC ON OD.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
+		        INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		        WHERE  1 = 1
 		        AND    ODIH.REG_DT <![CDATA[>=]]> STR_TO_DATE(#{salesStdt},'%Y-%m-%d')
 		        AND    ODIH.REG_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(#{salesEddt},'%Y-%m-%d'), INTERVAL 1 DAY)
@@ -247,25 +252,27 @@
 		        <if test="supplyCompCd != null and supplyCompCd != ''">
 		        AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		        </if>
-			   ) OD
-			 , TB_DELIVERY_FEE DF
+		       ) OD
+		     , TB_DELIVERY_FEE DF
 		WHERE  OD.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD
 		AND    OD.ORD_NO = DF.ORD_NO
 		AND    OD.OCCUR_DT >= DF.REG_DT /*출고기준의 일자 보다 배송비 발생일자가 적은 넘만*/
 		GROUP  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d')
+		        , OD.SUPPLY_VENDOR_CD
+		        , OD.SUPPLY_VENDOR_NM
 		        , OD.SUPPLY_COMP_CD
 		        , OD.SUPPLY_COMP_NM
 		        , DF.DELV_FEE_GB
 		        , OD.ORD_NO
-		ORDER  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d'), OD.SUPPLY_COMP_CD, DF.DELV_FEE_GB
+		ORDER  BY DATE_FORMAT(OD.OCCUR_DT,'%Y-%m-%d'), OD.SUPPLY_VENDOR_CD, OD.SUPPLY_COMP_CD, DF.DELV_FEE_GB
 	</select>
 	
 	<!-- 입점업체 정산확정 목록 -->
 	<select id="getSupplyCompanyFeeConfirmList" parameterType="SupplyCompFee" resultType="SupplyCompFee">
 		/* TsaSettle.getSupplyCompanyFeeConfirmList */
 		SELECT U.USAC_YM                                                                                                 /*정산연월*/
-		     , U.SUPPLY_COMP_CD                                                                                          /*공급업체코드*/
-		     , SC.SUPPLY_COMP_NM                                                                                         /*공급업체명*/
+		     , U.SUPPLY_VENDOR_CD                                                                                        /*공급벤더코드*/
+		     , SV.SUPPLY_VENDOR_NM                                                                                       /*공급벤더명*/
 		     , U.SELL_QTY                                                                                                /*판매수량*/
 		     , U.REAL_SELL_AMT                                                                                           /*실판매금액(=상품총액)*/
 		     , U.SELL_FEE_AMT                                                                                            /*수수료*/
@@ -286,25 +293,41 @@
 		     , (U.REAL_SELL_AMT - U.SELL_FEE_AMT + U.SELF_CPN_DC_AMT + U.SELF_TMTB_DC_AMT)
 		       + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)
 		       - IFNULL(UR1.RECEIVABLE_AMT,0)                                                          AS TOT_GIVE_AMT   /*총지급금액*/
-		FROM   TB_USAC U
-		INNER JOIN TB_SUPPLY_COMPANY SC ON U.SUPPLY_COMP_CD = SC.SUPPLY_COMP_CD
-		INNER JOIN TB_SUPPLY_VENDOR SV ON SC.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
+		FROM   (
+		        SELECT DATE_FORMAT(U.USAC_DT,'%Y%m')                    AS USAC_YM                 /*정산연월*/
+		             , U.SUPPLY_VENDOR_CD                                                          /*공급벤더코드*/
+		             , SUM(U.SELL_QTY)                                  AS SELL_QTY                /*판매수량*/
+		             , SUM(U.REAL_SELL_AMT)                             AS REAL_SELL_AMT           /*실판매금액(=상품총액)*/
+		             , SUM(U.SELL_FEE_AMT)                              AS SELL_FEE_AMT            /*수수료*/
+		             , SUM(U.CPN_DC_AMT)                                AS CPN_DC_AMT              /*쿠폰할인금액*/
+		             , SUM(U.SELF_CPN_DC_AMT)                           AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		             , SUM(U.SUPPLY_COMP_CPN_DC_AMT)                    AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
+		             , SUM(U.TMTB_DC_AMT)                               AS TMTB_DC_AMT             /*다다익선할인금액*/
+		             , SUM(U.SELF_TMTB_DC_AMT)                          AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
+		             , SUM(U.SUPPLY_COMP_TMTB_DC_AMT)                   AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
+		             , SUM(U.BILL_AMT)                                  AS BILL_AMT                /*계산서발행금액*/
+		             , SUM(U.SUPPLY_AMT)                                AS SUPPLY_AMT              /*공급금액*/
+		             , SUM(U.TAX_AMT)                                   AS TAX_AMT                 /*세액*/
+		             , SUM(U.DELV_FEE)                                  AS DELV_FEE                /*배송비*/
+		        FROM   TB_USAC U
+		        WHERE  1 = 1
+		        AND    U.USAC_DT <![CDATA[>=]]> REPLACE(CONCAT(#{settleYm},'-01'),'-','')
+		        AND    U.USAC_DT <![CDATA[<]]> DATE_ADD(STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d'), INTERVAL 1 MONTH)
+		        AND    U.SUPPLY_VENDOR_CD = #{supplyVendorCd}
+		        GROUP  BY DATE_FORMAT(U.USAC_DT,'%Y%m'), U.SUPPLY_VENDOR_CD
+		       ) U
+		INNER JOIN TB_SUPPLY_VENDOR SV ON U.SUPPLY_VENDOR_CD = SV.SUPPLY_VENDOR_CD
 		LEFT OUTER JOIN TB_USAC_RECEIVE UR1 ON U.USAC_YM = UR1.USAC_YM
-		                                   AND U.SUPPLY_COMP_CD = UR1.SUPPLY_COMP_CD
+		                                   AND U.SUPPLY_VENDOR_CD = UR1.SUPPLY_VENDOR_CD
 		LEFT OUTER JOIN (
-		                 SELECT OCCUR_YM        AS USAC_YM
-		                      , SUPPLY_COMP_CD
-		                      , SUM(REWARD_AMT) AS ETC_DEDUCT_AMT
+		                 SELECT OCCUR_YM         AS USAC_YM
+		                      , SUPPLY_VENDOR_CD
+		                      , SUM(REWARD_AMT)  AS ETC_DEDUCT_AMT
 		                 FROM   TB_USAC_DEDUCT
 		                 WHERE  OCCUR_YM = REPLACE(#{settleYm},'-','')
-		                 GROUP  BY OCCUR_YM, SUPPLY_COMP_CD
+		                 GROUP  BY OCCUR_YM, SUPPLY_VENDOR_CD
 		                ) UR2 ON U.USAC_YM = UR2.USAC_YM
-		                     AND U.SUPPLY_COMP_CD = UR2.SUPPLY_COMP_CD
-		WHERE  U.USAC_YM = REPLACE(#{settleYm},'-','')
-		AND    SV.SUPPLY_VENDOR_CD = #{supplyVendorCd}
-		<if test="supplyCompCd != null and supplyCompCd != ''">
-		AND    U.SUPPLY_COMP_CD = #{supplyCompCd}
-		</if>
+		                     AND U.SUPPLY_VENDOR_CD = UR2.SUPPLY_VENDOR_CD
 	</select>
 
 </mapper>

src/main/java/com/style24/scm/biz/service/TssPosService.java

@@ -242,10 +242,10 @@ public class TssPosService {
 		};
 		Collection<GagaMap> dataList = posDao.getOrderExcelList(pos); // map형식으로 조회
 		try {
-			GagaExcelUtil.createExcel(excelFilenameWithPath, dataList,"" ,listTitles, cellNames, cellTypes);
+			GagaExcelUtil.createExcel(excelFilenameWithPath, dataList, listTitles, cellNames, cellTypes);
 			//GagaExcelUtil.createExcel(excelFilenameWithPath, dataList,"테스트" ,listTitles, cellNames, cellTypes,"",true);
 			//GagaExcelUtil.createExcel(excelFilenameWithPath, dataList , cellNames, cellTypes);
- 
+	
 		} catch (Exception e) {
 			throw new IllegalStateException(e);
 		}
@@ -506,10 +506,11 @@ public class TssPosService {
 			
 		}
 		
-		// API 호출 재고이동
-		hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_DR.value(), rtList);
+		// API 호출 재고이동  -- 한세드림, 한세MK인지 추후 확인 후 주석 제거 
+		// hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_MK.value(), rtList);
+		// hansaeErp.erpStockRt(HansaeErp.ErpGb.HANSAE_DR.value(), rtList);
 		
-		// API 호출 매출정보 
+		// API 호출 매출정보   (매출배치에 포함되면  사용안함.)
 		//GagaMap resultMap = hansaeErp.uploadErpSales(HansaeErp.ErpGb.HANSAE_DR.value(), salesList);
 		
 		// 주문상세 업데이트
@@ -526,15 +527,12 @@ public class TssPosService {
 		order.setRegNo(userNo);
 		orderDao.createOrderDetailHst(order);
 		
-		// 주문상세단품 HST 등록???
+		// 주문상세단품 HST 등록
 		for(Pos data : list) {
 			Order ordItem = new Order();
 			ordItem.setUpdNo(userNo);
 			ordItem.setRegNo(userNo);
-			ordItem.setOrdDtlStat(""); // ???
 			ordItem.setOrdDtlItemSq(data.getOrdDtlItemSq());
-			//orderChangeDao.createOrderDetailItemHst(ordItem);
-			
 			// 2021.06.25 POS 배송중 (정산구분값추가)
 			order.setOrdDtlStat(TscConstants.OrdDtlItemStat.SALE_SHIPPING.value());
 			orderDao.createOrderDetailItemHst(order);

src/main/java/com/style24/scm/biz/web/TssPosController.java

@@ -354,7 +354,6 @@ public class TssPosController extends TssBaseController {
 		boolean validation = result.getBoolean("validation");
 		String resultMsg   = result.getString("resultMsg");
 		
-		//deliveryService.savePosDeliveryLocRejectCancel(delivery);
 		if (validation) {
 			posService.savePosDeliveryLocRejectCancel(pos);
 		}
@@ -395,8 +394,6 @@ public class TssPosController extends TssBaseController {
 				data.setInvoiceNo(posParam.getInvoiceNo());
 				data.setShipCompCd(posParam.getShipCompCd());
 
-				//GagaMap result = posService.saveConfirmation(data,cnt);
-
 				dtlNoList.add(data);
 			}
 		}
@@ -407,20 +404,6 @@ public class TssPosController extends TssBaseController {
 	}
 	
 
-	/**
-	 * 정산내역
-	 * 
-	 * @param pos - 매장정보
-	 * @return Collection<Pos>
-	 * @author moon
-	 * @since 2021. 06. 21
-	 */
-	@PostMapping("/usac/list")
-	@ResponseBody
-	public Collection<Pos> getPosUsacList(@RequestBody Pos pos) {
-		return posService.getPosUsacList(pos);
-	}
-
 	/**
 	 * 출고거부이력 목록
 	 * 
@@ -432,185 +415,16 @@ public class TssPosController extends TssBaseController {
 	@PostMapping("/ban/delivery/list")
 	@ResponseBody
 	public Collection<Pos> getPosBanDeliveryList(@RequestBody Pos pos) {
-		/*
-		 * Delivery delivery = new Delivery();
-		 * delivery.setDelvLocCd(TsaSession.getPosInfo().getDelvLocCd());
-		 * delivery.setGoodsGb("goodsCd"); delivery.setSearchTxt(pos.getGoodsCd());
-		 * Collection<Delivery> rejectList = new ArrayList<Delivery>(); return
-		 * rejectList; //deliveryService.getDeliveryAssignList(delivery);
-		 */		
+	
 		return posService.getDeliveryAssignList(pos);
 		
 	}
 
-	/**
-	 * 출고수락목록 배송준비중
-	 * 
-	 * @param pos - 매장정보
-	 * @return Collection<Pos>
-	 * @author moon
-	 * @since 2020. 11. 13
-	 */
-//	@PostMapping("/invoice/save")
-//	@ResponseBody
-//	public Collection<GagaMap> saveInvoice(@RequestBody Collection<Pos> posList) {
-//		String delvLocCd = TsaSession.getPosInfo().getDelvLocCd();
-//		Double delvFeeRate = TsaSession.getPosInfo().getDelvFeeRate();
-//
-//		Collection<GagaMap> resultList = new ArrayList<>();
-//		Collection<Pos> dtlNoList = new ArrayList<Pos>();
-//
-//		for (Pos posParam : posList) {
-//
-//			// 세트상품일경우 주문상세번호 중복제거 
-//			String chk = "N";
-//			for (Pos param : dtlNoList) {
-//				if (param.getOrdDtlNo() == posParam.getOrdDtlNo()) {
-//					chk = "Y";
-//				}
-//			}
-//			if (!"Y".equals(chk)) {
-//				Delivery delivery = new Delivery();
-//				delivery.setOrdNo(posParam.getOrdNo());
-//				delivery.setOrdDtlNo(posParam.getOrdDtlNo());
-//				// TODO: 매장코드는 id 생성후 매핑???
-//				//delivery.setUpdNo(delvLocCd);
-//				//delivery.setRegNo(delvLocCd);
-//				delivery.setDelvFeeRate(delvFeeRate);
-//
-//
-//				GagaMap result = null;//deliveryService.savePos(delivery);
-//
-//				dtlNoList.add(posParam);
-//				resultList.add(result);
-//			}
-//
-//		}
-//		return resultList;
-//	}
-
-
-	/**
-	 * 엑셀다운로드
-	 * 
-	 * @param pos - 매장정보
-	 * @return Collection<Pos>
-	 * @author moon
-	 * @since 2020. 11. 13
-	 */	
-//	@GetMapping("/order/excel/list")
-//	public ResponseEntity<InputStreamResource> downloadOrderExcelList(HttpServletRequest request, Pos pos) throws Exception {
-//		if (StringUtils.isBlank(pos.getOrdDtlNos())) {
-//			throw new IllegalStateException(message.getMessage("FAIL_1003"));
-//		}
-//		String excelfileName = "CNPlus 엑셀양식_" + GagaDateUtil.getTodayDateTime() + ".xlsx";
-//		String excelFilenameWithPath = GagaFileUtil.getConcatenationPath(env.getProperty("download.path"), "excel", excelfileName);
-//		log.info("pos {}", pos.getOrdDtlNos());
-//		if (StringUtils.isNotBlank(pos.getOrdDtlNos())) {
-//			pos.setOrdDtlNoArr(pos.getOrdDtlNos().split(","));
-//		}
-//		// 대용량엑셀파일다운로드는 이런 식으로 ...
-//		posService.getOrderExcelList(pos, excelFilenameWithPath);
-//
-//		return GagaFileUtil.writeFile(request, excelFilenameWithPath);
-//	}
-
-	/**
-	 * 매장 출고처지정 수략율 통계화면
-	 *
-	 * @author card007
-	 * @since 2020. 09. 16
-	 */
-	/*
-	@GetMapping("/delivery/assign/statistics/form")
-	public ModelAndView storeDeliveryAssignStatisticsForm() {
-		ModelAndView mav = new ModelAndView();
-
-		// 공급업체
-		mav.addObject("supplyCompList", rendererService.getSupplyCompanyList());
-
-		mav.setViewName("statistics/DeliveryAssignForm");
-
-		return mav;
-	}
-	*/
-
-	/**
-	 * 매장 출고처지정 수략율 통계 조회
-	 *
-	 * @param TsaDeliveryAssign - 출고처지정
-	 * @return Collection<TsaDeliveryAssign>
-	 * @author card007
-	 * @since 2020. 09. 16
-	 */
-	/*
-	@PostMapping("/delivery/assign/statistics/list")
-	@ResponseBody
-	public Collection<TsaDeliveryAssign> getStoreDeliveryAssignStatistics(@RequestBody TsaDeliveryAssign deliveryAssign) {
-		return statisticsService.getStoreDeliveryAssignStatistics(deliveryAssign);
-	}
-	*/
-	/**
-	 * 매장 출고처지정 상세 데이터 조회
-	 *
-	 * @param TsaDeliveryAssign - 출고처지정
-	 * @return Collection<TsaDeliveryAssign>
-	 * @author card007
-	 * @since 2020. 09. 16
-	 */
-	/*
-	@GetMapping("/delivery/assign/statistics/detail/{delvLocCd}")
-	@ResponseBody
-	public ModelAndView storeDeliveryAssignDetailForm(@PathVariable String delvLocCd, @RequestParam(value = "stDate", required = false) String stDate, @RequestParam(value = "edDate", required = false) String edDate, @RequestParam(value = "brandCd", required = false) String brandCd) {
-		ModelAndView mav = new ModelAndView();
 
-		TsaDeliveryAssign deliveryAssign = new TsaDeliveryAssign();
-		deliveryAssign.setDelvLocCd(delvLocCd);
-		deliveryAssign.setBrandCd(brandCd);
-		deliveryAssign.setStDate(stDate);
-		deliveryAssign.setEdDate(edDate);
 
-		Collection<TsaDeliveryAssign> dataList = statisticsService.getStoreDeliveryAssignDetailList(deliveryAssign);
 
-		mav.addObject("dataList", dataList);
 
-		// 출고거부사유
-		mav.addObject("noList", rendererService.getAvailCommonCodeList("G017"));
-
-		mav.setViewName("statistics/DeliveryAssignDetailPopupForm");
 
-		return mav;
-	}
-	*/
 
-	/**
-	 * 입점업체브랜드 목록
-	 *
-	 * @param supplyCompCd - 입점업체관리일련번호
-	 * @return
-	 * @author moon
-	 * @since 2019. 11. 13
-	 */
-//	@GetMapping("/delivery/assign/statistics/brand/list/{supplyCompCd}")
-//	@ResponseBody
-//	public Collection<CommonCode> getSupplyCompanyBrandList(@PathVariable String supplyCompCd) {
-//		return rendererService.getSupplyCompanyBrandList(supplyCompCd);
-//	}
 
-	/**
-	 * 출고처 목록
-	 *
-	 * @param deliveryLoc - 출고처 정보
-	 * @return
-	 * @author moon
-	 * @since 2020. 11. 13
-	 */
-//	@GetMapping("/delivery/assign/statistics/store/stock/link/list/{supplyCompCd}")
-//	@ResponseBody
-//	public Collection<CommonCode> getStoreStockLinkList(@PathVariable String supplyCompCd) {
-//		DeliveryLoc deliveryLoc = new DeliveryLoc();
-//		deliveryLoc.setSupplyCompCd(supplyCompCd);
-//		deliveryLoc.setDelvLocClsf("21");
-//		return rendererService.getDeliveryLocList(deliveryLoc);
-//	}
 }

src/main/webapp/WEB-INF/views/pos/PosMainForm.html

@@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <html lang="ko"
-	  xmlns:th="http://www.thymeleaf.org">
-<head th:replace="common/fragments/header :: header"></head>
-<body>
-<th:block th:replace="common/fragments/variables :: variables"></th:block>
+xmlns:th="http://www.thymeleaf.org">
 
 <!--
  *******************************************************************************
@@ -920,37 +917,27 @@
 	
 
 	$(document).ready(function() {
-		
 		gagaAgGrid.createGrid('watingGrid',  gridWaitingOptions);
 		gagaAgGrid.createGrid('deliveryGrid',gridDeliveryOptions);
 		gagaAgGrid.createGrid('confirmGrid',gridConfirmOptions);
 		gagaAgGrid.createGrid('banDelvGrid', gridBanDelvOptions);
-		
-		
-		
-		
-		cfnCreateCalendar('#deliveryTerms', 'deliveryStDate', 'deliveryEdDate', true, '조회');
+
 		cfnCreateCalendar('#waitTerms',     'waitOrdStDate',  'waitOrdEdDate',  true, '조회');
+		cfnCreateCalendar('#deliveryTerms', 'deliveryStDate', 'deliveryEdDate', true, '조회');
+		
 		cfnCreateCalendar('#confirmTerms',  'confirmStDate',  'confirmEdDate', true, '조회');		
 		cfnCreateCalendar('#banDelvTerms',  'banDelvStDate',  'banDelvEdDate',  true, '조회');
 
-		
-		 setTimeout(fnSetDate, 100);
-		
-		
-		
-	});
-
-	var fnSetDate = function(){
-		cfnChangeCalendar('2d', $('#deliveryStDate'), $('#deliveryEdDate'));
 		cfnChangeCalendar('1d', $('#waitOrdStDate'), $('#waitOrdEdDate'));
-		cfnChangeCalendar('2d', $('#confirmStDate'), $('#confirmEdDate'));
+		cfnChangeCalendar('1d', $('#deliveryStDate'), $('#deliveryEdDate'));
+		cfnChangeCalendar('1d', $('#confirmStDate'), $('#confirmEdDate'));
 		cfnChangeCalendar('1m', $('#banDelvStDate'), $('#banDelvEdDate'));
 
 		$('#btnWaitSearch').trigger('click');
-	}
+
+	});
+
 
 	/*]]>*/
 </script>
-</body>
 </html>

src/main/webapp/WEB-INF/views/settle/SupplyCompanyDelvFeeForm.html

@@ -78,7 +78,8 @@
 /*<![CDATA[*/
 	let columnDefs = [
 		{ headerName: "발생(출고/회수)일자", field: "occurDt", width: 150, cellClass: 'text-center' },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 200, cellClass: 'text-center' },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 200, cellClass: 'text-center' },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 200, cellClass: 'text-center' },
 		{ headerName: "배송비구분", field: "delvFeeGbNm", width: 150, cellClass: 'text-center' },
 		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
 		{

src/main/webapp/WEB-INF/views/settle/SupplyCompanyFeeConfirmForm.html

@@ -31,8 +31,8 @@
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col style="width:10%;"/>
-						<col style="width:25%;"/>
-						<col style="width:10%;"/>
+<!-- 						<col style="width:25%;"/> -->
+<!-- 						<col style="width:10%;"/> -->
 						<col/>
 					</colgroup>
 					<tr>
@@ -41,13 +41,13 @@
 							<input type="text" class="schMonth w60" name="settleYm" id="settleYm" maxlength="7" required="required"/>
 							<button type="button" class="btn icn schBtn" data-id="settleYm"><i class="fa fa-calendar" aria-hidden="true"></i></button>
 						</td>
-						<th>공급업체</th>
-						<td>
-							<select name="supplyCompCd">
-								<option value="">[전체]</option>
-								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
-							</select>
-						</td>
+<!-- 						<th>공급업체</th> -->
+<!-- 						<td> -->
+<!-- 							<select name="supplyCompCd"> -->
+<!-- 								<option value="">[전체]</option> -->
+<!-- 								<option th:if="${supplyCompList}" th:each="oneData, status : ${supplyCompList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option> -->
+<!-- 							</select> -->
+<!-- 						</td> -->
 					</tr>
 				</table>
 				
@@ -96,8 +96,10 @@
 /*<![CDATA[*/
 	let columnDefs = [
 		{ headerName: "정산연월", field: "usacYm", width: 80, cellClass: 'text-center', hide: true },
-		{ headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center', hide: true },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 200 },
+		{ headerName: "공급벤더코드", field: "supplyVendorCd", width: 100, cellClass: 'text-center', hide: true },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 200 },
+// 		{ headerName: "공급업체코드", field: "supplyCompCd", width: 100, cellClass: 'text-center', hide: true },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 200 },
 		{
 			headerName: "판매수량", field: "sellQty", width: 100, cellClass: 'text-center',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },

src/main/webapp/WEB-INF/views/settle/SupplyCompanyGoodsFeeForm.html

@@ -92,7 +92,8 @@
 	let columnDefs = [
 		{ headerName: "주문번호", field: "ordNo", width: 100, cellClass: 'text-center' },
 		{ headerName: "주문상세번호", field: "ordDtlNo", width: 150, cellClass: 'text-center' },
-		{ headerName: "공급업체", field: "supplyCompNm", width: 150, cellClass: 'text-center' },
+		{ headerName: "공급벤더", field: "supplyVendorNm", width: 150, cellClass: 'text-center' },
+// 		{ headerName: "공급업체", field: "supplyCompNm", width: 150, cellClass: 'text-center' },
 		{ headerName: "정산주기", field: "settleDayNm", width: 100, cellClass: 'text-center' },
 		{ headerName: "주문일시", field: "ordDt", width: 150, cellClass: 'text-center' },
 		{ headerName: "정산구분", field: "settleGbNm", width: 100, cellClass: 'text-center' },