재고 출고가능수량 체크 api

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

@@ -60,4 +60,8 @@ public class StckMgntBaseInfoEntity implements Serializable {
     @ApiModelProperty(value = "관련번호")
     private String relationNo;
 
+    @ApiModelProperty(value = "출고가능수량")
+    private Integer whsPassQty;
+
+
 }

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

@@ -6,6 +6,7 @@ import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
 import com.oqpo.api.entity.stockmng.StckMgntDtlHistEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.stockmng.StockMngCddGridRequest;
+import com.oqpo.api.web.dto.request.stockmng.StockMngPassQtyGridRequest;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -61,5 +62,7 @@ public interface StockMngMapper {
     /* 재고수량 증가 - 입고처리로 인함 */
     int updateWarehouseStockQty(@Param("userId") String userId, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
 
+    List<StckMgntBaseInfoEntity> selectWhsLocOutPassQty(@Param("brandId") String brandId, @Param("whsId") String whsId, @Param("location") String location,
+                                                        List<StckMgntBaseInfoEntity> gridItemData) throws Exception;
 
 }

src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -118,6 +118,7 @@ public class PchReqService extends CommonService {
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
 
+        System.out.println("================>" + sItemNm);
         int gridRecords = pchReqMapper.selectPchReqGridCnt( sBrandId,sStoreId,  fromDt, toDt, sWhsId,sPchReqStCd, sItemNm );
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
         List<PchReqBaseInfoEntity> entities = pchReqMapper.selectPchReqGridList( sBrandId, sStoreId, fromDt, toDt, sWhsId,sPchReqStCd, sItemNm, gridRequest);

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

@@ -11,10 +11,13 @@ import com.oqpo.api.service.CommonService;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.stockmng.ProcStockRequest;
 import com.oqpo.api.web.dto.request.stockmng.StockMngCddGridRequest;
+import com.oqpo.api.web.dto.request.stockmng.StockMngPassQtyGridRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOrdInitInfoResponse;
 import com.oqpo.api.web.dto.response.stockmng.StockHistListResponse;
 import com.oqpo.api.web.dto.response.stockmng.StockMngInfoResponse;
 import com.oqpo.api.web.dto.response.stockmng.StockMngListResponse;
+import com.oqpo.api.web.dto.response.stockmng.StockMngPassQtyListResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,8 +44,7 @@ public class StockMngService extends CommonService {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        // fromDt = fromDt == null ? null : fromDt.replace(".", "");
-        // toDt = toDt == null ? null : toDt.replace(".", "");
+
 
         int gridRecords = stockMngMapper.selectStockMngGridCnt(sBrandId, sStoreId, sWhsId, sLocation,
                 sItemStCd, sItemType, sItemGubun,
@@ -216,4 +218,17 @@ public class StockMngService extends CommonService {
         }
     }
 
+    /*
+      재고 출고가능수량
+     */
+    public StockMngPassQtyListResponse selectWhsLocOutPassQty(StockMngPassQtyGridRequest stockMngPassQtyGridRequest) throws Exception {
+
+        List<StckMgntBaseInfoEntity> gridItemData = stockMngPassQtyGridRequest.toCodeEntities(stockMngPassQtyGridRequest.getGridItemData());
+
+        List<StckMgntBaseInfoEntity> entities = stockMngMapper.selectWhsLocOutPassQty(stockMngPassQtyGridRequest.getBrandId(),
+                stockMngPassQtyGridRequest.getWhsId(), stockMngPassQtyGridRequest.getLocation(), gridItemData);
+
+
+        return StockMngPassQtyListResponse.toDTO(entities); // GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
 }

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

@@ -2,13 +2,12 @@ package com.oqpo.api.web.controller.stockmng;
 
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.stockmng.StockMngService;
-import com.oqpo.api.web.dto.request.stockmng.ProcStockRequest;
-import com.oqpo.api.web.dto.request.stockmng.StockHistGridRequest;
-import com.oqpo.api.web.dto.request.stockmng.StockMngCddGridRequest;
-import com.oqpo.api.web.dto.request.stockmng.StockMngGridRequest;
+import com.oqpo.api.web.dto.request.stockmng.*;
 import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.SaveResponse;
+import com.oqpo.api.web.dto.response.stockmng.StockHistListResponse;
 import com.oqpo.api.web.dto.response.stockmng.StockMngInfoResponse;
+import com.oqpo.api.web.dto.response.stockmng.StockMngPassQtyListResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -125,4 +124,21 @@ public class StockMngController {
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
 
+    /**
+     * 설명 : 창고별 출고가능 수량 정보 출력
+     *
+     * @param stockMngCddGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "창고별 출고가능 수량 정보 출력")
+    @PostMapping("/whs-passqty-list")
+    public ResponseEntity<StockMngPassQtyListResponse> whsPassQty(@RequestBody @Valid StockMngPassQtyGridRequest stockMngPassQtyGridRequest) throws Exception {
+        return ResponseEntity.ok(stockMngService.selectWhsLocOutPassQty(stockMngPassQtyGridRequest));
+    }
+
+//,  pchOrdSearchGridRequest.toDTO(pchOrdSearchGridRequest)
 }

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

@@ -0,0 +1,54 @@
+package com.oqpo.api.web.dto.request.stockmng;
+
+import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
+import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import com.oqpo.api.web.dto.request.pomng.pchReq.SavePchReqlRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Getter
+@Setter
+public class StockMngPassQtyGridRequest {
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "창고아이디")
+    private String whsId;
+    @ApiModelProperty(value = "LOCATION")
+    private String location;
+
+    @ApiModelProperty(value = "품목별 출고가능수량 리스트")
+    private List<StockMngPassQtyGridRequest.StockPassItemData> gridItemData;
+
+
+    public List<StckMgntBaseInfoEntity> toCodeEntities(List<StockMngPassQtyGridRequest.StockPassItemData> gridData) {
+        List<StckMgntBaseInfoEntity> entities = new ArrayList<>();
+        if (gridData == null || gridData.size() == 0)
+            return entities;
+
+        gridData.forEach(x -> {
+            StckMgntBaseInfoEntity entity = new StckMgntBaseInfoEntity();
+            entity.setItemId(x.getItemId());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    public static class StockPassItemData {
+
+        @ApiModelProperty(value = "품목아이디")
+        private String itemId;
+    }
+
+
+}

src/main/java/com/oqpo/api/web/dto/response/pomng/pchOrd/PchOrdInitInfoResponse.java

@@ -93,6 +93,7 @@ public class PchOrdInitInfoResponse {
     @Builder
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
     static class PchOrdDtlInfo {
+
         @ApiModelProperty(value = "구매요청번호")
         private String pchReqUnqNo;
 

src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchReqInfoResponse.java

@@ -96,14 +96,15 @@ public class PchReqInfoResponse {
                 .storeNm(uEntity.getStoreNm() == null ? "" :uEntity.getStoreNm())
                 .authTpCd(uEntity.getAuthTpCd() == null ? "" : uEntity.getAuthTpCd())
                 .ordUseAmt(loanEntity == null ? 0 : loanEntity.getOrdUseAmt() == null ? 0 : loanEntity.getOrdUseAmt())
-                .loanDvsn(loanEntity == null ?  "" : loanEntity.getLoanDvsn() == null ? "" : loanEntity.getLoanDvsn())
-                .loanDvsnNm(loanEntity == null ?  "" : loanEntity.getLoanDvsnNm() == null ? "" : loanEntity.getLoanDvsnNm())
+                .loanDvsn(loanEntity == null ?  "" : loanEntity.getLoanDvsn() == null ? "LD03" : loanEntity.getLoanDvsn())
+                .loanDvsnNm(loanEntity == null ?  "" : loanEntity.getLoanDvsnNm() == null ? "무정산" : loanEntity.getLoanDvsnNm())
                 .loanMgntUnqNo(loanEntity == null ?  "" : loanEntity.getLoanMgntUnqNo() == null ? "" : loanEntity.getLoanMgntUnqNo())
                 .pchApprAmt(entity.getPchApprAmt())
                 .pchApprYn(entity.getPchApprYn())
                 .pchApprNm(entity.getPchApprYn() == "Y" ? "선결재" : "미납")
                 .pchReqDtlList(dtlEntityList.stream()
                         .map(m -> PchReqDtlInfo.builder()
+                                .viewCd("R")
                                 .pchReqUnqNo(m.getPchReqUnqNo())
                                 .pchReqDtlNo(m.getPchReqDtlNo())
                                 .itemId(m.getItemId() == null ? "" :m.getItemId())
@@ -127,7 +128,7 @@ public class PchReqInfoResponse {
     @Builder
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
     static class PchReqDtlInfo {
-
+        @ApiModelProperty(value = "작업상태") private String viewCd;
         @ApiModelProperty(value = "구매요청고유번호") private String pchReqUnqNo;
         @ApiModelProperty(value = "구매요청상세번호") private String pchReqDtlNo;
         @ApiModelProperty(value = "품목아이디") private String itemId;

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

@@ -0,0 +1,51 @@
+package com.oqpo.api.web.dto.response.stockmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.ActionEntity;
+import com.oqpo.api.entity.CodeEntity;
+import com.oqpo.api.entity.oper.MemberEntity;
+import com.oqpo.api.entity.oper.MenuEntity;
+import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
+import com.oqpo.api.web.dto.response.session.SessionResponse;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class StockMngPassQtyListResponse {
+
+    @ApiModelProperty(value = "출고가능수량 리스트")
+    private List<StockMngPassQtyListResponse.WhsPassOtyInfo> whsPassList;
+
+
+    public static StockMngPassQtyListResponse toDTO(List<StckMgntBaseInfoEntity> whsStockList) {
+        if (whsStockList == null) return null;
+        return StockMngPassQtyListResponse.builder()
+                .whsPassList(whsStockList.stream()
+                        .map(m -> StockMngPassQtyListResponse.WhsPassOtyInfo.builder()
+                                .itemId(m.getItemId())
+                                .whsPassQty(m.getWhsPassQty() == null ? 0 : m.getWhsPassQty())
+                                .build())
+                        .collect(Collectors.toList()))
+                .build();
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class WhsPassOtyInfo {
+        @ApiModelProperty(value = "품목아이디")
+        private String itemId;
+        @ApiModelProperty(value = "출고가능수량")
+        private Integer whsPassQty;
+    }
+
+}

src/main/resources/mybatis/sqlmaps/pomng/PchReq.xml

@@ -26,8 +26,8 @@
         </if>
         <if test="sItemNm != null and sItemNm != ''">
             and    pch_req_unq_no in ( select pch_req_unq_no from pch_req_dtl_ptcl
-            where date_format(sys_reg_dttm,'%Y%m%d') between #{fromDt} and #{toDt})
-            and  item_id like concat('%',#{sItemNm},'%') or item_nm like concat('%',#{sItemNm},'%')
+            where date_format(sys_reg_dttm,'%Y%m%d') between #{fromDt} and #{toDt}
+            and  item_id like concat('%',#{sItemNm},'%') or item_nm like concat('%',#{sItemNm},'%'))
         </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
@@ -65,8 +65,8 @@
             </if>
             <if test="sItemNm != null and sItemNm != ''">
                 and    pch_req_unq_no in ( select pch_req_unq_no from pch_req_dtl_ptcl
-                where date_format(sys_reg_dttm,'%Y%m%d') between #{fromDt} and #{toDt})
-                and  item_id like concat('%',#{sItemNm},'%') or item_nm like concat('%',#{sItemNm},'%')
+                where date_format(sys_reg_dttm,'%Y%m%d') between #{fromDt} and #{toDt}
+                and  item_id like concat('%',#{sItemNm},'%') or item_nm like concat('%',#{sItemNm},'%') )
             </if>
     </select>
 

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

@@ -336,4 +336,16 @@
             AND item_id = #{item.itemId}
         </foreach>
     </update>
+
+    <select id="selectWhsLocOutPassQty" resultType="com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity">
+        /* StockMngMapper.selectWhsLocOutPassQty */
+        SELECT A.item_id, A.item_nm, IFNULL(B.unit, A.unit) AS unit, ( B.stck_qty - B.wait_qty ) as whs_pass_qty
+        FROM item_base_info A
+        LEFT JOIN stck_mgnt_base_info B ON A.item_id = B.item_id AND B.brand_id = #{brandId} AND B.whs_id = #{whsId} AND B.location = #{location}
+        WHERE A.brand_id = #{brandId}
+        AND A.item_id IN
+        <foreach collection="gridItemData" item="item" separator="," open="(" close=")">
+            #{item.itemId}
+        </foreach>
+    </select>
 </mapper>