실사 저장 - 엑셀 업로드 버그 수정

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

@@ -38,6 +38,9 @@ public interface StockMngMapper {
     StckMgntBaseInfoEntity selectStckMgntBaseInfo(@Param("brandId") String brandId, @Param("whsId") String whsId,
                                                   @Param("location") String location, @Param("itemId") String itemId) throws Exception;
 
+    StckMgntBaseInfoEntity selectStckMgntBaseInfo4CddProc(@Param("brandId") String brandId, @Param("whsId") String whsId,
+                                                          @Param("location") String location, @Param("itemId") String itemId) throws Exception;
+
     int insertStckMgntBaseInfo(@Param("userId") String userId, StckMgntBaseInfoEntity entity) throws Exception;
 
     int updateStckMgntBaseInfo4StckProc(@Param("userId") String userId, StckMgntBaseInfoEntity entity) throws Exception;
@@ -49,6 +52,6 @@ public interface StockMngMapper {
     List<StckMgntBaseInfoEntity> selectStockCddGridList(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("whsId") String whsId, @Param("location") String location,
                                                         List<StockMngCddGridRequest.StockCddReqData> gridItemData) throws Exception;
 
-    int updateStckPoUseQty(@Param("userId") String userId, @Param("brandId") String brandId, @Param("whsId") String whsId,@Param("location") String location, List<StckMgntBaseInfoEntity> gridUpdateData ) throws Exception;
+    int updateStckPoUseQty(@Param("userId") String userId, @Param("brandId") String brandId, @Param("whsId") String whsId, @Param("location") String location, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
 
 }

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

@@ -109,19 +109,13 @@ public class StockCddService extends CommonService {
             int idx = 1;
             for (StckCddMgntDtlEntity dtlEntity : dtlList) {
                 // 기존수량 조회
-                StckMgntBaseInfoEntity baseInfo = stockMngMapper.selectStckMgntBaseInfo(saveStockCddRequest.getBrandId(), saveStockCddRequest.getWhsId(),
+                StckMgntBaseInfoEntity baseInfo = stockMngMapper.selectStckMgntBaseInfo4CddProc(saveStockCddRequest.getBrandId(), saveStockCddRequest.getWhsId(),
                         saveStockCddRequest.getLocation(), dtlEntity.getItemId());
-
-                // 재고관리기본정보가 없는 경우
-                ItemEntity itemEntity = null;
-                if (baseInfo == null) {
-                    itemEntity = itemMapper.selectItemInfo(saveStockCddRequest.getBrandId(), dtlEntity.getItemId());
-                }
                 // 재고실사상세정보 등록
                 dtlEntity.setCddId(infoEntity.getCddId());
                 dtlEntity.setCddSeq(idx);
-                dtlEntity.setUnit(baseInfo == null ? itemEntity.getUnit() : baseInfo.getUnit());
-                dtlEntity.setComExstQty(baseInfo == null ? 0 : baseInfo.getStckQty()); // 기존재고수량
+                dtlEntity.setUnit(baseInfo.getUnit());
+                dtlEntity.setComExstQty(baseInfo.getStckQty()); // 기존재고수량
                 dtlEntity.setChgQty(dtlEntity.getCddQty() - dtlEntity.getComExstQty()); // 변동수량 = 실사수량 - 기존재고수량
                 stockCddMapper.insertStckCddMgntDtl(userId, dtlEntity);
 
@@ -132,12 +126,14 @@ public class StockCddService extends CommonService {
                 stckEntity.setLocation(saveStockCddRequest.getLocation());
                 stckEntity.setItemId(dtlEntity.getItemId());
                 stckEntity.setStckQty(dtlEntity.getCddQty()); // 재고수량 : 실사수량
-                double curStckRt = Math.round(stckEntity.getStckQty() * 100 / baseInfo.getPrpStckQty() * 100) / 100.0;
+                double curStckRt = 0;
+                if (baseInfo.getPrpStckQty() > 0) {
+                    curStckRt = Math.round(stckEntity.getStckQty() * 100 / baseInfo.getPrpStckQty() * 100) / 100.0;
+                }
                 stckEntity.setCurStckRt(BigDecimal.valueOf(curStckRt)); // 현재고비율((재고수량 * 100) / 적정재고)
-                if (baseInfo == null) {
+                int result = stockMngMapper.updateStckMgntBaseInfo4StckProc(userId, stckEntity);
+                if (result < 1) {
                     stockMngMapper.insertStckMgntBaseInfo(userId, stckEntity);
-                } else {
-                    stockMngMapper.updateStckMgntBaseInfo4StckProc(userId, stckEntity);
                 }
 
                 // 재고관리상세이력(stck_mgnt_dtl_hist) 등록
@@ -148,7 +144,7 @@ public class StockCddService extends CommonService {
                 sourceHist.setWhsId(stckEntity.getWhsId());
                 sourceHist.setLocation(stckEntity.getLocation());
                 sourceHist.setItemId(stckEntity.getItemId());
-                sourceHist.setItemNm(baseInfo == null ? itemEntity.getItemNm() : baseInfo.getItemNm());
+                sourceHist.setItemNm(baseInfo.getItemNm());
                 sourceHist.setInoutCd(dtlEntity.getChgQty() >= 0 ? InOutCd.IN.getCd() : InOutCd.OUT.getCd()); // 입출고구분
                 sourceHist.setInoutQty(dtlEntity.getChgQty()); // 입출고수량
                 sourceHist.setChgDvsn(ChgDvsn.STOCK_CDD.getCd()); // 재고실사

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

@@ -139,6 +139,18 @@
         AND A.item_id = #{itemId}
     </select>
 
+    <select id="selectStckMgntBaseInfo4CddProc" resultType="com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity">
+        /* StockMngMapper.selectStckMgntBaseInfo4CddProc */
+        SELECT A.brand_id, A.whs_id, C.whs_nm, A.location, D.location_nm, A.item_id, IFNULL(A.unit, B.UNIT) AS unit, A.stck_qty, A.prp_stck_qty, A.sft_stck_rt, A.cur_stck_rt,
+            DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id, DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id,
+            B.item_nm
+        FROM item_base_info B
+        LEFT JOIN stck_mgnt_base_info A ON A.item_id = B.item_id AND A.brand_id = #{brandId} AND A.whs_id = #{whsId} AND A.location = #{location}
+        LEFT JOIN whs_mgnt_base_info C ON A.brand_id = C.brand_id AND A.whs_id = C.whs_id
+        LEFT JOIN whs_mgnt_base_loc D ON A.brand_id = D.brand_id AND A.whs_id = D.whs_id AND A.location = D.location
+        WHERE B.item_id = #{itemId}
+    </select>
+
     <insert id="insertStckMgntBaseInfo" >
         /* StockMngMapper.insertStckMgntBaseInfo */
         INSERT INTO stck_mgnt_base_info