입고처리

src/main/java/com/oqpo/api/entity/inoutmng/DeliDtlMgntEntity.java

@@ -38,6 +38,7 @@ public class DeliDtlMgntEntity implements Serializable {
     private Integer whsAmt;
     private String shmtReqUnqNo;
     private String shmtReqDtlNo;
+    private String dlvDtlStCd;
 
 
 

src/main/java/com/oqpo/api/entity/inoutmng/ShmtOdrDtlEntity.java

@@ -32,5 +32,6 @@ public class ShmtOdrDtlEntity implements Serializable {
     private String sysRegId;
     private String sysChgDttm;
     private String sysChgId;
+    private String shmtDtlStCd;
 
 }

src/main/java/com/oqpo/api/mapper/inoutmng/ShmtOdrMapper.java

@@ -53,4 +53,16 @@ public interface ShmtOdrMapper {
 
     List<DeliInfoMgntEntity> selectWarehouseProcList(@Param("brandId") String brandId, @Param("whsId") String whsId, List<DeliDtlMgntEntity> gridUpdateData )throws Exception;
 
+
+    int updateDeliDtlStCd(@Param("userId") String userId, List<DeliDtlMgntEntity> gridUpdateData)throws Exception;
+    List<DeliInfoMgntEntity> selectDeliInfoStList(@Param("userId") String userId, List<DeliDtlMgntEntity> gridUpdateData )throws Exception;
+    int updateDeliInfoStCd(@Param("userId") String userId, List<DeliInfoMgntEntity> gridUpdateData)throws Exception;
+
+    int updateShmtDtlStCd(@Param("userId") String userId, List<ShmtOdrDtlEntity> gridUpdateData)throws Exception;
+    List<ShmtOdrBaseEntity> selectShmtInfoStList(@Param("userId") String userId, List<ShmtOdrDtlEntity> gridUpdateData )throws Exception;
+    int updateShmtInfoStCd(@Param("userId") String userId, List<ShmtOdrBaseEntity> gridUpdateData)throws Exception;
+
+    int updatePchPodrDtlStCd(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridUpdateData)throws Exception;
+
+
 }

src/main/java/com/oqpo/api/mapper/loanmng/LoanStateMapper.java

@@ -32,4 +32,7 @@ public interface LoanStateMapper {
     int updateloanPchReqUseAmt(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("ordPchReqAmt") long ordPchReqAmt);
     int updateloanMinusPchReqUseAmt(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("ordPchReqAmt") long ordPchReqAmt);
 
+    int updateloanMinusInstProc(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("useAmtTotal") long useAmtTotal);
+
+
 }

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

@@ -58,4 +58,8 @@ public interface StockMngMapper {
 
     int insertMultiStckMgntDtlHist(@Param("userId") String userId, List<StckMgntDtlHistEntity> gridInsertData) throws Exception;
 
+    /* 재고수량 증가 - 입고처리로 인함 */
+    int updateWarehouseStockQty(@Param("userId") String userId, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
+
+
 }

src/main/java/com/oqpo/api/service/inoutmng/ShmtOdrService.java

@@ -20,6 +20,7 @@ import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.inoutmng.ShmtOdrMapper;
+import com.oqpo.api.mapper.loanmng.LoanStateMapper;
 import com.oqpo.api.mapper.pomng.PchOrdMapper;
 import com.oqpo.api.mapper.stinfo.BrandMapper;
 import com.oqpo.api.mapper.stinfo.StoreBaseInfoMapper;
@@ -67,6 +68,9 @@ public class ShmtOdrService extends CommonService {
     @Autowired
     private StoreBaseInfoMapper storeBaseInfoMapper;
 
+    @Autowired
+    private LoanStateMapper loanStateMapper;
+
     @Autowired
     private FileMapper fileMapper;
 
@@ -856,6 +860,19 @@ public class ShmtOdrService extends CommonService {
                 List<DeliInfoMgntEntity> targetList  =   shmtOdrMapper.selectWarehouseProcList(saveWarehouseProcRequest.getBrandId(), saveWarehouseProcRequest.getWhsId(), serarchList);
 
                 List<WhsProcInfoPtclEntity> gridUpdateData = new ArrayList<WhsProcInfoPtclEntity>();
+                List<StckMgntBaseInfoEntity> wareGridUpdateData = new ArrayList<StckMgntBaseInfoEntity>();
+                List<DeliDtlMgntEntity> deliDtlGridUpdateData = new ArrayList<DeliDtlMgntEntity>();
+                List<ShmtOdrDtlEntity> shmtDtlGridUpdateData = new ArrayList<ShmtOdrDtlEntity>();
+                List<PchOdrDtlPtclEntity> PchOdrDtlGridUpdateData = new ArrayList<PchOdrDtlPtclEntity>();
+
+
+                // loan_mgnt_unq_no 매장납품일 경우
+                //selectStoreLoanMgntUnqNo
+                String loanMgntUnqNo = "";
+                long loanAmt = 0 ; // 여신차감할 금액 (사용금액 - 여신차감금액,   잔액금액 - 여신차감금액)
+                if (!"".equals(saveWarehouseProcRequest.getStoreId())) {
+                    loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(saveWarehouseProcRequest.getStoreId());
+                }
 
                 // 우선 입고수량과 납품수량 비교를 처리함
                 for (int i = 0 ; i < gridInsertData.size() ; i++) {
@@ -908,17 +925,101 @@ public class ShmtOdrService extends CommonService {
                             whsProcData.setShmtReqDtlNo(targetData.getDeliDtlMgntInfo().getShmtReqDtlNo());
 
                             gridUpdateData.add(whsProcData);
+
+                            // 정산할때 함 여신관련한 여신차감할 입고금액 세팅
+                            //loanAmt = loanAmt + (targetData.getDeliDtlMgntInfo().getUnitAmt() * whsProcData.getWhsQty());
+
+                            // 재고처리를 위한 작업업
+                            StckMgntBaseInfoEntity smbaseInfoEntity = new StckMgntBaseInfoEntity();
+                            smbaseInfoEntity.setBrandId(saveWarehouseProcRequest.getBrandId());
+                            smbaseInfoEntity.setWhsId(saveWarehouseProcRequest.getWhsId());
+                            smbaseInfoEntity.setLocation(whsProcData.getLocation());
+                            smbaseInfoEntity.setItemId(whsProcData.getItemId());
+                            smbaseInfoEntity.setStckQty(whsProcData.getWhsQty());
+                            wareGridUpdateData.add(smbaseInfoEntity);
+
+                            // 납품서 상태 정의  dlvSttmtUnqNo  dlvDtlStCd
+                            DeliDtlMgntEntity deliDtlEntity = new DeliDtlMgntEntity();
+                            deliDtlEntity.setDlvSttmtUnqNo(whsProcData.getDlvSttmtUnqNo());
+                            deliDtlEntity.setDlvSttmtDtlNo(whsProcData.getDlvSttmtDtlNo());
+                            if (whsProcData.getWhsQty() > 0 ) {
+                                deliDtlEntity.setDlvDtlStCd("DLD1");
+                            } else {
+                                deliDtlEntity.setDlvDtlStCd("DLD3");
+                            }
+                            deliDtlGridUpdateData.add(deliDtlEntity);
+
+
+                            // 출하지시 상태정의
+                            if (!"".equals(whsProcData.getShmtReqUnqNo()) && whsProcData.getShmtReqUnqNo() != null) {
+                                ShmtOdrDtlEntity shmtDtlData = new ShmtOdrDtlEntity();
+                                shmtDtlData.setShmtReqUnqNo(whsProcData.getShmtReqUnqNo());
+                                shmtDtlData.setShmtReqDtlNo(whsProcData.getPchReqDtlNo());
+                                if (whsProcData.getWhsQty() > 0 ) {
+                                    shmtDtlData.setShmtDtlStCd("SHMD2");
+                                } else {
+                                    shmtDtlData.setShmtDtlStCd("SHMD3");
+                                }
+
+                                shmtDtlGridUpdateData.add(shmtDtlData);
+                            }
+
+                            PchOdrDtlPtclEntity pchOdrDtlData = new PchOdrDtlPtclEntity();
+                            pchOdrDtlData.setPchPodrUnqNo(whsProcData.getPchPodrUnqNo());
+                            pchOdrDtlData.setPchPodrDtlNo(whsProcData.getPchPodrDtlNo());
+                            if (whsProcData.getWhsQty() > 0 ) {
+                                pchOdrDtlData.setPodrDtlStCd("POD4");
+                            } else {
+                                pchOdrDtlData.setPodrDtlStCd("POD2");
+
+                                if (!"".equals(loanMgntUnqNo)) {
+                                    loanAmt = loanAmt + ( targetData.getDeliDtlMgntInfo().getDlvQty() * targetData.getDeliDtlMgntInfo().getUnitAmt() ) ;
+                                }
+                            }
+
+                            PchOdrDtlGridUpdateData.add(pchOdrDtlData);
                         }
-                    }  // for문 종료
+
+
+                    }  // or문 종료
 
                     // 입고데이타 저장
                     shmtOdrMapper.insertWhsProcInfoPtcl(userId, gridUpdateData);
 
-                    // 여신관련 정리 필요
-
                     // 재고관련 정리 필요
+                    stockMngMapper.updateWarehouseStockQty(userId, wareGridUpdateData);
+
+                    // 납품서 상세 처리
+                    shmtOdrMapper.updateDeliDtlStCd(userId, deliDtlGridUpdateData);
+
+                    // 납품서 헤더 상태 처리
+                    List<DeliInfoMgntEntity> deliInfoStList = shmtOdrMapper.selectDeliInfoStList(userId, deliDtlGridUpdateData);
+                    shmtOdrMapper.updateDeliInfoStCd(userId, deliInfoStList);
+
+                    // 출하지시서 상태 업데이트
+                    if (shmtDtlGridUpdateData.size() > 0) {
+                        shmtOdrMapper.updateShmtDtlStCd(userId,shmtDtlGridUpdateData );
+                        List<ShmtOdrBaseEntity> shmtInfoStList = shmtOdrMapper.selectShmtInfoStList(userId, shmtDtlGridUpdateData);
+                        shmtOdrMapper.updateShmtInfoStCd(userId, shmtInfoStList);
+                    }
 
-                    // 발주데이타 상태, 출하지시상태, 납품서 상태
+
+                    shmtOdrMapper.updatePchPodrDtlStCd(userId, PchOdrDtlGridUpdateData);
+
+                    String pchPodrUnqNo = "";
+                    for (int k = 0; k < PchOdrDtlGridUpdateData.size(); k++) {
+                        if (!pchPodrUnqNo.equals(PchOdrDtlGridUpdateData.get(k).getPchPodrUnqNo())) {
+                            pchPodrUnqNo = PchOdrDtlGridUpdateData.get(k).getPchPodrUnqNo();
+                            String pchOdrStCd = pchOrdService.selectOdrDtlStatusList(pchPodrUnqNo);
+                            pchOrdMapper.updateChgPodrStCd(userId, pchOdrStCd, pchPodrUnqNo);
+                        }
+                    }
+
+                    // 발주 헤더가 취소면 해당 발주건에 대한 사용금액을 원복 처리한다.
+                    if (!"".equals(loanMgntUnqNo) && loanAmt > 0) {
+                        // 여신관련 정리 필요 loanAmt 업데이트
+                        loanStateMapper.updateloanMinusInstProc(loanMgntUnqNo, saveWarehouseProcRequest.getStoreId(), loanAmt);
+                    }
 
                 }
 

src/main/java/com/oqpo/api/web/controller/inoutmng/ShmtOdrController.java

@@ -208,4 +208,24 @@ public class ShmtOdrController {
     public ResponseEntity<GridResponse> selectSpplyDeliGridList(@RequestBody @Valid WarehouseTragetGridRequest warehouseTragetGridRequest) throws Exception {
         return ResponseEntity.ok(shmtOdrService.selectWarehouseTargetList(warehouseTragetGridRequest.getSBrandId(), warehouseTragetGridRequest.getFromDt(), warehouseTragetGridRequest.getToDt(), warehouseTragetGridRequest.getSWhsId(), warehouseTragetGridRequest.getSSpplyId(), warehouseTragetGridRequest.getSDlvSttmtUnqNo(), warehouseTragetGridRequest.getSItemNm(),  warehouseTragetGridRequest.toDTO(warehouseTragetGridRequest)));
     }
+
+
+    /**
+     * 설명 : 입고처리
+     *
+     * @param userId
+     * @param instShmtOdrRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "입고처리 저장")
+    @PostMapping("/save-warehouse")
+    public ResponseEntity<SaveResponse> instShmtOdr(@ApiIgnore String userId, @RequestBody @Valid SaveWarehouseProcRequest saveWarehouseProcRequest) throws Exception {
+        shmtOdrService.saveWarehouseProc(userId,  saveWarehouseProcRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
 }

src/main/java/com/oqpo/api/web/dto/request/inoutmng/SaveWarehouseProcRequest.java

@@ -22,6 +22,8 @@ public class SaveWarehouseProcRequest {
     @NotBlank
     @ApiModelProperty(value = "창고아이디") private String whsId;
 
+    @ApiModelProperty(value = "매장아이디-매장납품일경우 필수") private String storeId;
+
     @ApiModelProperty(value = "납품서파일번호") private String  dlvCnfmDocFileNo ;
 
     @ApiModelProperty(value = "입고 리스트")

src/main/java/com/oqpo/api/web/dto/response/stinfo/store/StoreInfoResponse.java

@@ -104,10 +104,7 @@ public class StoreInfoResponse {
     @ApiModelProperty(value = "y좌표")
     private String longY;
 
-    @ApiModelProperty(value = "잔액")
-    private Integer tmpRcvAcctTotal;
-
-    @ApiModelProperty(value = "가수금액")
+    @ApiModelProperty(value = "현 잔여한도")
     private Integer acctBal;
 
     @ApiModelProperty(value = "매장 은행코드")
@@ -187,7 +184,6 @@ public class StoreInfoResponse {
                 .sysRegId(entity.getSysRegId() == null ? "" :entity.getSysRegId())
                 .sysChgDttm(entity.getSysChgDttm() == null ? "" :entity.getSysChgDttm())
                 .sysChgId(entity.getSysChgId() == null ? "" :entity.getSysChgId())
-                .tmpRcvAcctTotal(entity.getLoanInfo() == null ? 0 : entity.getLoanInfo().getTmpRcvAcctTotal()  == null ? 0 : entity.getLoanInfo().getTmpRcvAcctTotal() )
                 .storeBnkCd(entity.getBnkCd()== null ? "" :entity.getBnkCd())
                 .storeBnkNm(entity.getBnkNm()== null ? "" :entity.getBnkNm())
                 .storeAcctNo(entity.getAcctNo()== null ? "" :entity.getAcctNo())

src/main/resources-env/dev/application.yml

@@ -60,8 +60,8 @@ resttemplate:
 
 ftp:
   path: /web/upload/
-  host: 192.168.0.227
-  port: 2021
+  host: 106.246.249.162
+  port: 32031
   user: upload
   pass: NooUp22!
   domain: http://106.246.249.162:15002/

src/main/resources/mybatis/sqlmaps/inoutmng/ShmtOdr.xml

@@ -95,13 +95,13 @@
         insert into shmt_odr_dtl_ptcl
             (shmt_req_unq_no, shmt_req_dtl_no, item_id, item_nm, unit_amt
             , unit, podr_qty, podr_amt, shmt_qty, shmt_amt, expry_date
-            , pch_podr_unq_no, pch_podr_dtl_no, pch_req_unq_no, pch_req_dtl_no
+            , pch_podr_unq_no, pch_podr_dtl_no, pch_req_unq_no, pch_req_dtl_no, shmt_dtl_st_cd
             , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         values
         <foreach collection="gridInsertData" item="item" separator=",">
             (#{item.shmtReqUnqNo}, #{item.shmtReqDtlNo}, #{item.itemId}, #{item.itemNm}, #{item.unitAmt}
             , #{item.unit}, #{item.podrQty}, #{item.podrAmt}, #{item.shmtQty}, #{item.shmtAmt}, #{item.expryDate}
-            , #{item.pchPodrUnqNo}, #{item.pchPodrDtlNo}, #{item.pchReqUnqNo}, #{item.pchReqDtlNo}
+            , #{item.pchPodrUnqNo}, #{item.pchPodrDtlNo}, #{item.pchReqUnqNo}, #{item.pchReqDtlNo}, 'SHMD1'
             , NOW(), #{userId}, NOW(), #{userId})
         </foreach>
     </insert>
@@ -622,6 +622,7 @@
                 , ptcl.pch_podr_unq_no as 'deliDtlMgntInfo.pch_podr_unq_no', ptcl.pch_podr_dtl_no as 'deliDtlMgntInfo.pch_podr_dtl_no'
                 , ptcl.pch_req_unq_no as 'deliDtlMgntInfo.pch_req_unq_no', ptcl.pch_req_dtl_no as 'deliDtlMgntInfo.pch_req_dlt_no'
                 , ptcl.shmt_req_unq_no as 'deliDtlMgntInfo.shmt_req_unq_no' , ptcl.shmt_req_dtl_no as 'deliDtlMgntInfo.shmt_req_dtl_no'
+                , ptcl.podr_amt as 'deliDtlMgntInfo.podr_amt'
         from deli_info_mgnt info
         join deli_dtl_ptcl ptcl on info.dlv_sttmt_unq_no = ptcl.dlv_sttmt_unq_no
                and concat(ptcl.dlv_sttmt_unq_no, ptcl.dlv_sttmt_dtl_no) in
@@ -635,4 +636,106 @@
         and info.whs_id = #{whsId}
     </select>
 
+
+    <update id="updateDeliDtlStCd" >
+        /* updateDeliDtlStCd */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE deli_dtl_ptcl SET
+            dlv_dtl_st_cd = #{item.dlvDtlStCd},       /* 상태처리 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE dlv_sttmt_unq_no =  #{item.dlvSttmtUnqNo}
+            AND dlv_sttmt_dtl_no = #{item.dlvSttmtDtlNo}
+        </foreach>
+    </update>
+
+
+    <select id="selectDeliInfoStList" resultType="com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity">
+        select gdlv.dlv_sttmt_unq_no
+                , case when gdlv.dlv0 > 0 then 'DLV0'
+                when gdlv.dlv0 = 0 and gdlv.dlv1 > 0 then  'DLV1'
+                when gdlv.dlv0 = 0 and gdlv.dlv1 = 0 then  'DLV2'
+                else '' end as  dlv_st_cd
+        from  (
+                select  dlv_sttmt_unq_no
+                    , sum(case when dlv_dtl_st_cd = 'DLD0' then 1 else 0 end) as dlv0
+                    , sum(case when dlv_dtl_st_cd = 'DLD1' then 1 else 0 end) as dlv1
+                    , sum(case when dlv_dtl_st_cd = 'DLD2' then 1 else 0 end) as dlv2
+                from deli_dtl_ptcl
+                where dlv_sttmt_unq_no in
+                    <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
+                     #{item.dlvSttmtUnqNo}
+                    </foreach>
+                group by dlv_sttmt_unq_no
+        ) gdlv
+    </select>
+
+    <update id="updateDeliInfoStCd" >
+        /* updateDeliInfoStCd */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE deli_info_mgnt SET
+                    dlv_st_cd = #{item.dlvStCd},       /* 상태처리 */
+                    sys_chg_dttm = NOW(),
+                    sys_chg_id = #{userId}
+            WHERE dlv_sttmt_unq_no =  #{item.dlvSttmtUnqNo}
+        </foreach>
+    </update>
+
+
+    <update id="updateShmtDtlStCd" >
+        /* updateShmtDtlStCd */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE shmt_odr_dtl_ptcl SET
+            shmt_dtl_st_cd = #{item.shmtDtlStCd},       /* 상태처리 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE shmt_req_unq_no =  #{item.shmtReqUnqNo}
+            AND shmt_req_dtl_no = #{item.shmtReqDtlNo}
+        </foreach>
+    </update>
+
+    <select id="selectShmtInfoStList" resultType="com.oqpo.api.entity.inoutmng.ShmtOdrDtlEntity">
+        select gdlv.shmt_req_unq_no
+        , case when gdlv.shmd1 > 0 then 'SHM1'
+        when gdlv.shmd1 = 0 and gdlv.shmd2 > 0 then  'SHM2'
+        when gdlv.shmd1 = 0 and gdlv.shmd2 = 0 then  'SHM3'
+        else '' end as  shmt_req_st_cd
+        from  (
+        select  shmt_req_unq_no
+        , sum(case when shmt_dtl_st_cd = 'SHMD1' then 1 else 0 end) as shmd1
+        , sum(case when shmt_dtl_st_cd = 'SHMD2' then 1 else 0 end) as shmd2
+        , sum(case when shmt_dtl_st_cd = 'SHMD3' then 1 else 0 end) as shmd3
+        from shmt_odr_dtl_ptcl
+        where shmt_req_unq_no in
+        <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
+            #{item.shmtReqUnqNo}
+        </foreach>
+        group by shmt_req_unq_no
+        ) gdlv
+
+    </select>
+
+    <update id="updateShmtInfoStCd" >
+        /* updateShmtInfoStCd */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE shmt_odr_base_info SET
+            shmt_req_st_cd = #{item.shmtReqStCd},       /* 상태처리 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE shmt_odr_unq_no =  #{item.shmtReqUnqNo}
+        </foreach>
+    </update>
+
+
+    <update id="updatePchPodrDtlStCd" >
+        /* updatePchPodrDtlStCd */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE pch_odr_dtl_ptcl SET
+            podr_dtl_st_cd = #{item.podrDtlStCd},       /* 상태처리 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE pch_podr_unq_no =  #{item.pchPodrUnqNo}
+            AND pch_podr_dlt_no = #{item.pchPodrDtlNo}
+        </foreach>
+    </update>
 </mapper>

src/main/resources/mybatis/sqlmaps/loanmng/LoanState.xml

@@ -158,4 +158,12 @@
         and   store_id = #{storeId}
     </update>
 
+    <update id="updateloanMinusInstProc">
+        update /* updateloanMinusInstProc */ loan_mgnt_base_info
+        set   use_amt_total = use_amt_total - #{useAmtTotal}
+           , acct_bal = acct_bal - #{acctBal}
+        where loan_mgnt_unq_no = #{loanMgntUnqNo}
+        and   store_id = #{storeId}
+    </update>
+
 </mapper>

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

@@ -406,4 +406,6 @@
         and ptcl.pch_podr_unq_no = #{pchPodrUnqNo}
         and base.spply_id = #{spplyId}
     </select>
+
+
 </mapper>

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

@@ -124,13 +124,13 @@
                 ,store.ctgr_bsns,store.bsns_cndt,store.owner_nm,store.del_yn,store.area_cd,fn_code_nm('AREA_CD',store.area_cd) as area_nm
                 ,store.lat_x,store.long_y,store.oq_brand_id,store.oq_store_id,date_format(store.sys_reg_dttm,'%Y.%m.%d %H:%s:%i') as sys_reg_dttm
                 ,store.sys_reg_id,date_format(store.sys_chg_dttm,'%Y.%m.%d %H:%s:%i') as sys_chg_dttm,store.sys_chg_id
-                ,loan.tmp_rcv_acct_total as 'loanInfo.tmp_rcv_acct_total',loan.acct_bal  as 'loanInfo.acct_bal'
+                ,loan.acct_bal - loan.use_amt_total  as 'loanInfo.loanInfo.acct_bal'
                 ,store.bnk_cd , store.acct_no, store.owac_nm
                 ,brand.bnk_cd as 'brandInfo.bnk_cd', fn_code_nm('BNK_CD',brand.bnk_cd) as 'brandInfo.bnk_nm',  brand.acct_no as 'brandInfo.acct_no', brand.owac_nm as 'brandInfo.owac_nm'
                 ,store.whs_use_yn
         from store_base_info store
         join brand_base_info brand on store.brand_id = brand.brand_id
-        left outer join loan_mgnt_base_info loan on store.loan_mgnt_unq_no = loan.loan_mgnt_unq_no and store.brand_id = loan.brand_id and store.store_id = loan.store_id and loan.use_yn = 'N'
+        left outer join loan_mgnt_base_info loan on store.loan_mgnt_unq_no = loan.loan_mgnt_unq_no and store.brand_id = loan.brand_id and store.store_id = loan.store_id and loan.use_yn = 'Y'
         where 1=1
         and store.brand_id = #{brandId}
         and store.store_id = #{storeId}

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

@@ -322,4 +322,18 @@
         </foreach>
     </insert>
 
+
+    <update id="updateWarehouseStockQty" >
+        /* StockMngMapper.updateWarehouseStockQty */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE stck_mgnt_base_info SET
+            stck_qty = stck_qty + #{item.stckQty},       /* 재고수량 */
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE brand_id = #{item.brandId}
+            AND whs_id = #{item.whsId}
+            AND location = #{item.location}
+            AND item_id = #{item.itemId}
+        </foreach>
+    </update>
 </mapper>