采购修改

src/main/java/com/dk/mdm/controller/pur/PurchaseController.java

@@ -147,4 +147,15 @@ public class PurchaseController{
         return purchaseService.oneKeyInvalid(id);
     }
 
+
+
+    @ApiOperation(
+            value = "分页、关联、条件查询",
+            notes = "分页、关联、条件查询"
+    )
+    @PostMapping({"select_total_detail"})
+    public ResponseResultVO<PageList<PurchaseResponse>> selectTotalDetail(@RequestBody PurchaseQuery purchaseQuery) {
+        return purchaseService.selectTotalDetail(purchaseQuery);
+    }
+
 }

src/main/java/com/dk/mdm/mapper/mst/SupplierMapper.xml

@@ -47,6 +47,21 @@ op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,return_
         <result column="op_db_user" property="opDbUser"/>
         <result column="payable_residue" property="payableResidue"/>
         <result column="payment_residue" property="paymentResidue"/>
+        <result column="payment" property="payment"/>
+
+
+        <result column="purchaseQuantity" property="purchaseQuantity"/>
+        <result column="purchaseAmount" property="purchaseAmount"/>
+        <result column="inboundReturnQuantity" property="inboundReturnQuantity"/>
+        <result column="inboundReturnAmount" property="inboundReturnAmount"/>
+        <result column="inboundQuantity" property="inboundQuantity"/>
+        <result column="inboundAmount" property="inboundAmount"/>
+        <result column="inboundNotQuantity" property="inboundNotQuantity"/>
+        <result column="inboundNotAmount" property="inboundNotAmount"/>
+
+
+
+
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -266,11 +281,49 @@ op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,return_
         LEFT JOIN dkic_b.t_mst_goods_brand tsm ON tsm.brand_id = tsmb.brand_id
         WHERE
         tsmb.sup_id = msl.sup_id
-        ) AS "brandIds"
+        ) AS "brandIds",
+
+        (SELECT COUNT(1) FROM dkic_b.t_psi_purchase tpp WHERE tpp.sup_id = msl.sup_id AND tpp.cp_id = msl.cp_id AND
+        tpp.flg_valid) AS "purchaseQuantity",
+
+        (SELECT sum(tpp.sum_amount) FROM dkic_b.t_psi_purchase tpp WHERE tpp.sup_id = msl.sup_id AND tpp.cp_id = msl.cp_id
+        AND tpp.flg_valid) AS "purchaseAmount",
+
+        (SELECT  COUNT(1) FROM dkic_b.t_psi_inbound tpi WHERE tpi.sup_id = msl.sup_id AND tpi.cp_id =
+        msl.cp_id AND tpi.flg_valid AND tpi.into_type = '入库类型-采退入库') AS
+        "inboundReturnQuantity",
+
+        (SELECT sum(CASE WHEN tpi.into_status = '入库状态-入库中' THEN tpi.intoing_amt ELSE tpi.into_amt END) FROM dkic_b.t_psi_inbound tpi WHERE tpi.sup_id = msl.sup_id AND tpi.cp_id =
+        msl.cp_id AND tpi.flg_valid AND tpi.into_type = '入库类型-采退入库') AS
+        "inboundReturnAmount",
+
+
+        (SELECT COUNT(1) FROM dkic_b.t_psi_inbound tpi WHERE tpi.sup_id = msl.sup_id AND tpi.cp_id = msl.cp_id AND
+        tpi.flg_valid AND tpi.into_type = '入库类型-采购入库' AND tpi.into_status = '入库状态-已入库') AS
+        "inboundQuantity",
+
+        (SELECT sum(tpi.into_amt) FROM dkic_b.t_psi_inbound tpi WHERE tpi.sup_id = msl.sup_id AND tpi.cp_id =
+        msl.cp_id AND tpi.flg_valid AND tpi.into_type = '入库类型-采购入库' AND tpi.into_status = '入库状态-已入库') AS
+        "inboundAmount",
+
+
+        (SELECT COUNT(1) FROM dkic_b.t_psi_inbound tpob WHERE tpob.sup_id = msl.sup_id AND tpob.cp_id =
+        msl.cp_id AND tpob.flg_valid AND tpob.into_type = '入库类型-采购入库' AND tpob.into_status = '入库状态-入库中') AS
+        "inboundNotQuantity",
+
+        (SELECT sum(tpob.intoing_amt) FROM dkic_b.t_psi_inbound tpob WHERE tpob.sup_id = msl.sup_id AND tpob.cp_id =
+        msl.cp_id AND tpob.flg_valid AND tpob.into_type = '入库类型-采购入库' AND tpob.into_status = '入库状态-入库中') AS
+        "inboundNotAmount",
+        tma.payable_residue AS "payableResidue",
+        tma.payment AS "payment"
+
+
+
         FROM dkic_b.t_mst_supplier msl
         LEFT JOIN dkic_b.t_mst_staff  tms   ON tms.staff_id = msl.staff_id
         LEFT JOIN dkic_b.t_mst_org  tmo   ON tmo.org_id = msl.org_id
         LEFT JOIN sys.t_data_kind tdk   ON tdk.kind_code = msl.sup_type
+        LEFT JOIN dkic_b.t_mac_account tma   ON tma.object_id = msl.sup_id
         WHERE msl.sup_id = #{id}::uuid
     </select>
 

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.java

@@ -84,5 +84,12 @@ public interface PurchaseMapper extends BaseMapper<Purchase>{
      */
     Map<String, Object> selectTrackReport(Map param);
 
+
+
+    List<PurchaseResponse>  selectTotalDetail(PurchaseQuery purchaseQuery);
+
+
+    Long selectTotalDetailCount(PurchaseQuery purchaseQuery);
+
 }
 

src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

