납품서 현황

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

@@ -58,5 +58,6 @@ public class DeliInfoMgntEntity implements Serializable {
     private String poOwnerNm;
     private String poAddr;
 
+    private DeliDtlMgntEntity deliDtlMgntInfo;
 
 }

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

@@ -37,4 +37,9 @@ public interface ShmtOdrMapper {
 
     PchOdrBaseInfoEntity selectSpplyShmtOdrInfo(@Param("brandId") String brandId, @Param("spplyId") String spplyId, @Param("pchPodrUnqNo") String pchPodrUnqNo )throws Exception;
     List<PchOdrDtlPtclEntity> selectSpplyShmtOdrList( @Param("pchPodrUnqNo") String pchPodrUnqNo )throws Exception;
+
+
+    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;
+
 }

src/main/java/com/oqpo/api/mapper/stinfo/ItemUnitMapper.java

@@ -25,4 +25,7 @@ public interface ItemUnitMapper {
     List<ItemUnitEntity> selectPopItemStoreUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, GridRequest gridRequest)throws Exception;
     int selectPopItemStoreUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn)throws Exception;
 
+    int insertItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;
+    int updateItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;
+
 }

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

@@ -695,6 +695,51 @@ public class ShmtOdrService extends CommonService {
             throw new RuntimeException();
         }
     }
+
+
+    /*
+      납품서 현황 그리드 리스트 조회
+     */
+    public GridResponse selectDeliGridList(String sBrandId, String dtGubun,  String fromDt, String toDt, String sDlvStCd, 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.selectDeliGridCnt(sBrandId, dtGubun, fromDt, toDt, sDlvStCd, sSpplyId, sWhsId, sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<DeliInfoMgntEntity> entities = shmtOdrMapper.selectDeliGridList(sBrandId, dtGubun, fromDt, toDt, sDlvStCd, 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())
+                        .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())
+                        .dlvMgrMblNo(m.getDlvMgrMblNo() == null ? "" : m.getDlvMgrMblNo())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
 }
 
 

src/main/java/com/oqpo/api/service/stinfo/ItemUnitService.java

@@ -179,9 +179,12 @@ public class ItemUnitService extends CommonService {
                     itemUnitMapper.updateItemUnitContEnd(entity.getBrandId(), entity.getBrandUnitUnqNo(), entity.getContEndDt());
                 }
             }
-            itemUnitMapper.insertMergItemUnitInfo(userId, entity);
-
 
+            if ("".equals(entity.getBrandUnitUnqNo())) {
+                itemUnitMapper.insertItemUnitInfo(userId, entity);
+            } else {
+                itemUnitMapper.updateItemUnitInfo(userId, entity);
+            }
         } catch (GlobalException e) {
             e.getStackTrace();
             throw new GlobalException(e.getSystemMessageCode());

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

@@ -157,4 +157,21 @@ public class ShmtOdrController {
         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("/deli-grid-list")
+    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)));
+    }
 }

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

