입고처리 및 입고현황

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

@@ -75,7 +75,7 @@ public class WhsProcInfoPtclEntity implements Serializable {
     @ApiModelProperty(value = "품목명")
     private String itemNm;
     @ApiModelProperty(value = "입고금액")
-    private Integer whsAmt;
+    private Long whsAmt;
     @ApiModelProperty(value = "입고배송비")
     private String whsDlvChrg;
     @ApiModelProperty(value = "납품담당자아이디")

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

@@ -64,5 +64,7 @@ public interface ShmtOdrMapper {
 
     int updatePchPodrDtlStCd(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridUpdateData)throws Exception;
 
+    List<WhsProcInfoPtclEntity> selectWarehouseList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sPchPodrUnqNo") String sPchPodrUnqNo, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest  )throws Exception;
+    int selectWarehouseCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,@Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sPchPodrUnqNo") String sPchPodrUnqNo, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm  )throws Exception;
 
 }

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

@@ -1,6 +1,7 @@
 package com.oqpo.api.mapper.loanmng;
 
 
+import com.oqpo.api.entity.inoutmng.DeliDtlMgntEntity;
 import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
 import com.oqpo.api.entity.loanmng.LoanMgntDtlHstEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
@@ -34,5 +35,7 @@ public interface LoanStateMapper {
 
     int updateloanMinusInstProc(@Param("loanMgntUnqNo") String loanMgntUnqNo, @Param("storeId") String storeId, @Param("useAmtTotal") long useAmtTotal);
 
+    int updateListLoanMinusProc(@Param("userId") String userId, List<LoanMgntBaseInfoEntity> gridUpdateData );
+
 
 }

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

@@ -5,6 +5,7 @@ import com.oqpo.api.entity.inoutmng.DeliDtlMgntEntity;
 import com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity;
 import com.oqpo.api.entity.inoutmng.ShmtOdrBaseEntity;
 import com.oqpo.api.entity.inoutmng.ShmtOdrDtlEntity;
+import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
 import com.oqpo.api.entity.oper.FileEntity;
 import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
@@ -134,6 +135,10 @@ public class ShmtOdrService extends CommonService {
             List<PchOdrDtlPtclEntity> gridInsertData = instShmtOdrRequest.toCodeEntities(instShmtOdrRequest.getGridInsertData());
             List<PchOdrBaseInfoEntity> jobList = shmtOdrMapper.selectShmtJobDataList(instShmtOdrRequest.getBrandId(), gridInsertData);
             List<StckMgntBaseInfoEntity> stockList = new ArrayList<StckMgntBaseInfoEntity>();
+
+            //여신관련하여 출하지시시 납품수량이 발주수량보다 적을 경우 사용금액을 차액만큼 원복처리를 위한 데이타
+            List<LoanMgntBaseInfoEntity> loanList = new ArrayList<LoanMgntBaseInfoEntity>();
+
             String whsId = "";
             String location = "";
             String shmtWhsId = "";
@@ -170,6 +175,40 @@ public class ShmtOdrService extends CommonService {
                                 throw new GlobalException(SystemMessageCode.ERR_NONEXPRY);
                             }
                         }
+
+                        if (reqEntity.getShmtQty() < entity.getPchOdrDtlInfo().getPodrQty()) {
+                            // 출고수량보다 발주수량클경우 구매금액을 차감 처리.
+                            String loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(entity.getStoreId());
+
+                            if (loanList.size() > 0) {
+                                String exchk = "N";
+                                for (int la = 0 ; la < loanList.size() ; la++ ) {
+                                    if (loanMgntUnqNo.equals(loanList.get(la).getLoanMgntUnqNo())) {
+                                        long sumAmt = loanList.get(la).getUseAmtTotal();
+                                        sumAmt = sumAmt + ((entity.getPchOdrDtlInfo().getPodrQty() - reqEntity.getShmtQty()) * entity.getPchOdrDtlInfo().getUnitAmt());
+                                        loanList.get(la).setUseAmtTotal(sumAmt);
+                                        exchk = "Y";
+                                        break;
+                                    }
+                                }
+
+                                if ("N".equals(exchk)) {
+                                    LoanMgntBaseInfoEntity loanEntity = new LoanMgntBaseInfoEntity();
+                                    loanEntity.setLoanMgntUnqNo(loanMgntUnqNo);
+                                    loanEntity.setStoreId(entity.getStoreId());
+                                    loanEntity.setUseAmtTotal((entity.getPchOdrDtlInfo().getPodrQty() - reqEntity.getShmtQty()) * entity.getPchOdrDtlInfo().getUnitAmt());
+                                    loanList.add(loanEntity);
+                                }
+                            } else {
+                                LoanMgntBaseInfoEntity loanEntity = new LoanMgntBaseInfoEntity();
+                                loanEntity.setLoanMgntUnqNo(loanMgntUnqNo);
+                                loanEntity.setStoreId(entity.getStoreId());
+                                loanEntity.setUseAmtTotal((entity.getPchOdrDtlInfo().getPodrQty() - reqEntity.getShmtQty()) * entity.getPchOdrDtlInfo().getUnitAmt());
+
+                                loanList.add(loanEntity);
+                            }
+                        }
+
                         expryDate = reqEntity.getExpryDate().replaceAll("\\.", "");
                         shmtQty = reqEntity.getShmtQty();
 
@@ -185,6 +224,7 @@ public class ShmtOdrService extends CommonService {
                     shmtBaseEntity.setShmtTotalAmt(shmtTotalAmt);
                     deliBaseEntity.setDlvAmt(shmtTotalAmt);
 
+
                     ShmtOdrDtlEntity inaddDtlEntity = new ShmtOdrDtlEntity();
                     inaddDtlEntity.setShmtReqUnqNo(shmtReqUnqNo);
                     int dtlNo = itemQty * 10;
@@ -388,6 +428,11 @@ public class ShmtOdrService extends CommonService {
                 System.out.println("============================" + stockList.size());
 
                 System.out.println("============================" + "end");
+                // 납품수량 변동발생시 처리
+                if (loanList.size() > 0) {
+                    loanStateMapper.updateListLoanMinusProc(userId, loanList);
+                }
+
 
                 // 재고수량 변동 및 안전비율계산(없애기로함) 처리후 저장함함
                 stockMngMapper.updateMinStockQty(userId, stockList);
@@ -578,7 +623,7 @@ public class ShmtOdrService extends CommonService {
     }
 
 
-    /* 공급사 납품서 생성 최기 정보 */
+    /* 공급사 납품서 생성 초기 정보 */
     public SpplyInvInitResponse selectSpplyShmtOdrInfo(String brandId, String spplyId, String pchPodrUnqNo) throws Exception {
         PchOdrBaseInfoEntity entity = shmtOdrMapper.selectSpplyShmtOdrInfo(brandId, spplyId, pchPodrUnqNo);
         List<PchOdrDtlPtclEntity> dtlEntity = shmtOdrMapper.selectSpplyShmtOdrList(pchPodrUnqNo);
@@ -597,13 +642,18 @@ public class ShmtOdrService extends CommonService {
             String expryDate = "";
             int shmtQty = 0;
             String dlvSttmtUnqNo = "";
+            String storeId = "" ;
+            int chgLoanAmt = 0 ;
 
             DeliInfoMgntEntity deliBaseEntity = new DeliInfoMgntEntity();
             List<DeliDtlMgntEntity> deliDtlList = new ArrayList<DeliDtlMgntEntity>();
 
+
             for (int i = 0; i < jobList.size(); i++) {
                 PchOdrBaseInfoEntity entity = jobList.get(i);
 
+
+
                 for (int j = 0; j < gridInsertData.size(); j++) {
                     PchOdrDtlPtclEntity reqEntity = gridInsertData.get(j);
                     if (entity.getPchPodrUnqNo().equals(reqEntity.getPchPodrUnqNo()) && entity.getPchOdrDtlInfo().getPchPodrDtlNo().equals(reqEntity.getPchPodrDtlNo())) {
@@ -618,6 +668,17 @@ public class ShmtOdrService extends CommonService {
                                 throw new GlobalException(SystemMessageCode.ERR_NONEXPRY);
                             }
                         }
+
+                        // 동일 납품처가 아니면 오류 처리
+                        if (!"".equals(storeId) && !storeId.equals(entity.getStoreId())) {
+                            throw new GlobalException(SystemMessageCode.ERR_NEQWHSID);
+                        }
+
+                        if (reqEntity.getShmtQty() < entity.getPchOdrDtlInfo().getPodrQty()) {
+
+                            chgLoanAmt = chgLoanAmt + (entity.getPchOdrDtlInfo().getPodrQty() - reqEntity.getShmtQty()) * entity.getPchOdrDtlInfo().getUnitAmt();
+                        }
+
                         expryDate = reqEntity.getExpryDate().replaceAll("\\.", "");
                         shmtQty = reqEntity.getShmtQty();
 
@@ -681,6 +742,13 @@ public class ShmtOdrService extends CommonService {
             shmtOdrMapper.insertDeliInfoMngt(userId, deliBaseEntity);
             shmtOdrMapper.insertDeliDtlPtcl(userId, deliDtlList);
 
+            // 변동금액 시 여신수정
+            if (chgLoanAmt > 0 ) {
+                String loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(storeId);
+                loanStateMapper.updateloanMinusInstProc(loanMgntUnqNo, storeId, chgLoanAmt);
+            }
+
+
             for (int poi = 0; poi < gridInsertData.size(); poi++) {
                 gridInsertData.get(poi).setPodrDtlStCd("POD3");
             }
@@ -912,7 +980,7 @@ public class ShmtOdrService extends CommonService {
                             whsProcData.setDlvMgrMblNo(targetData.getDlvMgrMblNo());
                             whsProcData.setItemId(targetData.getDeliDtlMgntInfo().getItemId());
                             whsProcData.setItemNm(targetData.getDeliDtlMgntInfo().getItemNm());
-                            whsProcData.setWhsAmt(targetData.getDeliDtlMgntInfo().getUnitAmt() * whsProcData.getWhsQty());
+                            whsProcData.setWhsAmt(Long.valueOf(targetData.getDeliDtlMgntInfo().getUnitAmt() * whsProcData.getWhsQty()));
                             whsProcData.setWhsDlvChrg(null);
                             //whsProcData.setDlvMgrId(targetData.getdlvmgr);
                             whsProcData.setDlvCnfmDocFileNo(whsProcData.getDlvCnfmDocFileNo());
@@ -1023,15 +1091,8 @@ public class ShmtOdrService extends CommonService {
 
                 }
 
-
-
-
             }
 
-
-
-
-
         } catch (GlobalException e) {
             //e.getStackTrace();
             e.printStackTrace();
@@ -1042,6 +1103,48 @@ public class ShmtOdrService extends CommonService {
         }
     }
 
+
+    /*
+      입고 현황 그리드 리스트 조회  @Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,
+      @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sPchPodrUnqNo") String sPchPodrUnqNo, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm
+     */
+    public GridResponse selectWarehouseGridList(String sBrandId, String sStoreId,  String fromDt, String toDt, String sPchPodrUnqNo, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        fromDt = fromDt == null ? null : fromDt.replace(".", "");
+        toDt = toDt == null ? null : toDt.replace(".", "");
+
+        int gridRecords = shmtOdrMapper.selectWarehouseCnt(sBrandId, sStoreId, fromDt, toDt, sPchPodrUnqNo, sSpplyId, sWhsId, sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<WhsProcInfoPtclEntity> entities = shmtOdrMapper.selectWarehouseList(sBrandId, sStoreId, fromDt, toDt, sPchPodrUnqNo, sSpplyId, sWhsId, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> WarehouseSearchGridListResponse.builder()
+                        .viewCd("R")
+                        .pchPodrUnqNo(m.getPchPodrUnqNo() == null ? "" : m.getPchPodrUnqNo())
+                        .pchPodrDtlNo(m.getPchPodrDtlNo() == null ? "" : m.getPchPodrDtlNo())
+                        .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
+                        .dlvSttmtDtlNo(m.getDlvSttmtDtlNo() == null ? "" : m.getDlvSttmtDtlNo() )
+                        .podrQty(m.getPodrQty() == null ? 0 : m.getPodrQty())
+                        .dlvQty(m.getDlvQty() == null ? 0 : m.getDlvQty())
+                        .whsQty(m.getWhsQty() == null ? 0 : m.getWhsQty())
+                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
+                        .dlvSchDt(m.getDlvSchDt() == null ? "" : m.getDlvSchDt())
+                        .dlvCmpltDt(m.getDlvCmpltDt() == null ? "" : m.getDlvCmpltDt())
+                        .whsCnfmNm(m.getWhsCnfmNm() == null ? "" : m.getWhsCnfmNm())
+                        .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
+                        .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
+                        .itemId(m.getItemId() == null ? "" : m.getItemId())
+                        .itemNm(m.getItemNm() == null ? "" : m.getItemNm())
+                        .unit(m.getUnit() == null ? "" : m.getUnit())
+                        .whsAmt(m.getWhsAmt() == null ? 0 : m.getWhsAmt())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+
+
 }
 
 

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

@@ -228,4 +228,22 @@ public class ShmtOdrController {
         shmtOdrService.saveWarehouseProc(userId,  saveWarehouseProcRequest);
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
+
+
+    /**
+     * 설명 : 입고 현황 그리드 리스트
+     *
+     * @param DeliDtlGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 입고 현황 그리드 리스트")
+    @PostMapping("/warehouse-grid-list")
+    public ResponseEntity<GridResponse> selectWarehouseGridList(@RequestBody @Valid WarehouseGridRequest warehouseGridRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectWarehouseGridList(warehouseGridRequest.getSBrandId(), warehouseGridRequest.getSStoreId(), warehouseGridRequest.getFromDt(), warehouseGridRequest.getToDt(), warehouseGridRequest.getSPchPodrUnqNo(),  warehouseGridRequest.getSSpplyId(), warehouseGridRequest.getSWhsId(), warehouseGridRequest.getSItemNm(),  warehouseGridRequest.toDTO(warehouseGridRequest)));
+    }
 }

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

@@ -0,0 +1,47 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class WarehouseGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "매장아이디")
+    private String sStoreId;
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @ApiModelProperty(value = "발주번호")
+    private String sPchPodrUnqNo;
+
+    @ApiModelProperty(value = "공급업체코드")
+    private String sSpplyId;
+
+    @ApiModelProperty(value = "납품창고아이디")
+    private String sWhsId;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+    protected WarehouseGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/inoutmng/WarehouseSearchGridListResponse.java

@@ -0,0 +1,34 @@
+package com.oqpo.api.web.dto.response.inoutmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class WarehouseSearchGridListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "발주번호") private String pchPodrUnqNo;
+    @ApiModelProperty(value = "발주항번") private String pchPodrDtlNo;
+    @ApiModelProperty(value = "납품서번호") private String dlvSttmtUnqNo;
+    @ApiModelProperty(value = "납품항번") private String dlvSttmtDtlNo;
+    @ApiModelProperty(value = "발주수량") private Integer podrQty;
+    @ApiModelProperty(value = "납품수량") private Integer dlvQty;
+    @ApiModelProperty(value = "입고수량") private Integer whsQty;
+    @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
+    @ApiModelProperty(value = "납품예정일") private String dlvSchDt;
+    @ApiModelProperty(value = "납품일자") private String dlvCmpltDt;
+    @ApiModelProperty(value = "입고확인자") private String whsCnfmNm;
+    @ApiModelProperty(value = "납품자명") private String dlvMgrNm;
+    @ApiModelProperty(value = "납품자전화번호") private String dlvMgrTelNo;
+    @ApiModelProperty(value = "품목번호") private String itemId;
+    @ApiModelProperty(value = "품목명") private String itemNm;
+    @ApiModelProperty(value = "단위") private String unit;
+    @ApiModelProperty(value = "입고금액") private Long whsAmt;
+}

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

@@ -117,7 +117,7 @@
                 , base.store_id , base.podr_mgr_nm , base.podr_mgr_tel_no
                 , fn_get_telno((select tel_no from store_base_info where store_id = base.store_id )) as deli_tel_no
                 , date_format(base.podr_dt,'%Y%m%d') as podr_dt
-                , base.spply_id, fn_spply_nm(base.spply_id) as spply_nm
+                , base.spply_id, fn_spply_nm(base.spply_id) as spply_nm, , base.store_id
         from   pch_odr_base_info base
         join pch_odr_dtl_ptcl ptcl on base.pch_podr_unq_no = ptcl.pch_podr_unq_no and ptcl.podr_dtl_st_cd = 'POD0'
         join item_base_info itm on ptcl.item_id = itm.item_id
@@ -738,4 +738,75 @@
             AND pch_podr_dlt_no = #{item.pchPodrDtlNo}
         </foreach>
     </update>
+
+    <select id="selectWarehouseList" resultType="com.oqpo.api.entity.stockmng.WhsProcInfoPtclEntity">
+       select whs.pch_podr_unq_no, whs.pch_podr_dtl_no, whs.dlv_sttmt_unq_no, whs.dlv_sttmt_dtl_no
+             , whs.podr_qty, whs.dlv_qty, whs.whs_qty
+             , date_format(whs.dlv_req_dt, '%Y.%m.%d') as dlv_req_dt
+             , date_format(whs.dlv_sch_dt, '%Y.%m.%d') as dlv_sch_dt
+             , date_format(whs.dlv_cmplt_dt, '%Y.%m.%d') as dlv_cmplt_dt
+             , whs.whs_cnfm_nm, whs.dlv_mgr_nm, whs.dlv_mgr_tel_no
+             , whs.item_id, whs.item_nm, whs.unit, whs.whs_amt, whs.dlv_cnfm_doc_file_no
+          from whs_proc_info_ptcl whs
+         where 1 = 1
+         and whs.whs_dt between #{fromDt} and #{toDt}
+         and   whs.brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+         and   whs.store_id = #{sStoreId}
+        </if>
+        <if test="sPchPodrUnqNo != null and sPchPodrUnqNo != ''">
+           and whs.pch_podr_unq_no like concat('%', #{sPchPodrUnqNo}, '%')
+        </if>
+        <if test="sSpplyId != null and sSpplyId != ''">
+           and whs.spply_id =  #{sSpplyId}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+           and whs.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+           and (whs.item_id like concat('%', #{sItemNm}, '%') or whs.item_nm like concat('%', #{sItemNm}, '%'))
+        </if>
+
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        order by pch_req_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by pch_req_unq_no desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by pch_req_unq_no desc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectWarehouseCnt" resultType="int">
+        select count(*)
+        from whs_proc_info_ptcl whs
+        where 1 = 1
+        and whs.whs_dt between #{fromDt} and #{toDt}
+        and   whs.brand_id = #{sBrandId}
+        <if test="sStoreId != null and sStoreId != ''">
+            and   whs.store_id = #{sStoreId}
+        </if>
+        <if test="sPchPodrUnqNo != null and sPchPodrUnqNo != ''">
+            and whs.pch_podr_unq_no like concat('%', #{sPchPodrUnqNo}, '%')
+        </if>
+        <if test="sSpplyId != null and sSpplyId != ''">
+            and whs.spply_id =  #{sSpplyId}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+            and whs.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and (whs.item_id like concat('%', #{sItemNm}, '%') or whs.item_nm like concat('%', #{sItemNm}, '%'))
+        </if>
+    </select>
 </mapper>

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

@@ -161,9 +161,20 @@
     <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>
 
+
+    <update id="updateListLoanMinusProc" >
+        /* updateListLoanMinusProc */
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            update /* updateloanMinusInstProc */ loan_mgnt_base_info
+            set   use_amt_total = use_amt_total - #{item.useAmtTotal}
+                 , sys_chg_dttm = NOW()
+                 , sys_chg_id = #{userId}
+            where loan_mgnt_unq_no = #{item.loanMgntUnqNo}
+            and   store_id = #{item.storeId}
+        </foreach>
+    </update>
 </mapper>