Merge branch 'develop' into jmh

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

@@ -3415,6 +3415,16 @@ public class TsaGoodsController extends TsaBaseController {
 		if (!StringUtils.isBlank(ifIncomelot.getCondition())) {
 			ifIncomelot.setConditionList(ifIncomelot.getCondition().replaceAll("\r", "").trim().split("\n"));
 		}
+		
+		// wms상품번호
+		if (!StringUtils.isBlank(ifIncomelot.getCondition2())) {
+			ifIncomelot.setConditionList2(ifIncomelot.getCondition2().replaceAll("\r", "").trim().split("\n"));
+		}
+		
+		// sku코드 
+		if (!StringUtils.isBlank(ifIncomelot.getCondition3())) {
+			ifIncomelot.setConditionList3(ifIncomelot.getCondition3().replaceAll("\r", "").trim().split("\n"));
+		}		
 
 		ifIncomelot.setPageable(new TscPageRequest(ifIncomelot.getPageNo() - 1, ifIncomelot.getPageSize()));
 		ifIncomelot.getPageable().setTotalCount(goodsService.getGoodsWmsIncomelotSkuListCount(ifIncomelot));

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

@@ -154,6 +154,8 @@ public class Goods extends TscBaseDomain {
 	private int goodsSq;
 	private String sizeGb;
 
+	private String productCode;
+
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrGoodsCd;
 

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

@@ -42,9 +42,14 @@ public class IfIncomelot extends TscBaseDomain {
 	private String edDate;
 	
 	private String condition; 
+	private String condition2; 
+	private String condition3; 
+	
 	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] conditionList;
+	private String[] conditionList2;
+	private String[] conditionList3;
 
 	// Pagination
 	private TscPageRequest pageable;

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

@@ -569,6 +569,13 @@
 		              </foreach>
 		             )
 		              </when>
+  					  <when test='search != null and search == "searchProductCode"'>
+				AND (
+					  <foreach collection="conditionList" item="item" index="index" separator="or">
+					   G.PRODUCT_CODE = #{item}
+					  </foreach>
+					 )
+					  </when>
 		              <when test='search != null and search == "searchExtendGoodsCd"'>
 		        AND 1 = 1
 		              </when>
@@ -1000,6 +1007,7 @@
 		   --  , E.CERT_ORGAN_NAME
 		     , DATE_FORMAT(G.SELL_STDT, '%Y%m%d%H%i%S') AS SELL_STDT
 		     , DATE_FORMAT(G.SELL_EDDT, '%Y%m%d%H%i%S') AS SELL_EDDT
+			 , PRODUCT_CODE
 		FROM TB_GOODS G
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		LEFT OUTER JOIN TB_DELV_FEE_POLICY D ON G.SUPPLY_COMP_CD = D.SUPPLY_COMP_CD
@@ -5096,6 +5104,23 @@
 		        </foreach>
 		     )
 		     </if>
+		     
+		    <if test='conditionList2 != null and conditionList2.length>0'>
+		    AND (
+		        <foreach collection="conditionList2" item="item2" index="index" separator="or">
+		       Z.PRODUCTNO LIKE CONCAT(UPPER(#{item2}),'%')
+		        </foreach>
+		     )
+		     </if>
+		     
+		    <if test='conditionList3 != null and conditionList3.length>0'>
+		    AND (
+		        <foreach collection="conditionList3" item="item3" index="index" separator="or">
+		       Z.SKUCODE LIKE CONCAT(UPPER(#{item3}),'%')
+		        </foreach>
+		     )
+		     </if>
+		     		     
 	</select>
 
 	<!-- WMS입고단품목록 -->
@@ -5149,6 +5174,22 @@
 		              </foreach>
 		           )
 		           </if>
+		           
+				    <if test='conditionList2 != null and conditionList2.length>0'>
+				    AND (
+				        <foreach collection="conditionList2" item="item2" index="index" separator="or">
+				       Z.PRODUCTNO LIKE CONCAT(UPPER(#{item2}),'%')
+				        </foreach>
+				     )
+				     </if>
+				     
+				    <if test='conditionList3 != null and conditionList3.length>0'>
+				    AND (
+				        <foreach collection="conditionList3" item="item3" index="index" separator="or">
+				       Z.SKUCODE LIKE CONCAT(UPPER(#{item3}),'%')
+				        </foreach>
+				     )
+				     </if>		           
 		            ORDER BY LOTNO, DATEINCOME, SKUCODE
 		          ) Q
 		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}

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

@@ -903,7 +903,7 @@
 			$('#goodsDetailForm input[name=brandCd]').val(result.brandCd);
 			fnBrand(result.supplyCompCd, result.brandCd);
 
-			$('#goodsDetailForm').find('#goodsCdTxt').html(result.goodsCd);
+			$('#goodsDetailForm').find('#goodsCdTxt').html(result.goodsCd + ' (' + result.productCode + ')');
 			$('#goodsDetailForm').find('#supplyGoodsCdTxt').html(result.supplyGoodsCd);
 
 			$("#goodsDetailForm input[name=goodsImageYn]").val(result.goodsImageYn);

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

@@ -80,6 +80,7 @@
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
+								<option value="searchProductCode">PRODUCTCODE</option>
 							</select>
 							<textarea class="textareaR3 w70p" name="condition" id="condition"></textarea>
 						</td>

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

@@ -56,6 +56,16 @@
 						<th>입고일<em class="required" title="필수"></em></th>
 						<td id="sellTerms"></td>
 					</tr>
+					<tr>
+						<th>WMS상품번호</th>
+						<td >
+						<textarea class="textareaR2 w200" name="condition2" id="condition2"></textarea>
+						</td>
+						<th>SKU코드</th>
+						<td >
+						<textarea class="textareaR2 w100p" name="condition3" id="condition3"></textarea>
+						</td >
+					</tr>				
 				</table>
 				<ul class="panelBar">
 					<li class="center">