공급사 납품서 현황, 입고처리대상 현황

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

@@ -34,6 +34,8 @@ public class DeliDtlMgntEntity implements Serializable {
     private String sysRegId;
     private String sysChgDttm;
     private String sysChgId;
+    private Integer whsQty;
+    private Integer whsAmt;
 
 
 }

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

@@ -48,6 +48,7 @@ public class DeliInfoMgntEntity implements Serializable {
     private String whsAddr;
     private String whsMgrTelNo;
 
+
     private String dlvBsnsRegno;
     private String dlvNm;
     private String dlvOwnerNm;

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

@@ -42,4 +42,10 @@ public interface ShmtOdrMapper {
     List<DeliInfoMgntEntity> selectDeliGridList(@Param("sBrandId") String sBrandId, @Param("dtGubun") String dtGubun, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sDlvStCd") String sDlvStCd, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest )throws Exception;
     int selectDeliGridCnt(@Param("sBrandId") String sBrandId, @Param("dtGubun") String dtGubun, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sDlvStCd") String sDlvStCd, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm )throws Exception;
 
+    List<DeliInfoMgntEntity> selectSpplyDeliGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest )throws Exception;
+    int selectSpplyDeliGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm )throws Exception;
+
+    List<DeliInfoMgntEntity> selectWarehouseTargetGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sWhsId") String sWhsId,  @Param("sSpplyId") String sSpplyId, @Param("sDlvSttmtUnqNo") String  sDlvSttmtUnqNo,  @Param("sItemNm") String sItemNm, GridRequest gridRequest )throws Exception;
+    int selectWarehouseTargetGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sWhsId") String sWhsId,  @Param("sSpplyId") String sSpplyId, @Param("sDlvSttmtUnqNo") String  sDlvSttmtUnqNo,  @Param("sItemNm") String sItemNm )throws Exception;
+
 }

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

@@ -727,6 +727,7 @@ public class ShmtOdrService extends CommonService {
                         .dlvRegDt(m.getDlvRegDt() == null ? "" : m.getDlvRegDt())
                         .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
                         .dlvSchDt(m.getDlvSchDt() == null ? "" : m.getDlvSchDt())
+                        .dlvCmpltDt(m.getDlvCmpltDt() == null ? "" : m.getDlvCmpltDt())
                         .itemId(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemId() == null ? "" : m.getDeliDtlMgntInfo().getItemId())
                         .itemNm(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemNm() == null ? "" : m.getDeliDtlMgntInfo().getItemNm())
                         .podrQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty())
@@ -734,7 +735,98 @@ public class ShmtOdrService extends CommonService {
                         .unit(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getUnit() == null ? "" : m.getDeliDtlMgntInfo().getUnit())
                         .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
                         .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
-                        .dlvMgrMblNo(m.getDlvMgrMblNo() == null ? "" : m.getDlvMgrMblNo())
+                        .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+
+    /*
+      공급사  - 납품서 현황 그리드 리스트 조회
+     */
+    public GridResponse selectSpplyDeliGridList(String sBrandId, String fromDt, String toDt, 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.selectSpplyDeliGridCnt(sBrandId,  fromDt, toDt, sSpplyId, sWhsId, sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<DeliInfoMgntEntity> entities = shmtOdrMapper.selectSpplyDeliGridList(sBrandId, fromDt, toDt, sSpplyId, sWhsId, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> DeliDtlSearchListResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
+                        .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
+                        .spplyId(m.getSpplyId() == null ? "" : m.getSpplyId())
+                        .spplyNm(m.getSpplyNm() == null ? "" : m.getSpplyNm())
+                        .dlvStCd(m.getDlvStCd() == null ? "" : m.getDlvStCd())
+                        .dlvStNm(m.getDlvStNm() == null ? "" : m.getDlvStNm())
+                        .whsId(m.getWhsId() == null ? "" :m.getWhsId())
+                        .location(m.getLocation() == null ? "" : m.getLocation())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
+                        .podrRegDt(m.getPodrRegDt() == null ? "" : m.getPodrRegDt())
+                        .dlvRegDt(m.getDlvRegDt() == null ? "" : m.getDlvRegDt())
+                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
+                        .dlvSchDt(m.getDlvSchDt() == null ? "" : m.getDlvSchDt())
+                        .dlvCmpltDt(m.getDlvCmpltDt() == null ? "" : m.getDlvCmpltDt())
+                        .itemId(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemId() == null ? "" : m.getDeliDtlMgntInfo().getItemId())
+                        .itemNm(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemNm() == null ? "" : m.getDeliDtlMgntInfo().getItemNm())
+                        .podrQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty())
+                        .dlvQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty())
+                        .unit(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getUnit() == null ? "" : m.getDeliDtlMgntInfo().getUnit())
+                        .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
+                        .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
+                        .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+    /*
+      입고처리 그리드 리스트 조회
+     */
+    public GridResponse selectWarehouseTargetList(String sBrandId, String fromDt, String toDt, String sWhsId, String sSpplyId, String sDlvSttmtUnqNo, 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.selectWarehouseTargetGridCnt(sBrandId,  fromDt, toDt, sWhsId, sSpplyId, sDlvSttmtUnqNo, sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<DeliInfoMgntEntity> entities = shmtOdrMapper.selectWarehouseTargetGridList(sBrandId,  fromDt, toDt, sWhsId, sSpplyId, sDlvSttmtUnqNo, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> WarehouseTargetResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
+                        .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
+                        .dlvSttmtDtlNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getDlvSttmtDtlNo() == null ? "" : m.getDeliDtlMgntInfo().getDlvSttmtDtlNo())
+                        .itemId(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemId() == null ? "" : m.getDeliDtlMgntInfo().getItemId())
+                        .itemNm(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemNm() == null ? "" : m.getDeliDtlMgntInfo().getItemNm())
+                        .podrQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty())
+                        .dlvQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty())
+                        .whsQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getWhsQty() == null ? 0 : m.getDeliDtlMgntInfo().getWhsQty())
+                        .whsAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getWhsAmt() == null ? 0 : m.getDeliDtlMgntInfo().getWhsAmt())
+                        .unit(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getUnit() == null ? "" : m.getDeliDtlMgntInfo().getUnit())
+                        .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
+                        .whsId(m.getWhsId() == null ? "" :m.getWhsId())
+                        .location(m.getLocation() == null ? "" : m.getLocation())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
+                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
+                        .dlvSchDt(m.getDlvSchDt() == null ? "" : m.getDlvSchDt())
+                        .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
+                        .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
+                        .pchPodrUnqNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrUnqNo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrUnqNo())
+                        .pchPodrDtlNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrDtlNo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrDtlNo())
+                        .pchReqUnqNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqUnqNo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqUnqNo())
+                        .pchReqDltNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqDtlNo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqDtlNo())
+                        .spplyId(m.getSpplyId() == null ? "" : m.getSpplyId())
+                        .spplyNm(m.getSpplyNm() == null ? "" : m.getSpplyNm())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);

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

