销售跟踪明细

src/main/java/com/dk/mdm/controller/report/ReportController.java

@@ -113,8 +113,20 @@ public class ReportController  {
     public ResponseResultVO<List<Map<String, Object>>> getPurTrackingReportDetail(@PathVariable String id) {
         return reportService.getPurTrackingReportDetail(id);
     }
+
+    /**
+     * @desc   : 销售跟踪表 明细查询
+     * @author : 于继渤
+     * @date   : 2024/4/16 11:27
+     */
+    @PostMapping("sale_tracking_report_detail/{id}")
+    public ResponseResultVO<List<Map<String, Object>>> getSalesTrackingReportDetail(@PathVariable String id) {
+        return reportService.getSalesTrackingReportDetail(id);
+    }
+
 }
 
 
 
 
+

src/main/java/com/dk/mdm/mapper/report/ReportMapper.java

@@ -93,6 +93,8 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
      * @date   : 2024/4/16 11:27
      */
     List<Map<String, Object>> getSalesTrackingReport(Map param);
+
+    List<Map<String, Object>> getSalesTrackingReportDetail(String id);
     Long getSalesTrackingReportCount(Map<String, Object> param);
 
 

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -1039,12 +1039,25 @@
             ,tmc.cus_code AS "cusCode"
             ,tmc.cus_name  As "cusName"
             ,tmc.cus_phone  As "cusPhone"
+            ,tpo.address_area AS "addressArea"
+            ,tpo.address_name AS "addressName"
+            ,tpo.address_no AS "addressNo"
+            ,tpo.address_gcj02 AS "addressGcj02"
+            ,tpo.address_full AS "addressFull"
+            ,tpo.contact_name AS "contactName"
+            ,tpo.contact_phone AS "contactPhone"
+            ,tpo.sales_channel AS "salesChannel"
+            ,tpo.make_time AS "makeTime"
+            ,tms.staff_name as "staffName"
+            ,tmo.org_name   as "orgName"
         FROM
             dkic_b.t_psi_order tpo
         left join dkic_b.t_mst_customer tmc on tpo.cus_id = tmc.cus_id
         left join sys.t_data_kind as tdk1 on tpo.order_type = tdk1.kind_code
         left join sys.t_data_kind as tdk2 on tpo.order_status = tdk2.kind_code
         left join sys.t_data_kind as tdk3 on tpo.out_status = tdk3.kind_code
+        left join dkic_b.t_mst_staff tms on tpo.staff_id = tms.staff_id
+        left join dkic_b.t_mst_org tmo on tpo.org_id = tmo.org_id
         <include refid="ConditionSalesTrackingReport"/>
         order by  tpo.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -1061,6 +1074,169 @@
         <include refid="ConditionSalesTrackingReport"/>
     </select>
 
