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

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

@@ -3,6 +3,7 @@ package com.oqpo.api.service.stockmng;
 
 import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.stinfo.BrandEntity;
+import com.oqpo.api.entity.stinfo.ItemEntity;
 import com.oqpo.api.entity.stockmng.StckCddMgntDtlEntity;
 import com.oqpo.api.entity.stockmng.StckCddMgntInfoEntity;
 import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
@@ -11,6 +12,7 @@ import com.oqpo.api.enums.ChgDvsn;
 import com.oqpo.api.enums.InOutCd;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.CommonMapper;
+import com.oqpo.api.mapper.stinfo.ItemMapper;
 import com.oqpo.api.mapper.stockmng.StockCddMapper;
 import com.oqpo.api.mapper.stockmng.StockMngMapper;
 import com.oqpo.api.service.CommonService;
@@ -44,6 +46,9 @@ public class StockCddService extends CommonService {
     @Autowired
     private StockMngMapper stockMngMapper;
 
+    @Autowired
+    private ItemMapper itemMapper;
+
     /*
       재고실사 그리드 리스트 조회
      */
@@ -107,12 +112,17 @@ public class StockCddService extends CommonService {
                 StckMgntBaseInfoEntity baseInfo = stockMngMapper.selectStckMgntBaseInfo(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.getUnit());
-                dtlEntity.setComExstQty(baseInfo.getStckQty()); // 기존재고수량
-                dtlEntity.setChgQty(dtlEntity.getCddQty() - baseInfo.getStckQty()); // 변동수량 = 실사수량 - 기존재고수량
+                dtlEntity.setUnit(baseInfo == null ? itemEntity.getUnit() : baseInfo.getUnit());
+                dtlEntity.setComExstQty(baseInfo == null ? 0 : baseInfo.getStckQty()); // 기존재고수량
+                dtlEntity.setChgQty(dtlEntity.getCddQty() - dtlEntity.getComExstQty()); // 변동수량 = 실사수량 - 기존재고수량
                 stockCddMapper.insertStckCddMgntDtl(userId, dtlEntity);
 
                 // 재고관리기본정보(stck_mgnt_base_info) 업데이트
@@ -124,19 +134,23 @@ public class StockCddService extends CommonService {
                 stckEntity.setStckQty(dtlEntity.getCddQty()); // 재고수량 : 실사수량
                 double curStckRt = Math.round(stckEntity.getStckQty() * 100 / baseInfo.getPrpStckQty() * 100) / 100.0;
                 stckEntity.setCurStckRt(BigDecimal.valueOf(curStckRt)); // 현재고비율((재고수량 * 100) / 적정재고)
-                stockMngMapper.updateStckMgntBaseInfo4StckProc(userId, stckEntity);
+                if (baseInfo == null) {
+                    stockMngMapper.insertStckMgntBaseInfo(userId, stckEntity);
+                } else {
+                    stockMngMapper.updateStckMgntBaseInfo4StckProc(userId, stckEntity);
+                }
 
                 // 재고관리상세이력(stck_mgnt_dtl_hist) 등록
-                int inoutQty = dtlEntity.getCddQty() - baseInfo.getStckQty(); // 입출고수량
+                // int inoutQty = dtlEntity.getCddQty() - baseInfo.getStckQty(); // 입출고수량
                 StckMgntDtlHistEntity sourceHist = new StckMgntDtlHistEntity();
                 sourceHist.setStckMgntDtlNo(fnGetDealNo(32, "")); // 재고관리상세번호
                 sourceHist.setBrandId(stckEntity.getBrandId());
                 sourceHist.setWhsId(stckEntity.getWhsId());
                 sourceHist.setLocation(stckEntity.getLocation());
                 sourceHist.setItemId(stckEntity.getItemId());
-                sourceHist.setItemNm(baseInfo.getItemNm());
-                sourceHist.setInoutCd(inoutQty >= 0 ? InOutCd.IN.getCd() : InOutCd.OUT.getCd()); // 입출고구분
-                sourceHist.setInoutQty(inoutQty); // 입출고수량
+                sourceHist.setItemNm(baseInfo == null ? itemEntity.getItemNm() : baseInfo.getItemNm());
+                sourceHist.setInoutCd(dtlEntity.getChgQty() >= 0 ? InOutCd.IN.getCd() : InOutCd.OUT.getCd()); // 입출고구분
+                sourceHist.setInoutQty(dtlEntity.getChgQty()); // 입출고수량
                 sourceHist.setChgDvsn(ChgDvsn.STOCK_CDD.getCd()); // 재고실사
                 stockMngMapper.insertStckMgntDtlHist(userId, sourceHist);