@@ -0,0 +1,48 @@
+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 DeliDtlGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "날짜검색조건 - 1 발주생성일,  2 납품요청일 , 3 납품생성일")
+    private String dtlGubun;
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @ApiModelProperty(value = "납품상태코드")
+    private String sDlvStCd;
+
+    @ApiModelProperty(value = "공급업체코드")
+    private String sSpplyId;
+
+    @ApiModelProperty(value = "납품창고아이디")
+    private String sWhsId;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+    protected DeliDtlGridRequest(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/stinfo/itemUnit/SaveStoreItemUnitInfolRequest.java

@@ -33,9 +33,12 @@ public class SaveStoreItemUnitInfolRequest {
     private String contEndDt;
 
 
-    @ApiModelProperty(value = "매장단가정보리스트")
+    @ApiModelProperty(value = "매장단가수정리스트")
     private List<SaveStoreItemUnitInfolRequest.SaveStoreItemUnit> gridUpdateData;
 
+    @ApiModelProperty(value = "매장단가신규리스트")
+    private List<SaveStoreItemUnitInfolRequest.SaveStoreItemUnit> gridInsertData;
+
 
     public List<StoreItemUnitEntity> toCodeEntities(List< SaveStoreItemUnitInfolRequest.SaveStoreItemUnit > gridData) {
         List<StoreItemUnitEntity> entities = new ArrayList<>();

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

@@ -0,0 +1,40 @@
+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 DeliDtlSearchListResponse {
+
+    @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 spplyId;
+    @ApiModelProperty(value = "공급사명") private String spplyNm;
+    @ApiModelProperty(value = "납품상태코드") private String dlvStCd;
+    @ApiModelProperty(value = "납품상태명") private String dlvStNm;
+    @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 dlvRegDt;
+    @ApiModelProperty(value = "납품요청일") private String dlvReqDt;
+    @ApiModelProperty(value = "납품예정일") private String dlvSchDt;
+    @ApiModelProperty(value = "품목아이디") private String itemId;
+    @ApiModelProperty(value = "품목명") private String itemNm;
+    @ApiModelProperty(value = "발주금액") private Integer podrQty;
+    @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;
+
+}

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

@@ -355,4 +355,91 @@
     and    ptcl.podr_dtl_st_cd = 'POD0'
     </select>
 
+    <select id="selectDeliGridList" 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
+            , 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}
+        <if test="dtGubun eq '1'.toString()">
+            and info.podr_reg_dt between #{fromDt} and #{toDt}  -- 1인경우 발주생성일로 조회
+        </if>
+        <if test="dtGubun eq '2'.toString()">
+            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인경우 납품생성일로 조회
+        </if>
+        <if test="sDlvStCd != null and sDlvStCd != ''">
+            and info.dlv_st_cd = #{sDlvStCd}  -- 납품상태
+        </if>
+        <if test="sSpplyId != null and sSpplyId != ''">
+            and info.spply_id = #{sSpplyId}
+        </if>
+        <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="selectDeliGridCnt" 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}
+        <if test="dtGubun eq '1'.toString()">
+            and info.podr_reg_dt between #{fromDt} and #{toDt}  -- 1인경우 발주생성일로 조회
+        </if>
+        <if test="dtGubun eq '2'.toString()">
+            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인경우 납품생성일로 조회
+        </if>
+        <if test="sDlvStCd != null and sDlvStCd != ''">
+            and info.dlv_st_cd = #{sDlvStCd}  -- 납품상태
+        </if>
+        <if test="sSpplyId != null and sSpplyId != ''">
+            and info.spply_id = #{sSpplyId}
+        </if>
+        <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>
+
 </mapper>

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

@@ -129,6 +129,40 @@
 
     </update>
 
+    <insert id="insertItemUnitInfo" >
+        insert into  /**  insertItemUnitInfo */
+        brand_item_unit_info
+            (brand_unit_unq_no, brand_id, item_id, item_nm, spply_id,
+            spply_nm, cont_stt_dt, cont_end_dt, curr, unit,
+            unit_amt, lead_time, dlv_cndt, short_cont_file_no, spply_item_id,
+            unit_st_cd, stdd_qty, store_sale_stdd_qty, store_sale_unit_amt,
+            sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        values
+            ( fn_get_dealno(33,''), #{entity.brandId}, #{entity.itemId}, #{entity.itemNm}, #{entity.spplyId},
+            #{entity.spplyNm}, #{entity.contSttDt}, #{entity.contEndDt}, #{entity.curr}, #{entity.unit},
+            #{entity.unitAmt}, #{entity.leadTime}, #{entity.dlvCndt}, #{entity.shortContFileNo}, #{entity.spplyItemId},
+            #{entity.unitStCd}, #{entity.stddQty}, #{entity.storeSaleStddQty}, #{entity.storeSaleUnitAmt},
+            now(), #{userId}, now(), #{userId})
+    </insert>
+
+    <update id="updateItemUnitInfo" >
+            update brand_item_unit_info
+            set sys_chg_dttm    = now()
+            ,sys_chg_id      = #{userId}
+            ,cont_stt_dt     = #{entity.contSttDt}
+            ,cont_end_dt     = #{entity.contEndDt}
+            ,curr            = #{entity.curr}
+            ,unit            = #{entity.unit}
+            ,unit_amt        = #{entity.unitAmt}
+            ,lead_time       = #{entity.leadTime}
+            ,dlv_cndt        = #{entity.dlvCndt}
+            ,short_cont_file_no = #{entity.shortContFileNo}
+            ,unit_st_cd      = #{entity.unitStCd}
+            ,stdd_qty        = #{entity.stddQty}
+            ,store_sale_stdd_qty = #{entity.storeSaleStddQty}
+            ,store_sale_unit_amt = #{entity.storeSaleUnitAmt}
+        where brand_unit_unq_no = #{brandUnitUnqNo}
+    </update>
 
     <insert id="insertMergItemUnitInfo" >
         insert into  /** Merge insertMergItemUnitInfo */