품목카테고리 및 반품처리 대상 쿼리수정

src/main/java/com/oqpo/api/service/stinfo/ItemService.java

@@ -265,26 +265,21 @@ public class ItemService extends CommonService {
             }
 
             // 품목 class 정보 등록
-            ItemClassEntity iClassEntity = new ItemClassEntity();
-
-            iClassEntity.setItemId(entity.getItemId());
-            iClassEntity.setItemNm(entity.getItemNm());
-           // System.out.println("saveItemInfolRequestgetItemClass1==>" + saveItemInfolRequest.getItemClass1() );
-            //System.out.println("saveItemInfolRequestgetItemClass2==>" + saveItemInfolRequest.getItemClass2() );
-            //System.out.println("saveItemInfolRequestgetItemClass3==>" + saveItemInfolRequest.getItemClass3() );
-            //System.out.println("saveItemInfolRequestgetItemClass4==>" + saveItemInfolRequest.getItemClass4() );
-            iClassEntity.setItemClass1(saveItemInfolRequest.getItemClass1());
-            iClassEntity.setItemClass2(saveItemInfolRequest.getItemClass2());
-            iClassEntity.setItemClass3(saveItemInfolRequest.getItemClass3());
-            iClassEntity.setItemClass4(saveItemInfolRequest.getItemClass4());
-            //System.out.println("getItemClass1==>" + iClassEntity.getItemClass1() );
-            //System.out.println("getItemClass2==>" + iClassEntity.getItemClass2() );
-            //System.out.println("getItemClass3==>" + iClassEntity.getItemClass3() );
-           // System.out.println("getItemClass4==>" + iClassEntity.getItemClass4() );
-            ItemClassMngEntity itemClassInfo =  itemMapper.selectItemClassMngNo(entity.getBrandId(), iClassEntity.getItemClass1(),iClassEntity.getItemClass2(),iClassEntity.getItemClass3(),iClassEntity.getItemClass4());
-            iClassEntity.setItemClassMgntNo(itemClassInfo.getItemClassMgntNo());
-
-            itemMapper.insertItemClassInfo(userId, iClassEntity);
+
+            if (!"".toString().equals(saveItemInfolRequest.getItemClass1())) {
+                ItemClassEntity iClassEntity = new ItemClassEntity();
+
+                iClassEntity.setItemId(entity.getItemId());
+                iClassEntity.setItemNm(entity.getItemNm());
+                iClassEntity.setItemClass1(saveItemInfolRequest.getItemClass1());
+                iClassEntity.setItemClass2(saveItemInfolRequest.getItemClass2());
+                iClassEntity.setItemClass3(saveItemInfolRequest.getItemClass3());
+                iClassEntity.setItemClass4(saveItemInfolRequest.getItemClass4());
+                ItemClassMngEntity itemClassInfo =  itemMapper.selectItemClassMngNo(entity.getBrandId(), iClassEntity.getItemClass1(),iClassEntity.getItemClass2(),iClassEntity.getItemClass3(),iClassEntity.getItemClass4());
+                iClassEntity.setItemClassMgntNo(itemClassInfo.getItemClassMgntNo());
+
+                itemMapper.insertItemClassInfo(userId, iClassEntity);
+            }
 
         } catch (GlobalException e) {
             e.getStackTrace();

src/main/resources/mybatis/sqlmaps/inoutmng/ColOdr.xml

@@ -573,6 +573,10 @@
         and   mgnt.pick_st_cd = 'PICK0'
         <if test="sStoreId != null and sStoreId != ''">
             and   mgnt.store_id = #{sStoreId}
+            and   mgnt.whs_dvsn = 'W02'
+        </if>
+        <if test="sStoreId == null or sStoreId == ''">
+            and   mgnt.whs_dvsn = 'W01'
         </if>
         <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
             and   mgnt.col_pick_unq_no = #{sColPickUnqNo}
@@ -624,6 +628,10 @@
         and   mgnt.pick_st_cd = 'PICK0'
         <if test="sStoreId != null and sStoreId != ''">
             and   mgnt.store_id = #{sStoreId}
+            and   mgnt.whs_dvsn = 'W02'
+        </if>
+        <if test="sStoreId == null or sStoreId == ''">
+            and   mgnt.whs_dvsn = 'W01'
         </if>
         <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
             and   mgnt.col_pick_unq_no = #{sColPickUnqNo}