반품처리 및 정산요청 출력 sql 수정

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

@@ -59,6 +59,9 @@ public class ColOdrService extends CommonService {
     @Autowired
     private RtnOdrService rtnOdrService;
 
+    @Autowired
+    private StockMngMapper stockMngMapper;
+
 
     @Autowired
     private BrandMapper brandMapper;
@@ -755,10 +758,10 @@ public class ColOdrService extends CommonService {
                         .rtnPodrDtlNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getRtnPodrDtlNo() == null ? "" :m.getPickDtlInfo().getRtnPodrDtlNo() )
                         .itemId(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemId() == null ? "" :m.getPickDtlInfo().getItemId() )
                         .itemNm(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemNm() == null ? "" :m.getPickDtlInfo().getItemNm() )
-                        .colQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColQty() == null ? 0 :m.getPickDtlInfo().getColQty() )
+                        //.colQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColQty() == null ? 0 :m.getPickDtlInfo().getColQty() )
                         .colReqQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColReqQty() == null ? 0 :m.getPickDtlInfo().getColReqQty() )
                         .rodrQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getRodrQty() == null ? 0 :m.getPickDtlInfo().getRodrQty() )
-                        .colAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColAmt() == null ? 0 :m.getPickDtlInfo().getColAmt() )
+                        //.colAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColAmt() == null ? 0 :m.getPickDtlInfo().getColAmt() )
                         .whsId(m.getWhsId() == null ? "" : m.getWhsId())
                         .location(m.getLocation() == null ? "" : m.getLocation())
                         .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
