메인화면 수주내역

src/main/java/com/oqpo/api/mapper/oper/MainChartMapper.java

@@ -12,7 +12,8 @@ public interface MainChartMapper {
 
     MainChartEntity selectPchReqChart(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("prType") String prType) throws Exception;
 
-    MainChartEntity selectPchOdrChart(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("poType") String poType) throws Exception;
+    MainChartEntity selectPchOdrChart(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("spplyId") String spplyId,
+                                      @Param("poType") String poType) throws Exception;
 
     List<MainChartEntity> selectPrRankChart(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("prType") String prType) throws Exception;
 
@@ -21,6 +22,6 @@ public interface MainChartMapper {
     List<MainChartEntity> selectSftStckChart(@Param("brandId") String brandId, @Param("storeId") String storeId) throws Exception;
 
     MainChartEntity selectDeliChart(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("spplyId") String spplyId,
-                                    @Param("deliType") String deliType, @Param("dlvStCd") String dlvStCd) throws Exception;
+                                    @Param("deliType") String deliType, @Param("dlvStCd") String dlvStCd, @Param("dateColumn") String dateColumn) throws Exception;
 
 }

src/main/java/com/oqpo/api/service/oper/MainChartService.java

@@ -30,11 +30,20 @@ public class MainChartService extends CommonService {
         return result;
     }
 
