Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-api

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

@@ -4,6 +4,9 @@ package com.oqpo.api.service.stockmng;
 import com.oqpo.api.entity.stockmng.StckCddMgntDtlEntity;
 import com.oqpo.api.entity.stockmng.StckCddMgntInfoEntity;
 import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
+import com.oqpo.api.entity.stockmng.StckMgntDtlHistEntity;
+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.stockmng.StockCddMapper;
@@ -21,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -107,29 +111,27 @@ public class StockCddService extends CommonService {
                 // 재고관리기본정보(stck_mgnt_base_info) 업데이트
                 StckMgntBaseInfoEntity stckEntity = new StckMgntBaseInfoEntity();
                 stckEntity.setBrandId(saveStockCddRequest.getBrandId());
-
-                /*
-    @ApiModelProperty(value = "창고아이디")
-    private String whsId;
-    @ApiModelProperty(value = "LOCATION")
-    private String location;
-    @ApiModelProperty(value = "품목아이디")
-    private String itemId;
-    @ApiModelProperty(value = "단위")
-    private String unit;
-    @ApiModelProperty(value = "재고수량")
-    private int stckQty;
-    @ApiModelProperty(value = "적정재고수량")
-    private int prpStckQty;
-    @ApiModelProperty(value = "안전재고비율")
-    private BigDecimal sftStckRt;
-    @ApiModelProperty(value = "현재고비율")
-    private BigDecimal curStckRt;
-                * */
-
+                stckEntity.setWhsId(saveStockCddRequest.getWhsId());
+                stckEntity.setLocation(saveStockCddRequest.getLocation());
+                stckEntity.setItemId(dtlEntity.getItemId());
+                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);
 
                 // 재고관리상세이력(stck_mgnt_dtl_hist) 등록
+                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.setChgDvsn(ChgDvsn.STOCK_CDD.getCd()); // 재고실사
+                stockMngMapper.insertStckMgntDtlHist(userId, sourceHist);
 
                 idx++;
             }

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

@@ -112,7 +112,7 @@ public class StockMngService extends CommonService {
 
             // 1-2. 소스 이력 등록 (stck_mgnt_dtl_hist)
             StckMgntDtlHistEntity sourceHist = new StckMgntDtlHistEntity();
-            sourceHist.setStckMgntDtlNo(null); // TODO 재고관리상세번호
+            sourceHist.setStckMgntDtlNo(fnGetDealNo(32, "")); // 재고관리상세번호
             sourceHist.setBrandId(source.getBrandId());
             sourceHist.setWhsId(source.getWhsId());
             sourceHist.setLocation(source.getLocation());
@@ -149,7 +149,7 @@ public class StockMngService extends CommonService {
 
             // 2-2. 타겟 이력 등록 (stck_mgnt_dtl_hist)
             StckMgntDtlHistEntity targetHist = new StckMgntDtlHistEntity();
-            targetHist.setStckMgntDtlNo(null); // TODO 재고관리상세번호
+            targetHist.setStckMgntDtlNo(fnGetDealNo(32, "")); // 재고관리상세번호
             targetHist.setBrandId(target.getBrandId());
             targetHist.setWhsId(target.getWhsId());
             targetHist.setLocation(target.getLocation());