jmh 4 лет назад
Родитель
Сommit
92ce341d79

+ 4 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsaShoplinker.xml

@@ -680,6 +680,7 @@
 			TB_ORDER_DETAIL OD
 			TB_ORDER_DETAIL OD
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 		WHERE OD.VENDOR_ID = 'G003_V001'
 		WHERE OD.VENDOR_ID = 'G003_V001'
+		AND (OD.ORD_DTL_STAT = 'G013_50' OR SL.ORD_DTL_NO IS NOT NULL)
 		AND OD.INVOICE_NO IS NOT NULL
 		AND OD.INVOICE_NO IS NOT NULL
 		AND OD.DELV_STDT IS NOT NULL
 		AND OD.DELV_STDT IS NOT NULL
 
 
@@ -717,6 +718,9 @@
 			TB_ORDER_DETAIL OD
 			TB_ORDER_DETAIL OD
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 		WHERE OD.VENDOR_ID = 'G003_V001'
 		WHERE OD.VENDOR_ID = 'G003_V001'
+		AND (OD.ORD_DTL_STAT = 'G013_50' OR SL.ORD_DTL_NO IS NOT NULL)
+		AND OD.INVOICE_NO IS NOT NULL
+		AND OD.DELV_STDT IS NOT NULL
 
 
 		<include refid="getSlkInvoiceCondition_sql"/>
 		<include refid="getSlkInvoiceCondition_sql"/>
 
 

+ 3 - 2
src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerInvoiceSendForm.html

@@ -149,13 +149,13 @@
 	let extmallList = gagajf.convertToArray([[${extmallList}]]);
 	let extmallList = gagajf.convertToArray([[${extmallList}]]);
 
 
 	let columnDefs = [
 	let columnDefs = [
-		{headerName: "No", width: 60, cellClass: 'text-center',
+		{headerName: "No", width: 50, cellClass: 'text-center',
 			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
 			valueGetter: function(params) { return cfnGridNumner('searchForm',params.node.rowIndex, 'A');}
 		},
 		},
 		{headerName: "IF결과", field: "apiResult", width: 100, cellClass: 'text-center',
 		{headerName: "IF결과", field: "apiResult", width: 100, cellClass: 'text-center',
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(procGbValue, params.value); }
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(procGbValue, params.value); }
 		},
 		},
-		{headerName: "전송결과메세지", field: "apiMessage", width: 300, cellClass: 'text-center'},
+		{headerName: "전송결과메세지", field: "apiMessage", width: 250, cellClass: 'text-center'},
 		{headerName: "샵링커주문번호", field: "agentOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "샵링커주문번호", field: "agentOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰주문번호", field: "extmallOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰주문번호", field: "extmallOrderId", width: 130, cellClass: 'text-center'},
 		{
 		{
@@ -174,6 +174,7 @@
 			}
 			}
 		},
 		},
 		{headerName: "주문상세번호", field: "ordDtlNo", width: 120, cellClass: 'text-center'},
 		{headerName: "주문상세번호", field: "ordDtlNo", width: 120, cellClass: 'text-center'},
+		{headerName: "주문상세상태", field: "ordDtlStatNm", width: 100, cellClass: 'text-center'},
 		{headerName: "배송업체", field: "shipCompNm", width: 150, cellClass: 'text-center'},
 		{headerName: "배송업체", field: "shipCompNm", width: 150, cellClass: 'text-center'},
 		{headerName: "송장번호", field: "deliveryInvoice", width: 130, cellClass: 'text-center'},
 		{headerName: "송장번호", field: "deliveryInvoice", width: 130, cellClass: 'text-center'},
 		{headerName: "배송시작일자", field: "delvStdt", width: 140, cellClass: 'text-center'},
 		{headerName: "배송시작일자", field: "delvStdt", width: 140, cellClass: 'text-center'},