@@ -158,6 +158,7 @@
         <result column="inboundReturnQty" property="inboundReturnQty"/>
         <result column="flg_auto_handle" property="flgAutoHandle"/>
         <result column="inbound_processing_flag" property="inboundProcessingFlag"/>
+        <result column="category_count" property="categoryCount"/>
         <collection property="purchaseItemResponseList" resultMap="purchaseItemListMap" columnPrefix="list_"/>
     </resultMap>
     <!--    关联映射-->
@@ -196,6 +197,9 @@
         <result column="op_app_code" property="opAppCode"/>
         <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="sku_images" property="skuImages"/>
+
 
     </resultMap>
 
@@ -526,7 +530,7 @@
         tppi.into_status as "List_into_status",
         sys.f_remove_zero(tppi.intoing_qty) as "List_intoing_qty",
         tppi.intoing_amt as "List_intoing_amt",
-        sys.f_remove_zero(ttppi.into_qty) as "List_into_qty",
+        sys.f_remove_zero(tppi.into_qty) as "List_into_qty",
         tppi.into_amt as "List_into_amt",
         sys.f_remove_zero(tppi.return_qty) as "List_return_qty",
         tppi.return_amt as "List_return_amt",
@@ -973,4 +977,53 @@
             limit #{end} offset #{start}
         </if>
     </select>
+
+
+
+    <!-- 查询表dkic_b.t_psi_purchase，（条件查询+分页）列表 -->
+    <select id="selectTotalDetail" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Left_join"/>
+        <include refid="Base_Column_List_Item_Response_Join"/>
+        ,tmgb.brand_name as "list_brand_name"
+        ,(select count(DISTINCT tmgss.category_id) from dkic_b.t_psi_purchase_item ti
+        LEFT  JOIN dkic_b.t_mst_goods_sku tmgss ON tmgss.sku_id = ti.sku_id
+        where ti.pur_id = tpp.pur_id and ti.flg_valid) as "category_count"
+        ,tmo.org_name as "orgName"
+        ,tms.staff_name as "staffName"
+        ,tms1.staff_name as "makeStaffName"
+        ,tmp.sup_name as "supplierName"
+        ,tmw.wh_name as "whName"
+
+
+        FROM dkic_b.t_psi_purchase tpp
+        left join dkic_b.t_psi_purchase_item tppi  on tppi.pur_id = tpp.pur_id
+        left join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tppi.sku_id
+        left join  dkic_b.t_mst_goods_brand  tmgb on tmgb.brand_id = tmgs.brand_id
+        left join  dkic_b.t_psi_inventory  tpit on tpit.sku_id = tppi.sku_id
+        Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
+        Left join dkic_b.t_mst_supplier tmp on tpp.sup_id = tmp.sup_id
+        Left join dkic_b.t_mst_staff tms on tpp.staff_id = tms.staff_id
+        Left join dkic_b.t_mst_staff tms1 on tpp.make_staff = tms1.staff_id
+        Left join dkic_b.t_mst_warehouse tmw on tpp.wh_id = tmw.wh_id
+        <include refid="Condition_1"/>
+        ORDER BY  tpp.make_time
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <select id="selectTotalDetailCount" resultType="Long">
+        SELECT
+        count(1)
+        FROM dkic_b.t_psi_purchase tpp
+        Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
+        Left join dkic_b.t_mst_supplier tmp on tpp.sup_id = tmp.sup_id
+        Left join dkic_b.t_mst_staff tms on tpp.staff_id = tms.staff_id
+        Left join dkic_b.t_mst_staff tms1 on tpp.make_staff = tms1.staff_id
+        Left join dkic_b.t_mst_warehouse tmw on tpp.wh_id = tmw.wh_id
+        left join sys.t_data_kind tdk1 on tdk1.kind_code = tpp.into_status
+        left join sys.t_data_kind tdk2 on tdk2.kind_code = tpp.pur_status
+        <include refid="Condition_1"/>
+    </select>
 </mapper>

src/main/java/com/dk/mdm/model/response/mst/SpplierResponse.java

@@ -276,6 +276,33 @@ public class SpplierResponse extends PageInfo<SpplierResponse> implements Serial
     @ApiModelProperty(value = "退货地址")
     private String returnAddress;
 
+
+    @ApiModelProperty(value = "订单数量")
+    private BigDecimal purchaseQuantity;
+
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal purchaseAmount;
+
+    @ApiModelProperty(value = "入库数量")
+    private BigDecimal inboundQuantity;
+
+    @ApiModelProperty(value = "入库金额")
+    private BigDecimal inboundAmount;
+
+    @ApiModelProperty(value = "未入库金额")
+    private BigDecimal inboundNotAmount;
+
+    @ApiModelProperty(value = "未入库数量")
+    private BigDecimal inboundNotQuantity;
+
+    @ApiModelProperty(value = "退货数量")
+    private BigDecimal inboundReturnQuantity;
+
+    @ApiModelProperty(value = "退货金额")
+    private BigDecimal inboundReturnAmount;
+
+    private BigDecimal payment;
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/pur/PurchaseResponse.java

@@ -449,7 +449,7 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @ApiModelProperty(value = "开单并入库办理标识")
     private Boolean inboundProcessingFlag;
 
-
+    private BigDecimal categoryCount;
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -729,4 +729,11 @@ public class PurchaseService extends BaseService<Purchase> {
 
         return  ResponseResultUtil.success();
     }
+
+
+    @Pagination
+    public ResponseResultVO<PageList<PurchaseResponse>> selectTotalDetail(PurchaseQuery purchaseQuery) {
+        return super.mergeListWithCount(purchaseQuery, purchaseMapper.selectTotalDetail(purchaseQuery),
+                purchaseMapper.selectTotalDetailCount(purchaseQuery));
+    }
 }