+    <select id="getSalesTrackingReportDetail"  resultType="java.util.Map">
+        SELECT T
+                   ."id",
+               T."no",
+               T."itemId",
+               T."type",
+               T."skuCode",
+               T."skuName",
+               T."skuModel",
+               T."skuImages",
+               T."brandName",
+               T."shortName",
+               T."returnQty",
+               T."outQty",
+               T."outingQty",
+               T."priceSale",
+               T."itemQty",
+               T."sumAmtRec",
+               T."sumShouldHandle",
+               T."sumUsePaymentResidue",
+               T."sumWaiveAmt",
+               T."makeTime",
+               T."whId",
+               T."whName",
+               T."remarks"
+        FROM
+            (
+                SELECT
+                    tpo.order_id AS "id",
+                    tpo.order_no AS "no",
+                    tpoi.item_id AS "itemId",
+                    '销售订单' AS "type",
+                    tmgs.sku_code AS "skuCode",
+                    tmgs.sku_name AS "skuName",
+                    tmgs.sku_model AS "skuModel",
+                    tmgs.sku_images AS "skuImages",
+                    tmgb.brand_name AS "brandName",
+                    tmgb.short_name AS "shortName",
+                    tpo.return_qty AS "returnQty",
+                    tpo.out_qty AS "outQty",
+                    tpo.outing_qty AS "outingQty",
+                    tpoi.price_sale AS "priceSale",
+                    tpoi.item_qty AS "itemQty",
+                    0.00 AS "sumAmtRec",
+                    0.00 AS "sumShouldHandle",
+                    0.00 AS "sumUsePaymentResidue",
+                    0.00 AS "sumWaiveAmt",
+                    tpo.make_time AS "makeTime",
+                    tpoi.wh_id AS "whId",
+                    tmw.wh_name AS "whName",
+                    tpoi.remarks AS "remarks"
+                FROM
+                    dkic_b.t_psi_order_item tpoi
+                        LEFT JOIN dkic_b.t_psi_order tpo ON tpo.order_id = tpoi.order_id
+                        LEFT JOIN dkic_b.t_mst_goods_sku tmgs ON tmgs.sku_id = tpoi.sku_id
+                        LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
+                        LEFT JOIN dkic_b.t_mst_warehouse tmw ON tmw.wh_id = tpoi.wh_id
+                WHERE
+                    tpo.order_id =  #{id}::uuid
+                UNION ALL
+                SELECT
+                    tpobi.out_id AS "id",
+                    tpob.out_no AS "no",
+                    tpobi.item_id AS "itemId",
+                    '销售出库' AS "type",
+                    tmgs.sku_code AS "skuCode",
+                    tmgs.sku_name AS "skuName",
+                    tmgs.sku_model AS "skuModel",
+                    tmgs.sku_images AS "skuImages",
+                    tmgb.brand_name AS "brandName",
+                    tmgb.short_name AS "shortName",
+                    tpob.return_qty AS "returnQty",
+                    tpob.out_qty AS "outQty",
+                    tpob.outing_qty AS "outingQty",
+                    tpobi.price_out AS "priceSale",
+                    CASE
+
+                    WHEN tpobi.out_status = '出库状态-出库中' THEN
+                    tpobi.outing_qty ELSE tpobi.out_qty
+                    END AS "itemQty",
+                    0.00 AS "sumAmtRec",
+                    0.00 AS "sumShouldHandle",
+                    0.00 AS "sumUsePaymentResidue",
+                    0.00 AS "sumWaiveAmt",
+                    tpob.make_time AS "makeTime",
+                    NULL AS "whId",
+                    NULL AS "whName",
+                    tpobi.remarks AS "remarks"
+                FROM
+                    dkic_b.t_psi_outbound_item tpobi
+                    LEFT JOIN dkic_b.t_psi_outbound tpob ON tpob.out_id = tpobi.out_id
+                    LEFT JOIN dkic_b.t_mst_goods_sku tmgs ON tmgs.sku_id = tpobi.sku_id
+                    LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
+                WHERE
+                    tpob.from_id =  #{id}::uuid
+                  AND tpob.out_type = '出库类型-销售出库' UNION ALL
+                SELECT
+                    tpobi.out_id AS "id",
+                    tpob.out_no AS "no",
+                    tpobi.item_id AS "itemId",
+                    '销售退货' AS "type",
+                    tmgs.sku_code AS "skuCode",
+                    tmgs.sku_name AS "skuName",
+                    tmgs.sku_model AS "skuModel",
+                    tmgs.sku_images AS "skuImages",
+                    tmgb.brand_name AS "brandName",
+                    tmgb.short_name AS "shortName",
+                    tpob.return_qty AS "returnQty",
+                    tpob.out_qty AS "outQty",
+                    tpob.outing_qty AS "outingQty",
+                    tpobi.price_out AS "priceSale",
+                    CASE
+
+                    WHEN tpobi.out_status = '出库状态-出库中' THEN
+                    tpobi.outing_qty ELSE tpobi.out_qty
+                    END AS "itemQty",
+                    0.00 AS "sumAmtRec",
+                    0.00 AS "sumShouldHandle",
+                    0.00 AS "sumUsePaymentResidue",
+                    0.00 AS "sumWaiveAmt",
+                    tpob.make_time AS "makeTime",
+                    NULL AS "whId",
+                    NULL AS "whName",
+                    tpobi.remarks AS "remarks"
+                FROM
+                    dkic_b.t_psi_outbound_item tpobi
+                    LEFT JOIN dkic_b.t_psi_outbound tpob ON tpob.out_id = tpobi.out_id
+                    LEFT JOIN dkic_b.t_mst_goods_sku tmgs ON tmgs.sku_id = tpobi.sku_id
+                    LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
+                WHERE
+                    tpob.from_id =  #{id}::uuid
+                  AND tpob.out_type = '出库类型-销售出库退货' UNION ALL
+                SELECT
+                    tmrp.rp_id AS "id",
+                    tmrp.rp_no AS "no",
+                    NULL AS "itemId",
+                    '核销信息' AS "type",
+                    NULL AS "skuCode",
+                    NULL AS "skuName",
+                    NULL AS "skuModel",
+                    NULL AS "skuImages",
+                    NULL AS "brandName",
+                    NULL AS "shortName",
+                    NULL AS "returnQty",
+                    NULL AS "outQty",
+                    NULL AS "outingQty",
+                    NULL AS "priceSale",
+                    NULL AS "itemQty",
+                    tmrp.sum_amt_rec AS "sumAmtRec",
+                    tmrp.sum_should_handle AS "sumShouldHandle",
+                    tmrp.sum_use_payment_residue AS "sumUsePaymentResidue",
+                    tmrp.sum_waive_amt AS "sumWaiveAmt",
+                    NULL AS "makeTime",
+                    NULL AS "whId",
+                    NULL AS "whName",
+                    tmrp.remarks AS "remarks"
+                FROM
+                    dkic_b.t_mac_rec_pay tmrp
+                WHERE
+                    tmrp.biznis_id =  #{id}::uuid
+            ) T
+    </select>
+
     <!--  采购跟踪表 列表查询 -->
     <select id="getPurTrackingReport" resultType="java.util.Map">
         SELECT

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -194,7 +194,13 @@ public class ReportService {
         return ResponseResultUtil.success(reportMapper.getPurTrackingReportDetail(purId) );
     }
 
-
-
+    /**
+     * @desc   : 销售跟踪表 明细查询
+     * @author : 于继渤
+     * @date   : 2024/4/16 11:27
+     */
+    public ResponseResultVO getSalesTrackingReportDetail(String id) {
+        return ResponseResultUtil.success(reportMapper.getSalesTrackingReportDetail(id) );
+    }
 
 }