재고쪽 작업

src/main/java/com/oqpo/api/entity/stockmng/StckMgntBaseInfoEntity.java

@@ -63,5 +63,9 @@ public class StckMgntBaseInfoEntity implements Serializable {
     @ApiModelProperty(value = "출고가능수량")
     private Integer whsPassQty;
 
+    @ApiModelProperty(value = "엑셀실사수량")
+    private String  excelQty;
+
+
 
 }

src/main/java/com/oqpo/api/mapper/stockmng/StockMngMapper.java

@@ -76,4 +76,6 @@ public interface StockMngMapper {
 
 
     int insertInOutStckMgntBaseInfo(@Param("userId") String userId, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
+
+    List<StckMgntBaseInfoEntity> selectWhsLocationItemList(@Param("brandId") String brandId, @Param("whsId") String whsId, @Param("location") String location) throws Exception;
 }

src/main/java/com/oqpo/api/service/stockmng/StockMngService.java

@@ -257,4 +257,23 @@ public class StockMngService extends CommonService {
         return BarcodeWhsItemInfoResponse.toDTO(entity);
     }
 
+    /* 창고 품목 정보 조회 */
+    public GridResponse selectWhsLocationItemList(String brandId, String whsId, String location, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        List<StckMgntBaseInfoEntity> entities = stockMngMapper.selectWhsLocationItemList(brandId, whsId, location);
+        int gridRecords = entities.size();
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+
+        List<Object> gridRows = entities.stream()
+                .map(m -> WhsItemInfoResponse.builder()
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm())
+                        .excelQty(m.getExcelQty())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
 }

src/main/java/com/oqpo/api/web/controller/stockmng/StockMngController.java

@@ -8,6 +8,7 @@ import com.oqpo.api.web.dto.response.SaveResponse;
 import com.oqpo.api.web.dto.response.stockmng.BarcodeWhsItemInfoResponse;
 import com.oqpo.api.web.dto.response.stockmng.StockMngInfoResponse;
 import com.oqpo.api.web.dto.response.stockmng.StockMngPassqtyListResponse;
+import com.oqpo.api.web.dto.response.stockmng.WhsItemInfoResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -185,4 +186,15 @@ public class StockMngController {
         return ResponseEntity.ok(stockMngService.selectBarcodeWhsItemMngInfo(sBrandId, sWhsId, sLocation, sBarcode));
     }
 
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "창고 재고 품목 정보조회")
+    @PostMapping("/info-whs-item")
+    public ResponseEntity<GridResponse> selectWhsLocationItemList(@RequestBody @Valid WhsLocationItemListRequest whsLocationItemListRequest) throws Exception {
+        return ResponseEntity.ok(stockMngService.selectWhsLocationItemList(whsLocationItemListRequest.getBrandId(), whsLocationItemListRequest.getWhsId(), whsLocationItemListRequest.getLocation(), whsLocationItemListRequest.toDTO(whsLocationItemListRequest)));
+    }
+
+
 }

src/main/java/com/oqpo/api/web/dto/request/stockmng/WhsLocationItemListRequest.java

@@ -0,0 +1,28 @@
+package com.oqpo.api.web.dto.request.stockmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class WhsLocationItemListRequest  extends GridRequest {
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "창고아이디")
+    private String whsId;
+
+    @NotBlank
+    @ApiModelProperty(value = "LOCATION")
+    private String location;
+
+    protected WhsLocationItemListRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/stockmng/WhsItemInfoResponse.java

@@ -0,0 +1,30 @@
+package com.oqpo.api.web.dto.response.stockmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class WhsItemInfoResponse {
+
+    @ApiModelProperty(value = "품목아이디")
+    private String itemId;
+    @ApiModelProperty(value = "품목명")
+    private String itemNm;
+    @ApiModelProperty(value = "실사수량")
+    private String excelQty;
+
+    public static WhsItemInfoResponse toDTO(StckMgntBaseInfoEntity entity) {
+        if (entity == null) return null;
+        return WhsItemInfoResponse.builder()
+                .itemId(entity.getItemId())
+                .itemNm(entity.getItemNm())
+                .excelQty(entity.getExcelQty())
+                .build();
+    }
+}

src/main/resources/mybatis/sqlmaps/stinfo/Item.xml

@@ -185,7 +185,7 @@
              , item.oq_menu_cd, item.oq_brand_id, item.barcode
         from item_base_info item
         left outer join item_class_ptcl iclas on item.ITEM_ID = iclas.ITEM_ID
-        join item_class_mgnt mclas on iclas.item_class_mgnt_no = mclas.item_class_mgnt_no
+        left outer join item_class_mgnt mclas on iclas.item_class_mgnt_no = mclas.item_class_mgnt_no
         where item.brand_id            =  #{brandId}
         and   item.item_id 				 =  #{itemId}
     </select>

src/main/resources/mybatis/sqlmaps/stinfo/StoreItemUnit.xml

@@ -124,7 +124,7 @@
                                   and unit.cont_stt_dt = #{contSttDt} and unit.cont_end_dt = #{contEndDt}
                 left outer join store_base_info store on unit.store_id = store.store_id and store.store_id = #{storeId}
                 where item.brand_id = #{brandId}
-                order by view_cd
+                order by view_cd, item.item_id, item.unit_amt
     </select>
 
     <select id="selectStoreItemUnitContDateInfo" resultType="String">
@@ -235,6 +235,7 @@
                  spply_id, fn_spply_nm(spply_id) as spply_nm
          from   brand_item_unit_info item
          where  item.brand_id = #{brandId}
+         order by item.item_id, item.unit_amt
     </select>
 
     <select id="selectStoreItemUnitEndDtInfo" resultType="String">

src/main/resources/mybatis/sqlmaps/stockmng/StockMng.xml

@@ -447,4 +447,13 @@
             sys_chg_dttm = NOW(),
             sys_chg_id = #{userId}
     </insert>
+
+    <select id="selectWhsLocationItemList" resultType="com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity">
+        select stck.item_id, item.item_nm, '' as excelQty
+        from stck_mgnt_base_info  stck
+        join item_base_info item on stck.brand_id = item.brand_id and stck.item_id = item.item_id
+        where stck.brand_id = #{brandId}
+        and   stck.whs_id = #{whsId}
+        and   stck.location = #{location}
+    </select>
 </mapper>