WMS 연동상품 조회시 자사 브랜드만 조회

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

@@ -3762,6 +3762,8 @@
 		SELECT COUNT(*)
 		FROM TB_WMS_GOODS A
 		LEFT OUTER JOIN TB_BRAND B ON A.BRAND_NO = B.BRAND_NO 
+		                           AND B.SELF_YN  = 'Y'
+		                           AND B.USE_YN  = 'Y'
 		LEFT OUTER JOIN TB_SUPPLY_COMPANY S ON A.PROVIDER_NO = S.PROVIDER_NO
 		WHERE GOODS_REG_GB IS NULL   /* 온라인 미등록 상품 */
 		<if test="modelNo != null and modelNo != ''">
@@ -3812,6 +3814,8 @@
 		FROM TB_WMS_GOODS A
 		JOIN ( SELECT @rownum := 0) R
 		LEFT OUTER JOIN TB_BRAND B ON A.BRAND_NO = B.BRAND_NO 
+		                           AND B.SELF_YN  = 'Y'
+		                           AND B.USE_YN  = 'Y'
 		LEFT OUTER JOIN TB_SUPPLY_COMPANY S ON A.PROVIDER_NO = S.PROVIDER_NO
 		WHERE GOODS_REG_GB IS NULL   /* 온라인 미등록 상품 */
 		<if test="modelNo != null and modelNo != ''">

src/main/webapp/WEB-INF/views/goods/GoodsWmsIncomelotForm.html

@@ -104,9 +104,10 @@
 		{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 		{headerName: "브랜드", field: "brandCd", width: 100, cellClass: 'text-center'},
 		{headerName: "브랜드명", field: "brandEnm", width: 130, cellClass: 'text-center'},
+		{headerName: "WMS상품번호", field: "productNo", width: 120, cellClass: 'text-center'},
 		{headerName: "WMS상품코드", field: "productCode", width: 120, cellClass: 'text-center'},
-		{headerName: "WMS상품명", field: "productName", width: 400, cellClass: 'text-left'},
-		{headerName: "모델번호", field: "modelNo" , width: 200, cellClass: 'text-center'},
+		{headerName: "WMS상품명", field: "productName", width: 300, cellClass: 'text-left'},
+		{headerName: "모델번호", field: "modelNo" , width: 120, cellClass: 'text-center'},
 		{headerName: "등록일시", field: "regDt", width: 150, cellClass: 'text-center',
 			cellRenderer: function(params) {
 				return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmmss").format("YYYY-MM-DD HH:mm:ss") : '';