Browse Source

20210902 - SCM 입점 미발주목록 엑셀 업로드 > 엑셀 다운로드 양식으로 송장 등록 되도록 수정 및 택배사코드 양식 다운로드 버튼 추가

taeyoung 4 years ago
parent
commit
e7f3923910

+ 4 - 1
src/main/java/com/style24/core/biz/service/TscOrderService.java

@@ -327,7 +327,8 @@ public class TscOrderService {
 			, "할인금액"
 			, "실결제금액"
 			, "배송비"
-			, "송장"
+			, "배송업체코드"
+			, "송장번호"
 			, "배송메모"
 		};
 
@@ -359,6 +360,7 @@ public class TscOrderService {
 			, "totDcAmt"
 			, "realOrdAmt"
 			, "realDelvAmt"
+			, "shipCompCd"
 			, "invoiceNo"
 			, "delvMemo"
 		};
@@ -392,6 +394,7 @@ public class TscOrderService {
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 			, GagaExcelConstants.CellType.CHAR_CENTER.name()
+			, GagaExcelConstants.CellType.CHAR_CENTER.name()
 		};
 
 		GagaExcelResultHandler<Order> handler = new GagaExcelResultHandler<>(excelFilenameWithPath, "출고배송목록(입점)", listTitles, cellNames, cellTypes);

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

@@ -299,13 +299,13 @@
 		     , ODI.OPT_CD1
 		     , ODI.OPT_CD2
 		     , CONCAT(ODI.OPT_CD1, ',', ODI.OPT_CD2) AS OPT
-		     , DF.REAL_DELV_AMT
 		     , OD.ORD_QTY
 		     , OD.CNCL_RTN_QTY
 		     , OD.ORD_AMT
 		     , OD.CNCL_RTN_AMT
 		     , OD.CPN1_DC_AMT + OD.TMTB1_DC_AMT + OD.TMTB2_DC_AMT +  OD.GOODS_CPN_DC_AMT + OD.CART_CPN_DC_AMT + OD.PNT_DC_AMT + OD.PRE_PNT_DC_AMT AS TOT_DC_AMT
 		     , OD.REAL_ORD_AMT
+		     , OD.SHIP_COMP_CD
 		     , OD.INVOICE_NO
 		     , DA.DELV_MEMO
 		FROM   TB_ORDER O