@@ -770,6 +773,8 @@ public class ColOdrService extends CommonService {
                         .pickMgrTelNo(m.getPickMgrTelNo() == null ? "" : m.getPickMgrTelNo())
                         .spplyId(m.getSpplyId() == null ? "" : m.getSpplyId())
                         .spplyNm(m.getSpplyNm() == null ? "" : m.getSpplyNm())
+                        .unitAmt((m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getUnitAmt() == null ? 0 : m.getPickDtlInfo().getUnitAmt()))
+                        .colReqAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColReqAmt() == null ? 0 : m.getPickDtlInfo().getColReqAmt())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
@@ -779,7 +784,7 @@ public class ColOdrService extends CommonService {
 
 
 
-    /* 입고처리 저장 */
+    /* 수거 처리 저장 */
     @Transactional
     public void saveRtnStockProc(String userId, SaveRtnStockProcRequest saveRtnStockProcRequest) throws Exception {
         try {
@@ -852,6 +857,7 @@ public class ColOdrService extends CommonService {
                             rtnProcInfoEntity.setColSchDt(targetData.getColSchDt());
                             rtnProcInfoEntity.setColCnfmNm(uEntity.getUserNm());
                             rtnProcInfoEntity.setColMgrTelNo(targetData.getPickMgrTelNo());
+                            rtnProcInfoEntity.setColMgrNm(targetData.getPickMgrNm());
                             rtnProcInfoEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
                             rtnProcInfoEntity.setColAgrYn("Y");
                             // rtnProcInfoEntity.setColCnfmDocFileNo(saveRtnStockProcRequest.); 수거서 파일 첨부 제거
@@ -991,11 +997,11 @@ public class ColOdrService extends CommonService {
                 }
 
                 if (stckMgntBaseInfoList.size() > 0 ) {
-                    colOdrMapper.updateChgStckQtyStckMgnt(userId, stckMgntBaseInfoList);
+                    stockMngMapper.insertInOutStckMgntBaseInfo(userId, stckMgntBaseInfoList);
                 }
 
                 if (stckMgntDtlHistList.size() > 0 ) {
-                    colOdrMapper.insertChgStckStckMgntDtlHist(userId, stckMgntDtlHistList);
+                    stockMngMapper.insertMultiStckMgntDtlHist(userId, stckMgntDtlHistList);
                 }
 
                 if (colOdrDtlPtclList.size() > 0 ) {

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

@@ -38,5 +38,7 @@ public class RtnStockTargetResponse {
     @ApiModelProperty(value = "수거담당자연락처") private String pickMgrTelNo;
     @ApiModelProperty(value = "공급사아이디") private String spplyId;
     @ApiModelProperty(value = "공급사명") private String spplyNm;
+    @ApiModelProperty(value = "단가") private Long unitAmt;
+    @ApiModelProperty(value = "수거요청금액") private Long colReqAmt;
 
 }

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

@@ -551,13 +551,15 @@
                , dtl.rtn_podr_unq_no as 'pickDtlInfo.rtn_podr_unq_no' , dtl.rtn_podr_dtl_no as 'pickDtlInfo.rtn_podr_dtl_no'
                ,dtl.item_id as 'pickDtlInfo.item_id', dtl.item_nm as 'pickDtlInfo.item_nm'
                , dtl.rodr_qty as 'pickDtlInfo.rodr_qty' , dtl.col_req_qty as 'pickDtlInfo.col_req_qty'
-               , dtl.col_req_qty as 'pickDtlInfo.col_qty', dtl.col_amt as 'pickDtlInfo.col_amt'
+               , dtl.col_req_amt as 'pickDtlInfo.col_req_amt'
+               /* , null as 'pickDtlInfo.col_qty', null as 'pickDtlInfo.col_amt' */
                , date_format(mgnt.col_sch_dt,'%Y.%m.%d') as col_sch_dt, mgnt.pick_mgr_nm, fn_get_telno(mgnt.pick_mgr_tel_no) as pick_mgr_tel_no
                , mgnt.whs_id as rtn_whs_id , mgnt.location as rtn_location
                , fn_whs_nm(mgnt.brand_id, mgnt.whs_id) as rtn_whs_nm, fn_whs_location_nm(mgnt.brand_id, mgnt.whs_id, mgnt.location) as rtn_location_nm
                , base.whs_id, base.location
                , fn_whs_nm(base.brand_id, base.whs_id) as whs_nm, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
                , mgnt.spply_id, fn_spply_nm(mgnt.spply_id) as spply_nm
+                , dtl.unit_amt as 'pickDtlInfo.unit_amt'
         from   pick_info_mgnt mgnt
               ,pick_dtl_ptcl dtl
               ,rtn_odr_dtl_ptcl ptcl
@@ -655,7 +657,7 @@
         <foreach collection="gridInsertData" item="item" separator=",">
             (#{item.rtnMgntUnqNo}, #{item.brandId}, #{item.storeId}, #{item.itemId}, #{item.itemNm}
             , #{item.whsId}, #{item.location}, #{item.unit}, #{item.unitAmt}, #{item.rtnReqQty}
-            , #{item.rtnOdrQty}, #{item.colQty}, #{item.colReqQty}, #{item.colReqDt}, #{item.colSchDt}, #{item.colDt}
+            , #{item.rtnOdrQty}, #{item.colQty}, #{item.colReqQty}, #{item.colReqDt}, #{item.colSchDt}, date_format(now(),'%Y%m%d')
             , #{item.colCnfmNm}, #{item.colMgrNm}, #{item.colMgrTelNo}, #{item.colMgrEmal}, #{item.colMgrMblNo}
             , #{item.colAmt}, #{item.colAgrYn}, #{item.colCnfmDocFileNo}, #{item.sttlYn}, #{item.spplyId}
             , #{item.spplyNm}, #{item.colPickUnqNo}, #{item.colPickDtlNo}, #{item.colCmdUnqNo}, #{item.colCmdDtlNo}
@@ -770,8 +772,8 @@
             , mgnt.whs_id as rtn_whs_id, mgnt.location as rtn_location
             , fn_whs_nm(base.brand_id, mgnt.whs_id) as rtn_whs_nm, fn_whs_location_nm(base.brand_id, mgnt.whs_id, mgnt.location) as rtn_location_nm
             , dtl.unit as 'pickDtlInfo.unit' , dtl.unit_amt as 'pickDtlInfo.unit_amt'
-            , ptcl.rtn_req_qty as  'pickDtlInfo.rtn_req_qty'   , dtl.rodr_qty as 'pickDtlInfo.rodr_qty'
-            , dtl.col_req_qty as 'pickDtlInfo.col_req_qty'
+            , nvl(ptcl.rtn_req_qty,0) as  'pickDtlInfo.rtn_req_qty'   , nvl(dtl.rodr_qty,0) as 'pickDtlInfo.rodr_qty'
+            , nvl(dtl.col_req_qty,0) as 'pickDtlInfo.col_req_qty'
             , date_format(mgnt.col_req_dt,'%Y%m%d') as col_req_dt
             , date_format(mgnt.col_sch_dt,'%Y%m%d') as col_sch_dt
             , date_format(mgnt.col_cmplt_dt,'%Y%m%d') as col_cmplt_dt
@@ -896,6 +898,7 @@
             set    sys_chg_id = #{userId}
                 , sys_chg_dttm = now()
                 , pick_st_cd = #{item.pickStCd}
+                , col_cmplt_dt = case when #{item.pickStCd} in ('PICK1','PICK3') then date_format(now(), '%Y%m%d') else col_cmplt_dt end
             where col_pick_unq_no = #{item.colPickUnqNo}
         </foreach>
     </update>

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

@@ -16,8 +16,8 @@
         left outer join item_class_mgnt mclas on iclas.item_class_mgnt_no = mclas.item_class_mgnt_no
         where iunit.brand_id = #{sBrandId}
         <if test="fromDt != null and fromDt != '' and toDt != null and toDt != ''">
-        and   iunit.cont_stt_dt <![CDATA[ >= ]]>  #{fromDt}
-        and   iunit.cont_end_dt <![CDATA[ <= ]]>  #{toDt}
+          and iunit.cont_stt_dt between #{fromDt} and #{toDt}
+          and #{toDt}  between iunit.cont_stt_dt and iunit.cont_end_dt
         </if>
         <if test="sUnitStCd != null and sUnitStCd != ''">
         and   iunit.unit_st_cd = #{sUnitStCd}
@@ -69,8 +69,8 @@
         left outer join item_class_mgnt mclas on iclas.item_class_mgnt_no = mclas.item_class_mgnt_no
         where iunit.brand_id = #{sBrandId}
         <if test="fromDt != null and fromDt != '' and toDt != null and toDt != ''">
-            and   iunit.cont_stt_dt <![CDATA[ >= ]]>  #{fromDt}
-            and   iunit.cont_end_dt <![CDATA[ <= ]]>  #{toDt}
+            and iunit.cont_stt_dt between #{fromDt} and #{toDt}
+            and #{toDt}  between iunit.cont_stt_dt and iunit.cont_end_dt
         </if>
         <if test="sUnitStCd != null and sUnitStCd != ''">
             and   iunit.unit_st_cd = #{sUnitStCd}

src/main/resources/mybatis/sqlmaps/sttlmng/SttlReq.xml

@@ -47,7 +47,7 @@
             AND wpip.sttl_yn = 'N'
             AND (smbi.sttl_st_cd IS NULL OR smbi.sttl_st_cd IN ('ST00', 'ST30'))    /* 정산요청 이전, 임시저장, 정산반려 */
             AND wpip.brand_id = #{sBrandId}
-            <if test="sSpplyId == null or sSpplyId == ''">          /* 매장 정산요청 */
+            <if test="sStoreId != null and sStoreId != ''">                /* 매장 정산요청 */
             AND wpip.store_id = #{sStoreId}
             </if>
             <if test="sSpplyId != null and sSpplyId != ''">        /* 공급사 정산요청 */
@@ -83,7 +83,7 @@
             AND rpip.sttl_yn = 'N'
             AND (smbi.sttl_st_cd IS NULL OR smbi.sttl_st_cd IN ('ST00', 'ST30'))    /* 정산요청 이전, 임시저장, 정산반려 */
             AND rpip.brand_id = #{sBrandId}
-            <if test="sSpplyId == null or sSpplyId == ''">          /* 매장 정산요청 */
+            <if test="sStoreId != null and sStoreId != ''">               /* 매장 정산요청 */
             AND rpip.store_id = #{sStoreId}
             </if>
             <if test="sSpplyId != null and sSpplyId != ''">        /* 공급사 정산요청 */
@@ -131,7 +131,7 @@
             AND wpip.sttl_yn = 'N'
             AND (smbi.sttl_st_cd IS NULL OR smbi.sttl_st_cd IN ('ST00', 'ST30'))    /* 정산요청 이전, 임시저장, 정산반려 */
             AND wpip.brand_id = #{sBrandId}
-            <if test="sSpplyId == null or sSpplyId == ''">          /* 매장 정산요청 */
+            <if test="sStoreId != null and sStoreId != ''">            /* 매장 정산요청 */
                 AND wpip.store_id = #{sStoreId}
             </if>
             <if test="sSpplyId != null and sSpplyId != ''">        /* 공급사 정산요청 */
@@ -155,7 +155,7 @@
             AND rpip.sttl_yn = 'N'
             AND (smbi.sttl_st_cd IS NULL OR smbi.sttl_st_cd IN ('ST00', 'ST30'))    /* 정산요청 이전, 임시저장, 정산반려 */
             AND rpip.brand_id = #{sBrandId}
-            <if test="sSpplyId == null or sSpplyId == ''">          /* 매장 정산요청 */
+            <if test="sStoreId != null and sStoreId != ''">          /* 매장 정산요청 */
                 AND rpip.store_id = #{sStoreId}
             </if>
             <if test="sSpplyId != null and sSpplyId != ''">        /* 공급사 정산요청 */
@@ -351,10 +351,10 @@
         WHERE whs_mgnt_unq_no = #{entity.whsMgntUnqNo}
     </update>
 
-    <select id="selectRtnProcInfoPtcl" resultType="com.oqpo.api.entity.rtnmng.RtnProcInfoPtclEntity">
+        <select id="selectRtnProcInfoPtcl" resultType="com.oqpo.api.entity.rtnmng.RtnProcInfoPtclEntity">
         /* SttlReqMapper.selectRtnProcInfoPtcl */
         SELECT A.rtn_mgnt_unq_no, A.brand_id, A.store_id, A.item_id, A.item_nm, A.whs_id, A.location, A.unit,
-            A.unit_amt, A.rtn_qty, A.rtn_odr_qty, A.col_qty, A.col_req_dt, A.col_sch_dt, A.col_dt, A.col_cnfm_nm,
+            A.unit_amt, A.rtn_odr_qty, A.col_qty, A.col_req_dt, A.col_sch_dt, A.col_dt, A.col_cnfm_nm,
             A.col_mgr_nm, A.col_mgr_tel_no, A.col_mgr_emal, A.col_mgr_mbl_no, A.col_amt, A.col_agr_yn,
             A.col_cnfm_doc_file_no, A.sttl_yn, A.spply_id, A.spply_nm, A.col_cmd_unq_no, A.col_cmd_dtl_no,
             A.rtn_podr_unq_no, A.rtn_podr_dtl_no, A.rtn_req_unq_no, A.rtn_req_dtl_no, A.sttl_mgnt_unq_no,