@@ -174,4 +174,38 @@ public class ShmtOdrController {
     public ResponseEntity<GridResponse> selectDeliGridList(@RequestBody @Valid DeliDtlGridRequest deliDtlGridRequest) throws Exception {
         return ResponseEntity.ok(shmtOdrService.selectDeliGridList(deliDtlGridRequest.getSBrandId(), deliDtlGridRequest.getDtlGubun(), deliDtlGridRequest.getFromDt(), deliDtlGridRequest.getToDt(), deliDtlGridRequest.getSDlvStCd(),  deliDtlGridRequest.getSSpplyId(), deliDtlGridRequest.getSWhsId(), deliDtlGridRequest.getSItemNm(),  deliDtlGridRequest.toDTO(deliDtlGridRequest)));
     }
+
+    /**
+     * 설명 : 공급사 납품서 현황 그리드 리스트
+     *
+     * @param SpplyDeliDtlGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 공급사 - 납품서 현황 그리드 리스트")
+    @PostMapping("/spply-deli-grid-list")
+    public ResponseEntity<GridResponse> selectSpplyDeliGridList(@RequestBody @Valid SpplyDeliDtlGridRequest spplyDeliDtlGridRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectSpplyDeliGridList(spplyDeliDtlGridRequest.getSBrandId(), spplyDeliDtlGridRequest.getFromDt(), spplyDeliDtlGridRequest.getToDt(),  spplyDeliDtlGridRequest.getSSpplyId(), spplyDeliDtlGridRequest.getSWhsId(), spplyDeliDtlGridRequest.getSItemNm(),  spplyDeliDtlGridRequest.toDTO(spplyDeliDtlGridRequest)));
+    }
+
+    /**
+     * 설명 : 입고처리 대상 리스트
+     *
+     * @param SpplyDeliDtlGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 입고처리 대상 그리드 리스트")
+    @PostMapping("/warehouse-target-grid-list")
+    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)));
+    }
 }

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

@@ -0,0 +1,43 @@
+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 SpplyDeliDtlGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "공급업체코드")
+    private String sSpplyId;
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+
+    @ApiModelProperty(value = "납품창고아이디")
+    private String sWhsId;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+    protected SpplyDeliDtlGridRequest(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/request/inoutmng/WarehouseTragetGridRequest.java

@@ -0,0 +1,46 @@
+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 WarehouseTragetGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "납품창고아이디")
+    private String sWhsId;
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @ApiModelProperty(value = "공급업체코드")
+    private String sSpplyId;
+
+    @ApiModelProperty(value = "납품서번호")
+    private String sDlvSttmtUnqNo;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+
+    protected WarehouseTragetGridRequest(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/DeliDtlSearchListResponse.java

@@ -24,17 +24,18 @@ public class DeliDtlSearchListResponse {
     @ApiModelProperty(value = "납품창고아이디") private String whsId;
     @ApiModelProperty(value = "납품LOCATION") private String location;
     @ApiModelProperty(value = "납품창고명") private String whsNm;
-    @ApiModelProperty(value = "발주생성일") private String podrRegDt;
+    @ApiModelProperty(value = "발주생성일/수주일자") private String podrRegDt;
     @ApiModelProperty(value = "납품생성일") private String dlvRegDt;
     @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
     @ApiModelProperty(value = "납품예정일") private String dlvSchDt;
+    @ApiModelProperty(value = "납품완료일") private String dlvCmpltDt;
     @ApiModelProperty(value = "품목아이디") private String itemId;
     @ApiModelProperty(value = "품목명") private String itemNm;
     @ApiModelProperty(value = "발주금액") private Integer podrQty;
-    @ApiModelProperty(value = "납품수량") private Integer dlvQty;
+    @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
     @ApiModelProperty(value = "단위") private String unit;
     @ApiModelProperty(value = "납품금액") private Integer unitAmt;
     @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
-    @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrMblNo;
+    @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrTelNo;
 
 }

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

@@ -0,0 +1,43 @@
+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 WarehouseTargetResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+    @ApiModelProperty(value = "브랜드명") private String brandNm;
+    @ApiModelProperty(value = "납품서번호") private String dlvSttmtUnqNo;
+    @ApiModelProperty(value = "납품서번호") private String dlvSttmtDtlNo;
+    @ApiModelProperty(value = "품목아이디") private String itemId;
+    @ApiModelProperty(value = "품목명") private String itemNm;
+    @ApiModelProperty(value = "발주금액") private Integer podrQty;
+    @ApiModelProperty(value = "납품/수주 수량") private Integer dlvQty;
+    @ApiModelProperty(value = "입고 수량") private Integer whsQty;
+    @ApiModelProperty(value = "입고금액") private Integer whsAmt;
+    @ApiModelProperty(value = "단가") private Integer unitAmt;
+    @ApiModelProperty(value = "납품창고아이디") private String whsId;
+    @ApiModelProperty(value = "납품LOCATION") private String location;
+    @ApiModelProperty(value = "납품창고명") private String whsNm;
+    @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
+    @ApiModelProperty(value = "납품예정일") private String dlvSchDt;
+    @ApiModelProperty(value = "납품담당자명") private String dlvMgrNm;
+    @ApiModelProperty(value = "납품담당자연락처") private String dlvMgrTelNo;
+    @ApiModelProperty(value = "구매발주번호") private String pchPodrUnqNo;
+    @ApiModelProperty(value = "구매발주항번") private String pchPodrDtlNo;
+    @ApiModelProperty(value = "구매요청번호") private String pchReqUnqNo;
+    @ApiModelProperty(value = "구매요청항번") private String pchReqDltNo;
+    @ApiModelProperty(value = "단위") private String unit;
+    @ApiModelProperty(value = "공급사아이디") private String spplyId;
+    @ApiModelProperty(value = "공급사명") private String spplyNm;
+
+}

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

@@ -362,6 +362,7 @@
             , fn_whs_location_nm(info.brand_id, info.whs_id, info.location) as location_nm
             , date_format(info.podr_reg_dt, '%Y.%m.%d') as podr_reg_dt, date_format(info.dlv_req_dt, '%y.%m.%d') as dlv_req_dt
             , date_format(info.dlv_reg_dt, '%Y.%m.%d') as dlv_req_dt, date_format(info.dlv_sch_dt, '%y.%m.%d') as dlv_sch_dt
+            , date_format(info.dlv_cmplt_dt, '%y.%m.%d') as dlv_cmplt_dt
             , ptcl.item_id as 'deliDtlMgntInfo.item_id', ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
             , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'
             , ptcl.unit as 'deliDtlMgntInfo.unit', ptcl.unit_amt as 'deliDtlMgntInfo.unit_amt'
@@ -378,7 +379,10 @@
             and info.dlv_req_dt between #{fromDt} and #{toDt}   -- 2인경우 납품요청일로 조회
         </if>
         <if test="dtGubun eq '3'.toString()">
-            and info.dlv_reg_dt between #{fromDt} and #{toDt}    -- 3인경우 납품생성일로 조회
+            and info.dlv_sch_dt between #{fromDt} and #{toDt}    -- 3인경우 납품예정일로 조회
+        </if>
+        <if test="dtGubun eq '4'.toString()">
+            and info.dlv_cmplt_dt between #{fromDt} and #{toDt}    -- 3인경우 납품완료일 조회
         </if>
         <if test="sDlvStCd != null and sDlvStCd != ''">
             and info.dlv_st_cd = #{sDlvStCd}  -- 납품상태
@@ -426,7 +430,10 @@
             and info.dlv_req_dt between #{fromDt} and #{toDt}   -- 2인경우 납품요청일로 조회
         </if>
         <if test="dtGubun eq '3'.toString()">
-            and info.dlv_reg_dt between #{fromDt} and #{toDt}    -- 3인경우 납품생성일로 조회
+            and info.dlv_sch_dt between #{fromDt} and #{toDt}    -- 3인경우 납품예정일로 조회
+        </if>
+        <if test="dtGubun eq '4'.toString()">
+            and info.dlv_cmplt_dt between #{fromDt} and #{toDt}    -- 3인경우 납품완료일 조회
         </if>
         <if test="sDlvStCd != null and sDlvStCd != ''">
             and info.dlv_st_cd = #{sDlvStCd}  -- 납품상태
@@ -442,4 +449,142 @@
         </if>
     </select>
 
+    <select id="selectSpplyDeliGridList" resultType="com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity">
+        select info.brand_id, fn_brand_nm(info.brand_id) as brand_nm, info.dlv_sttmt_unq_no
+        , info.spply_id, info.spply_nm, info.dlv_st_cd, fn_code_nm(upper('dlv_st_cd'), info.dlv_st_cd) as dlv_st_nm
+        , info.whs_id, info.location, fn_whs_nm(info.brand_id, info.whs_id) as whs_nm
+        , fn_whs_location_nm(info.brand_id, info.whs_id, info.location) as location_nm
+        , date_format(info.podr_reg_dt, '%Y.%m.%d') as podr_reg_dt, date_format(info.dlv_req_dt, '%y.%m.%d') as dlv_req_dt
+        , date_format(info.dlv_reg_dt, '%Y.%m.%d') as dlv_req_dt, date_format(info.dlv_sch_dt, '%y.%m.%d') as dlv_sch_dt
+        , date_format(info.dlv_cmplt_dt, '%y.%m.%d') as dlv_cmplt_dt
+        , ptcl.item_id as 'deliDtlMgntInfo.item_id', ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
+        , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'
+        , ptcl.unit as 'deliDtlMgntInfo.unit', ptcl.unit_amt as 'deliDtlMgntInfo.unit_amt'
+        , info.dlv_mgr_nm , info.dlv_mgr_mbl_no
+        from deli_info_mgnt info
+        , deli_dtl_ptcl ptcl
+        where 1 = 1
+        and info.dlv_sttmt_unq_no = ptcl.dlv_sttmt_unq_no
+        and info.brand_id = #{sBrandId}
+        and info.spply_id = #{sSpplyId}
+        and info.dlv_sch_dt between #{fromDt} and #{toDt}  -- 납품 예정일
+        <if test="sWhsId != null and sWhsId != ''">
+            and info.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.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="selectSpplyDeliGridCnt" resultType="int">
+        select count(*)
+        from deli_info_mgnt info
+        , deli_dtl_ptcl ptcl
+        where 1 = 1
+        and info.dlv_sttmt_unq_no = ptcl.dlv_sttmt_unq_no
+        and info.brand_id = #{sBrandId}
+        and info.spply_id = #{sSpplyId}
+        and info.dlv_sch_dt between #{fromDt} and #{toDt}  -- 납품 예정일
+        <if test="sWhsId != null and sWhsId != ''">
+            and info.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%'))
+        </if>
+    </select>
+
+    <select id="selectWarehouseTargetGridList" resultType="com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity">
+        select info.brand_id, fn_brand_nm(info.brand_id) as brand_nm
+                , info.dlv_sttmt_unq_no, ptcl.dlv_sttmt_dtl_no as 'deliDtlMgntInfo.dlv_sttmt_dtl_no'
+                , ptcl.item_id as 'deliDtlMgntInfo.item_id' , ptcl.item_nm as 'deliDtlMgntInfo.item_nm'
+                , ptcl.podr_qty as 'deliDtlMgntInfo.podr_qty', ptcl.dlv_qty as 'deliDtlMgntInfo.dlv_qty'
+                , ptcl.dlv_qty as 'deliDtlMgntInfo.whs_qty' , ptcl.dlv_qty * ptcl.unit_amt as 'deliDtlMgntInfo.whs_amt'
+                , ptcl.unit_amt as 'deliDtlMgntInfo.unit_amt'
+                , info.whs_id, info.location, fn_whs_nm(info.brand_id, info.whs_id) as whs_nm
+                , fn_whs_location_nm(info.brand_id, info.whs_id, info.location) as location_nm
+                , date_format(info.dlv_sch_dt, '%Y.%m.%d %H:%i:%s') as dlv_sch_dt
+                , date_format(info.dlv_req_dt, '%Y.%m.%d %H:%i:%s') as dlv_req_dt
+                , info.dlv_mgr_nm, info.dlv_mgr_mbl_no, fn_get_telno(info.dlv_mgr_tel_no) AS dlv_mgr_tel_no
+                , 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.unit as 'deliDtlMgntInfo.unit', info.dlv_cmplt_dt as 'deliDtlMgntInfo.dlv_cmplt_dt'
+                , info.spply_id as 'deliDtlMgntInfo.spply_id', info.spply_nm as 'deliDtlMgntInfo.spply_nm'
+        from deli_info_mgnt info
+        , deli_dtl_ptcl ptcl
+        where 1 = 1
+        and info.dlv_sttmt_unq_no = ptcl.dlv_sttmt_unq_no
+        and info.brand_id = #{sBrandId}
+        and info.dlv_sch_dt between #{fromDt} and #{endDt}
+        and info.dlv_st_cd = 'DLV0'
+        and info.whs_id = #{sWhsId}
+        <if test="sSpplyId != null and sSpplyId != ''">
+        and info.spply_id = #{sSpplyId}
+        </if>
+        <if test="sDlvSttmtUnqNo != null and sDlvSttmtUnqNo != ''">
+        and info.dlv_sttmt_unq_no like concat('%',#{sDlvSttmtUnqNo},'%')
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+        and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.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="selectWarehouseTargetGridCnt" resultType="int">
+        select count(*)
+        from deli_info_mgnt info
+            , deli_dtl_ptcl ptcl
+        where 1 = 1
+        and info.dlv_sttmt_unq_no = ptcl.dlv_sttmt_unq_no
+        and info.brand_id = #{sBrandId}
+        and info.dlv_sch_dt between #{fromDt} and #{endDt}
+        and info.dlv_st_cd = 'DLV0'
+        and info.whs_id = #{whsId}
+        <if test="sSpplyId != null and sSpplyId != ''">
+            and info.spply_id = #{sSpplyId}
+        </if>
+        <if test="sDlvSttmtUnqNo != null and sDlvSttmtUnqNo != ''">
+            and info.dlv_sttmt_unq_no like concat('%',#{sDlvSttmtUnqNo},'%')
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%'))
+        </if>
+    </select>
+
+
+
 </mapper>

src/main/resources/mybatis/sqlmaps/oper/Ntice.xml

@@ -23,11 +23,11 @@
         </if>
         <if test="authTpCd == '50' ">
             and ((A.affl_shop_id is null or A.affl_shop_id == '')
-            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd = 'T' ))
+            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd in ('A', 'T')))
         </if>
         <if test="authTpCd == '60' ">
             and ((A.affl_shop_id is null or A.affl_shop_id == '')
-            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd = 'S' ))
+            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd in ('A', 'T')))
         </if>
         <if test="sAfflShopId != null and sAfflShopId != ''">
             and    A.affl_shop_id = #{sAfflShopId}
@@ -77,11 +77,11 @@
         </if>
         <if test="authTpCd == '50' ">
             and ((A.affl_shop_id is null or A.affl_shop_id == '')
-            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd = 'T' ))
+            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd in ('A', 'T')))
         </if>
         <if test="authTpCd == '60' ">
             and ((A.affl_shop_id is null or A.affl_shop_id == '')
-            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd = 'S' ))
+            or  (A.affl_shop_id = #{afflShopId} and  A.brand_id = #{brandId} and A.target_cd in ('A', 'S')))
         </if>
         <if test="sAfflShopId != null and sAfflShopId != ''">
             and    A.affl_shop_id = #{sAfflShopId}