-    public ChartResponse selectPchOdrChart(String brandId, String storeId, String poType) throws Exception {
-        MainChartEntity entity = mainChartMapper.selectPchOdrChart(brandId, storeId, poType);
+    public ChartResponse selectPchOdrChart(String brandId, String storeId, String spplyId, String poType) throws Exception {
+        String chartData = null;
 
-        String chartData = "[ [' ', '요청', '진행', '취소'], [' ', " + entity.getPo20Val() + " , " + entity.getPo30Val() + " , " + entity.getPo99Val() + "] ]";
+        if (StringUtil.isEmpty(spplyId)) {
+            // 브랜드/매장
+            MainChartEntity entity = mainChartMapper.selectPchOdrChart(brandId, storeId, spplyId, poType);
+            chartData = "[ [' ', '요청', '진행', '취소'], [' ', " + entity.getPo20Val() + " , " + entity.getPo30Val() + " , " + entity.getPo99Val() + "] ]";
+        } else {
+            // 공급사
+            MainChartEntity entity = mainChartMapper.selectPchOdrChart(brandId, storeId, spplyId, poType); // 수주대상
+            MainChartEntity deliEntity = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, poType, "DLV0", "dlv_reg_dt"); // 납품서생성 (납품서생성/납품생성일자 비교)
 
+            chartData = "[ [' ', '수주대상', '납품서생성'], [' ', " + entity.getPo20Val() + " , " + deliEntity.getDlvVal() + "] ]";
+        }
         ChartResponse result = new ChartResponse();
         result.setChartData(chartData);
         return result;
@@ -91,16 +100,16 @@ public class MainChartService extends CommonService {
         String chartData = null;
         if (!StringUtil.isEmpty(storeId)) {
             // 매장 입고
-            MainChartEntity entity1 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV0"); // 대기 (납품서생성/납품예정일자 비교)
-            MainChartEntity entity2 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV1"); // 확인 (납품서완료/납품완료일자 비교)
+            MainChartEntity entity1 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV0", "dlv_sch_dt"); // 대기 (납품서생성/납품예정일자 비교)
+            MainChartEntity entity2 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV1", "dlv_cmplt_dt"); // 확인 (납품서완료/납품완료일자 비교)
 
             chartData = "[ [' ', '대기', '확인'], [' ', " + entity1.getDlvVal() + " , " + entity2.getDlvVal() + "] ]";
         } else if (!StringUtil.isEmpty(spplyId)) {
             // 공급사 출고
             // 출고 대상 : 납품서생성, 납품예정일자 비교
             // 출고 확인 : 납품서완료, 납품완료일자 비교
-            MainChartEntity entity1 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV0"); // 대기 (납품서생성/납품예정일자 비교)
-            MainChartEntity entity2 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV1"); // 확인 (납품서완료/납품완료일자 비교)
+            MainChartEntity entity1 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV0", "dlv_sch_dt"); // 대기 (납품서생성/납품예정일자 비교)
+            MainChartEntity entity2 = mainChartMapper.selectDeliChart(brandId, storeId, spplyId, deliType, "DLV1", "dlv_cmplt_dt"); // 확인 (납품서완료/납품완료일자 비교)
 
             chartData = "[ [' ', '대상', '확인'], [' ', " + entity1.getDlvVal() + " , " + entity2.getDlvVal() + "] ]";
         }

src/main/java/com/oqpo/api/web/controller/oper/MainChartController.java

@@ -52,14 +52,16 @@ public class MainChartController {
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
             @ApiImplicitParam(name = "brandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "storeId", value = "매장아이디", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "spplyId", value = "공급사아이디", required = true, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "poType", value = "구매발주타입", required = true, dataType = "String", paramType = "query")
     })
-    @ApiOperation(value = "구매요청 차트")
+    @ApiOperation(value = "구매발주 차트")
     @GetMapping("/pch-odr-chart")
     public ResponseEntity<ChartResponse> pch_odr_chart(@RequestParam(value = "brandId") String brandId,
-                                                       @RequestParam(value = "storeId") String storeId,
+                                                       @RequestParam(value = "storeId", required = false) String storeId,
+                                                       @RequestParam(value = "spplyId", required = false) String spplyId,
                                                        @RequestParam(value = "poType") String poType) throws Exception {
-        return ResponseEntity.ok(mainChartService.selectPchOdrChart(brandId, storeId, poType));
+        return ResponseEntity.ok(mainChartService.selectPchOdrChart(brandId, storeId, spplyId, poType));
     }
 
     /**

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

@@ -45,6 +45,9 @@
         <if test="storeId != null and storeId != '' ">
             AND A.store_id = #{storeId}
         </if>
+        <if test="spplyId != null and spplyId != '' ">
+            AND A.spply_id = #{spplyId}
+        </if>
         <if test='"A".equals(poType)'>
             AND A.podr_dt = DATE_FORMAT(NOW(), '%Y%m%d')
         </if>
@@ -144,29 +147,17 @@
         <if test="spplyId != null and spplyId != '' ">
             AND A.spply_id = #{spplyId}
         </if>
-        <if test='"A".equals(deliType) and "DLV0".equals(dlvStCd)'>
-            AND A.dlv_sch_dt = DATE_FORMAT(NOW(), '%Y%m%d')         /* 납품예정일자 */
-        </if>
-        <if test='"A".equals(deliType) and "DLV1".equals(dlvStCd)'>
-            AND A.dlv_cmplt_dt = DATE_FORMAT(NOW(), '%Y%m%d')       /* 납품완료일자 */
-        </if>
-        <if test='"B".equals(deliType) and "DLV0".equals(dlvStCd)'>
-            AND A.dlv_sch_dt BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 7 DAY), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
-        </if>
-        <if test='"B".equals(deliType) and "DLV1".equals(dlvStCd)'>
-            AND A.dlv_cmplt_dt BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 7 DAY), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
-        </if>
-        <if test='"C".equals(deliType) and "DLV0".equals(dlvStCd)'>
-            AND A.dlv_sch_dt BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 15 DAY), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
+        <if test='"A".equals(deliType)'>
+            AND A.${dateColumn} = DATE_FORMAT(NOW(), '%Y%m%d')
         </if>
-        <if test='"C".equals(deliType) and "DLV1".equals(dlvStCd)'>
-            AND A.dlv_cmplt_dt BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 15 DAY), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
+        <if test='"B".equals(deliType)'>
+            AND A.${dateColumn} BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 7 DAY), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
         </if>
-        <if test='"D".equals(deliType) and "DLV0".equals(dlvStCd)'>
-            AND A.dlv_sch_dt BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 MONTH), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
+        <if test='"C".equals(deliType)'>
+            AND A.${dateColumn} BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 15 DAY), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
         </if>
-        <if test='"D".equals(deliType) and "DLV1".equals(dlvStCd)'>
-            AND A.dlv_cmplt_dt BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 MONTH), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
+        <if test='"D".equals(deliType)'>
+            AND A.${dateColumn} BETWEEN DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 MONTH), '%Y%m%d') AND DATE_FORMAT(NOW(), '%Y%m%d')
         </if>
     </select>