Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/t_mst/MoneyAccountItemController.java → src/main/java/com/dk/mdm/controller/mst/MoneyAccountItemController.java

@@ -1,18 +1,17 @@
-package com.dk.mdm.controller.t_mst;
+package com.dk.mdm.controller.mst;
 
-import com.dk.mdm.model.pojo.t_mst.MoneyAccountItem;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.dk.mdm.model.pojo.mst.MoneyAccountItem;
+import com.dk.mdm.service.mst.MoneyAccountItemService;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import io.swagger.annotations.Api;
-import com.dk.mdm.service.t_mst.MoneyAccountItemService;
 
 @Api(tags = "资金流水明细API接口")
 @RestController
 @RequestMapping("/moneyAccountItem")
-public class MoneyAccountItemController{
+public class MoneyAccountItemController {
 
     public BaseService<MoneyAccountItem> getService() {
         return moneyAccountItemService;

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.java

@@ -2,13 +2,22 @@ package com.dk.mdm.mapper.mac;
 
 import com.dk.mdm.model.pojo.mac.AccountItem;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.mac.RecPayItem;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
 /**
 *  账务明细 Mapper
 */
 @Repository
 public interface AccountItemMapper extends BaseMapper<AccountItem>{
-	
+    /**
+     * @desc   : 查询收款总额
+     * @author : 付斌
+     * @date   : 2024-03-09 11:36
+     */
+    Map<String, Object> getSumAmtRec(String id);
 }
 

src/main/java/com/dk/mdm/mapper/mac/AccountItemMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, acc_item_type, object_id, org_id, staff_id, biznis_type, biznis_id, biznis_no, acc_date, rec_status, amt_rec, amt_pay, amt_should, amt_handle, amt_waive, amt_residue, remarks, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, acc_item_type, object_id, org_id, staff_id, biznis_type, biznis_id, biznis_no, acc_date, rec_status, amt_rec, amt_pay, amt_should, amt_handle, amt_waive, amt_residue, remarks, make_staff, make_time, flg_valid
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -31,13 +31,6 @@
                 <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
-                <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_app_code" property="opAppCode"/>
-                <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-                <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -139,7 +132,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account_item
+        FROM dkic_b.t_mac_account_item
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -150,7 +143,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mac_account_item
+        FROM dkic_b.t_mac_account_item
         <include refid="Condition"/>
     </select>
 
@@ -158,7 +151,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account_item
+        FROM dkic_b.t_mac_account_item
         WHERE item_id = #{itemId}::uuid
     </select>
 
@@ -166,7 +159,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account_item
+        FROM dkic_b.t_mac_account_item
         WHERE item_id = #{id}::uuid
         for update
     </select>
@@ -175,13 +168,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account_item
+        FROM dkic_b.t_mac_account_item
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mac_account_item
+        insert into dkic_b.t_mac_account_item
         (
         <trim suffixOverrides=",">
             acc_item_type,
@@ -234,4 +227,17 @@
             )
         </foreach>
     </insert>
+
+    <!-- 查询收款总额 -->
+    <select id="getSumAmtRec" resultType="java.util.Map">
+        SELECT sum(tmai.amt_rec) as "sumAmtRec"
+        FROM dkic_b.t_mac_account_item as tmai
+        where tmai.flg_valid
+          and tmai.object_id = #{id}::uuid
+    </select>
+
+    <delete id="deleteById">
+        DELETE FROM dkic_b.t_mac_account_item
+        WHERE item_id = #{id}::uuid;
+    </delete>
 </mapper>

src/main/java/com/dk/mdm/mapper/mac/AccountMapper.xml

@@ -107,7 +107,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account
+        FROM dkic_b.t_mac_account
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -118,7 +118,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mac_account
+        FROM dkic_b.t_mac_account
         <include refid="Condition"/>
     </select>
 
@@ -126,7 +126,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account
+        FROM dkic_b.t_mac_account
         WHERE object_id = #{objectId}::uuid
     </select>
 
@@ -134,7 +134,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account
+        FROM dkic_b.t_mac_account
         WHERE object_id = #{id}::uuid
         for update
     </select>
@@ -143,13 +143,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_account
+        FROM dkic_b.t_mac_account
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mac_account
+        insert into dkic_b.t_mac_account
         (
         <trim suffixOverrides=",">
             object_type,

src/main/java/com/dk/mdm/mapper/mac/RecPayItemMapper.java

@@ -2,6 +2,7 @@ package com.dk.mdm.mapper.mac;
 
 import com.dk.mdm.model.pojo.mac.RecPayItem;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.sale.OutReturnItem;
 import com.dk.mdm.model.query.mac.RecPayItemQuery;
 import com.dk.mdm.model.response.mac.RecPayItemResponse;
 import org.springframework.stereotype.Repository;
@@ -19,5 +20,12 @@ public interface RecPayItemMapper extends BaseMapper<RecPayItem>{
      * @date   : 2024-03-19 16:13
      */
     List<RecPayItemResponse> selectByCond(RecPayItemQuery recPayItemQuery);
+
+    /**
+     * @desc   : 根据主表主键锁定表t_psi_order_item的多行数据
+     * @author : 付斌
+     * @date   : 2024-03-09 11:36
+     */
+    List<RecPayItem> selectByZIdForUpdate(String id);
 }
 

src/main/java/com/dk/mdm/mapper/mac/RecPayItemMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id , rp_id, mac_id, amt_rec, amt_pay, acc_item_id, acc_date, remarks, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id , rp_id, mac_id, amt_rec, amt_pay, acc_item_id, acc_date, remarks, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -102,7 +102,7 @@
                t.make_time,
                t.flg_valid,
                t.cp_id
-        FROM t_mac_rec_pay_item as t
+        FROM dkic_b.t_mac_rec_pay_item as t
                  inner join dkic_b.t_mst_money_account tmma on tmma.mac_id = t.mac_id
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -114,7 +114,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mac_rec_pay_item as t
+        FROM dkic_b.t_mac_rec_pay_item as t
                  inner join dkic_b.t_mst_money_account tmma on tmma.mac_id = t.mac_id
         <include refid="Condition"/>
     </select>
@@ -123,7 +123,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay_item
+        FROM dkic_b.t_mac_rec_pay_item
         WHERE item_id = #{itemId}::uuid
     </select>
 
@@ -131,7 +131,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay_item
+        FROM dkic_b.t_mac_rec_pay_item
         WHERE item_id = #{id}::uuid
         for update
     </select>
@@ -140,13 +140,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay_item
+        FROM dkic_b.t_mac_rec_pay_item
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mac_rec_pay_item
+        insert into dkic_b.t_mac_rec_pay_item
         (
         <trim suffixOverrides=",">
             rp_id,
@@ -182,8 +182,17 @@
         </foreach>
     </insert>
 
+    <!-- 根据主键锁定表t_psi_out_return_item的多行数据 -->
+    <select id="selectByZIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_mac_rec_pay_item
+        WHERE rp_id = #{id}::uuid
+        for update
+    </select>
+
     <delete id="deleteById">
-        DELETE FROM dkic_b.t_psi_order_item
-        WHERE item_id = #{id}::UUID;
+        DELETE FROM dkic_b.t_mac_rec_pay_item
+        WHERE item_id = #{id}::uuid;
     </delete>
 </mapper>

src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -230,14 +230,14 @@
                t.rp_type,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "rpTypeName",
                t.object_id,
-               tmc.cus_code                                      as "cusCode",
-               tmc.cus_name                                      as "cusName",
-               tmc.cus_phone                                     as "cusPhone",
-               tmc.address_full                                  as "addressFull",
+               tmc.cus_code           as "cusCode",
+               tmc.cus_name           as "cusName",
+               tmc.cus_phone          as "cusPhone",
+               tmc.address_full       as "addressFull",
                t.org_id,
-               tmo.org_name                                      as "orgName",
+               tmo.org_name           as "orgName",
                t.staff_id,
-               tms.staff_name                                    as "staffName",
+               tms.staff_name         as "staffName",
                t.sum_amt_rec,
                t.sum_amt_pay,
                t.sum_amt_receivable_handle,
@@ -251,10 +251,18 @@
                t.biznis_no,
                t.flg_lock,
                t.make_staff,
-               makestaff.staff_name                              as "makeStaffName",
+               makestaff.staff_name   as "makeStaffName",
                t.make_time,
                t.flg_valid,
-               t.cp_id
+               t.cp_id,
+               tma.receipt,
+               tma.receipt_lock       as "receiptLock",
+               tma.contract_assets    as "contractAssets",
+               tma.receivable,
+               tma.receivable_handle  as "receivableHandle",
+               tma.receivable_waive   as "receivableWaive",
+               tma.receivable_residue as "receivableResidue",
+               tma.receipt_residue    as "receiptResidue"
         from dkic_b.t_mac_rec_pay as t
                  left join dkic_b.t_mst_customer tmc
                            on tmc.cus_id = t.object_id and t.rp_type in ('收付款类型-收款', '收付款类型-退收款')
@@ -262,6 +270,7 @@
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
                  left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
+                 left join dkic_b.t_mac_account as tma on tma.object_id = t.object_id and tma.object_type = '对象类型-客户'
         WHERE t.rp_id = #{id}::uuid
     </select>
 
@@ -269,7 +278,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay
+        FROM dkic_b.t_mac_rec_pay
         WHERE rp_id = #{id}::uuid
         for update
     </select>
@@ -278,13 +287,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mac_rec_pay
+        FROM dkic_b.t_mac_rec_pay
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mac_rec_pay
+        insert into dkic_b.t_mac_rec_pay
         (
         <trim suffixOverrides=",">
             rp_no,

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

@@ -95,6 +95,7 @@
 
         <result column="follow_staff" property="followStaff"/>
         <result column="follow_staff_name" property="followStaffName"/>
+        <result column="receivable_residue" property="receivableResidue"/>
 
     </resultMap>
 
@@ -209,7 +210,8 @@
         tms.staff_name  AS  "staffName",
         tms2.staff_name  AS  "reportStaffName",
         tdk.kind_name_i18n  ->> 'zh_CN' AS "saleStatusName",
-        tcf.next_follow_time
+        tcf.next_follow_time,
+        tma.receivable_residue
         FROM dkic_b.t_mst_customer tmc
         LEFT JOIN  ( select tccff.cus_id, max (tccff.next_follow_time)as next_follow_time from dkic_b.t_crm_cus_follow tccff group by tccff.cus_id )  tcf on tmc.cus_id = tcf.cus_id
         LEFT JOIN  dkic_b.t_mst_dictionary_data tmd  on tmd.data_id =  tmc.cus_from
@@ -218,6 +220,7 @@
         LEFT JOIN  dkic_b.t_mst_staff tms  on tms.staff_id =  tmc.staff_id
         LEFT JOIN  dkic_b.t_mst_staff tms2  on tms2.staff_id =  tmc.report_staff
         LEFT JOIN  sys.t_data_kind tdk  on tdk.kind_code =  tmc.sale_status
+        LEFT JOIN  dkic_b.t_mac_account tma  on tma.object_id =  tmc.cus_id
         <include refid="Condition"/>
         order by tmc.cus_id DESC
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/mdm/mapper/mst/MoneyAccountItemMapper.java

@@ -0,0 +1,29 @@
+package com.dk.mdm.mapper.mst;
+
+import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.mst.MoneyAccountItem;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Map;
+
+/**
+*  资金流水明细 Mapper
+*/
+@Repository
+public interface MoneyAccountItemMapper extends BaseMapper<MoneyAccountItem>{
+    /**
+     * @desc   : 根据来源ID删除资金流水
+     * @author : 付斌
+     * @date   : 2024-03-22 10:30
+     */
+    int deleteByInvoiceId(@Param("id") String id);
+
+    /**
+     * @desc   : 查询收款总额
+     * @author : 付斌
+     * @date   : 2024-03-09 11:36
+     */
+    Map<String, Object> getSumAmtInflow(String id);
+}
+

src/main/java/com/dk/mdm/mapper/t_mst/MoneyAccountItemMapper.xml → src/main/java/com/dk/mdm/mapper/mst/MoneyAccountItemMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dk.mdm.mapper.t_mst.MoneyAccountItemMapper">
+<mapper namespace="com.dk.mdm.mapper.mst.MoneyAccountItemMapper">
 
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
@@ -9,7 +9,7 @@
     </sql>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.t_mst.MoneyAccountItem">
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.MoneyAccountItem">
         <id column="item_id" property="itemId"/>
                 <result column="mac_id" property="macId" typeHandler="UuidTypeHandler"/>
                 <result column="flow_type" property="flowType"/>
@@ -174,4 +174,17 @@
             )
         </foreach>
     </insert>
+
+    <delete id="deleteByInvoiceId">
+        DELETE FROM dkic_b.t_mst_money_account_item
+        WHERE invoice_id = #{id}::uuid;
+    </delete>
+
+    <!-- 查询收款总额 -->
+    <select id="getSumAmtInflow" resultType="java.util.Map">
+        SELECT sum(tmmai.amt_inflow) as "sumAmtInflow"
+        FROM dkic_b.t_mst_money_account_item as tmmai
+        where tmmai.flg_valid
+          and tmmai.mac_id = #{id}::uuid
+    </select>
 </mapper>

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

@@ -5,13 +5,28 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        mac_id, mac_code, mac_name, mac_type, balance, display_no, flg_default, mac_receipt_code, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        mac_id, mac_code, mac_name, mac_type, balance, display_no, flg_default, mac_receipt_code, remarks, flg_valid, cp_id
     </sql>
     <sql id="Base_Column_List_">
-        tmma.mac_id, tmma.mac_code, tmma.mac_name, tmma.mac_type, tmma.balance, tmma.display_no, tmma.flg_default, tmma.mac_receipt_code, tmma.remarks, tmma.flg_valid, tmma.cp_id, tmma.op_create_time, tmma.op_create_user_id, tmma.op_update_time, tmma.op_update_user_id, tmma.op_app_code, tmma.op_timestamp, tmma.op_db_user
+        tmma.mac_id, tmma.mac_code, tmma.mac_name, tmma.mac_type, tmma.balance, tmma.display_no, tmma.flg_default, tmma.mac_receipt_code, tmma.remarks, tmma.flg_valid, tmma.cp_id
     </sql>
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.dk.mdm.model.response.mst.MoneyAccountResponse">
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.MoneyAccount">
+        <id column="mac_id" property="macId"/>
+                <result column="mac_code" property="macCode"/>
+                <result column="mac_name" property="macName"/>
+                <result column="mac_type" property="macType" typeHandler="UuidTypeHandler"/>
+                <result column="balance" property="balance"/>
+                <result column="display_no" property="displayNo"/>
+                <result column="flg_default" property="flgDefault"/>
+                <result column="mac_receipt_code" property="macReceiptCode"/>
+                <result column="remarks" property="remarks"/>
+                <result column="flg_valid" property="flgValid"/>
+                <result column="cp_id" property="cpId"/>
+    </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.mst.MoneyAccountResponse">
         <id column="mac_id" property="macId"/>
                 <result column="mac_code" property="macCode"/>
                 <result column="mac_name" property="macName"/>
@@ -23,13 +38,6 @@
                 <result column="remarks" property="remarks"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
-            <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
-            <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_app_code" property="opAppCode"/>
-            <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-                <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -63,7 +71,7 @@
     </sql>
 
     <!-- 查询表t_mst_money_account，（条件查询+分页）列表 -->
-    <select id="selectByCond" resultMap="BaseResultMap">
+    <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT ma.mac_Type,ma.mac_code,ma.mac_name,ma.remarks
              ,ma.cp_id,ma.flg_valid
              ,dd.data_value AS "macTypeName"
@@ -170,7 +178,7 @@
         </where>
     </select>
     <!-- 根据主键查询表t_mst_money_account的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
+    <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_"/>
         ,tmdd.data_value AS "macTypeName"
@@ -183,4 +191,13 @@
         SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_money_account ma
          WHERE ma.cp_id = #{cpId}
     </select>
+
+    <!-- 根据主键锁定表t_mst_money_account的一行数据 -->
+    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_mst_money_account
+        WHERE mac_id = #{id}::uuid
+        for update
+    </select>
 </mapper>

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

@@ -292,6 +292,9 @@
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,tppi.from_id  as "fromId"
+        ,tppi.from_item_id  as "fromItemId"
+        ,tpo.order_no  as "orderNo"
         ,tmgs.sku_code  as "skuCode"
         ,tmgs.sku_model as "skuModel"
         ,tmgs.sku_name  as "skuName"
@@ -302,6 +305,7 @@
         ,tmgs.price_standard  as "priceStandard"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "intoStatusName"
         FROM dkic_b.t_psi_purchase_item tppi
+        left join dkic_b.t_psi_order tpo on tpo.order_id = tppi.from_id
         left join dkic_b.t_mst_goods_sku tmgs on tppi.sku_id = tmgs.sku_id
         left join dkic_b.t_mst_goods_brand tmgb on tmgb.brand_id = tmgs.brand_id
         left join sys.t_data_kind tdk1 on tdk1.kind_code = tppi.into_status
@@ -323,7 +327,11 @@
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
         <include refid="Base_Column_List_Response"/>
+        ,tppi.from_id  as "fromId"
+        ,tppi.from_item_id  as "fromItemId"
+        ,tpo.order_no  as "orderNo"
         FROM dkic_b.t_psi_purchase_item tppi
+        left join dkic_b.t_psi_order tpo on tpo.order_id = tppi.from_id
         WHERE tppi.item_id = #{itemId}::uuid
     </select>
 

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -124,6 +124,8 @@
         <result column="item_qty" property="itemQty"/>
         <result column="price_std" property="priceStd"/>
         <result column="amt_std" property="amtStd"/>
+        <result column="price_standard" property="priceStandard"/>
+
         <result column="price_sale" property="priceSale"/>
         <result column="item_amt" property="itemAmt"/>
         <result column="price_discount" property="priceDiscount"/>
@@ -141,6 +143,8 @@
         <result column="remarks" property="remarks"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
+        <result column="price_purchase" property="pricePurchase"/>
+
         <result column="brand_name" property="brandName"/>
         <result column="short_name" property="shortName"/>
         <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
@@ -383,7 +387,9 @@
     tmgs.sku_model AS toi_sku_model,
     tmgs.sku_name AS toi_sku_name,
     tmgb.brand_name AS toi_brand_name,
-    tmgb.short_name AS toi_short_name
+    tmgb.short_name AS toi_short_name,
+    tmgs.price_purchase AS toi_price_purchase,
+    tmgs.price_standard AS toi_price_standard
 
     </sql>
     <!-- 查询表t_psi_order，（条件查询+分页）列表 -->

src/main/java/com/dk/mdm/mapper/t_mst/MoneyAccountItemMapper.java

@@ -1,14 +0,0 @@
-package com.dk.mdm.mapper.t_mst;
-
-import com.dk.mdm.model.pojo.t_mst.MoneyAccountItem;
-import com.dk.common.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
-
-/**
-*  资金流水明细 Mapper
-*/
-@Repository
-public interface MoneyAccountItemMapper extends BaseMapper<MoneyAccountItem>{
-	
-}
-

src/main/java/com/dk/mdm/model/pojo/mac/Account.java

@@ -71,10 +71,10 @@ public class Account extends PageInfo<Account> implements Serializable {
 
 
     /**
-     * 销售订单未出库金额 (SUM(销售订单金额-出库金额）+SUM(销售退货-出库金额)合同负债)
+     * 销售订单未出库金额 (SUM(销售订单金额-出库金额）+SUM(销售退货-出库金额)合同资产)
      */
-    @Excel(name = "销售订单未出库金额 (SUM(销售订单金额-出库金额）+SUM(销售退货-出库金额)合同负债)")
-    @ApiModelProperty(value = "销售订单未出库金额 (SUM(销售订单金额-出库金额）+SUM(销售退货-出库金额)合同负债)")
+    @Excel(name = "销售订单未出库金额 (SUM(销售订单金额-出库金额）+SUM(销售退货-出库金额)合同资产)")
+    @ApiModelProperty(value = "销售订单未出库金额 (SUM(销售订单金额-出库金额）+SUM(销售退货-出库金额)合同资产)")
     private BigDecimal contractAssets;
 
 

src/main/java/com/dk/mdm/model/pojo/mac/AccountItem.java

@@ -214,70 +214,6 @@ public class AccountItem extends PageInfo<AccountItem> implements Serializable {
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/pojo/mac/RecPayItem.java

@@ -143,81 +143,6 @@ public class RecPayItem extends PageInfo<RecPayItem> implements Serializable {
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/pojo/mst/MoneyAccount.java

@@ -7,7 +7,6 @@ import java.io.Serializable;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.*;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -15,11 +14,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
-import java.util.List;
-import java.time.LocalDateTime;
 
 /**
  *  资金账户
@@ -129,81 +125,6 @@ public class MoneyAccount extends PageInfo<MoneyAccount> implements Serializable
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/pojo/t_mst/MoneyAccountItem.java → src/main/java/com/dk/mdm/model/pojo/mst/MoneyAccountItem.java

@@ -1,25 +1,23 @@
-package com.dk.mdm.model.pojo.t_mst;
+package com.dk.mdm.model.pojo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.*;
-import java.io.Serializable;
-
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.*;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.alibaba.fastjson.JSONObject;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.List;
 import java.time.LocalDateTime;
 
 /**
@@ -200,17 +198,6 @@ public class MoneyAccountItem extends PageInfo<MoneyAccountItem> implements Seri
     private String opDbUser;
 
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/pojo/pur/Purchase.java

@@ -74,6 +74,16 @@ public class Purchase extends PageInfo<Purchase> implements Serializable {
     private String orgId;
 
 
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    @ApiModelProperty(value = "来源单id")
+    private List<String> fromIds;
+    /**
+     *来源单号
+     */
+
+    @TableField(typeHandler = StringListTypeHandler.class)
+    @ApiModelProperty(value = "来源单号")
+    private List<String> fromNos;
     /**
      * 员工
      */

src/main/java/com/dk/mdm/model/pojo/pur/PurchaseItem.java

@@ -55,6 +55,22 @@ public class PurchaseItem extends PageInfo<PurchaseItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
 
+    /**
+     * 来源单ID (采购订单、出库退货)
+     */
+    @Excel(name = "来源单ID (采购订单、出库退货)")
+    @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String fromId;
+
+
+    /**
+     * 来源单明细ID (采购订单、出库退货)
+     */
+    @Excel(name = "来源单明细ID (采购订单、出库退货)")
+    @ApiModelProperty(value = "来源单明细ID (采购订单、出库退货)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String fromItemId;
 
     /**
      * 商品顺序

src/main/java/com/dk/mdm/model/query/mac/RecPayItemQuery.java

@@ -144,82 +144,6 @@ public class RecPayItemQuery extends PageInfo<RecPayItemQuery> implements Serial
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/query/mac/RecPayQuery.java

@@ -220,81 +220,6 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/query/mst/MoneyAccountQuery.java

@@ -43,7 +43,7 @@ public class MoneyAccountQuery extends PageInfo<MoneyAccountQuery> implements Se
     /**
      * 资金账户ID
      */
-    @TableId(value = "mac_id", type = IdType.AUTO)
+//    @TableId(value = "mac_id", type = IdType.AUTO)
     @ApiModelProperty(value = "资金账户ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String macId;
@@ -129,71 +129,6 @@ public class MoneyAccountQuery extends PageInfo<MoneyAccountQuery> implements Se
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
     /**
      * @desc   : 有效标识List
      * @author : 宋扬
@@ -213,16 +148,6 @@ public class MoneyAccountQuery extends PageInfo<MoneyAccountQuery> implements Se
     @ApiModelProperty(value = "账户类别 (【数据字典】)")
     private List<String> macTypeList;
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/response/mac/RecPayItemResponse.java

@@ -144,85 +144,9 @@ public class RecPayItemResponse extends PageInfo<RecPayItemResponse> implements
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
     @ApiModelProperty(value = "账号名称")
     private String macName;
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
 
     private static final long serialVersionUID = 1L;
-
 }

src/main/java/com/dk/mdm/model/response/mac/RecPayResponse.java

@@ -221,62 +221,6 @@ public class RecPayResponse extends PageInfo<RecPayResponse> implements Serializ
 
 
     /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
      * 数据操作数据库用户 (触发器自动处理)
      */
     @Excel(name = "数据操作数据库用户 (触发器自动处理)")
@@ -307,6 +251,30 @@ public class RecPayResponse extends PageInfo<RecPayResponse> implements Serializ
     @ApiModelProperty(value = "制单员")
     private String makeStaffName;
 
+    @ApiModelProperty(value = "总收款金额 (SUM(收款+退收款)（不包含锁定金额）)")
+    private BigDecimal receipt;
+
+    @ApiModelProperty(value = "总收款锁定金额 (SUM(收款+退收款)（锁定金额）)")
+    private BigDecimal receiptLock;
+
+    @ApiModelProperty(value = "销售订单未出库金额 (SUM(销售订单金额-出库金额）+SUM(销售退货-出库金额)合同资产)")
+    private BigDecimal contractAssets;
+
+    @ApiModelProperty(value = "总应收账款 (SUM(应收账款.应收账款）)")
+    private BigDecimal receivable;
+
+    @ApiModelProperty(value = "总应收收款金额 (SUM(应收账款.还款金额))")
+    private BigDecimal receivableHandle;
+
+    @ApiModelProperty(value = "总应收优惠金额 (SUM(应收账款.优惠金额))")
+    private BigDecimal receivableWaive;
+
+    @ApiModelProperty(value = "总剩余应收 (总应收账款-总应收收款金额-总应收优惠金额)")
+    private BigDecimal receivableResidue;
+
+    @ApiModelProperty(value = "总收款可退金额 (总收款金额-总应收收款金额+总应收优惠金额（现金池）)")
+    private BigDecimal receiptResidue;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -22,6 +22,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -305,6 +306,9 @@ public class CustomerResponse extends PageInfo<CustomerResponse> implements Seri
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDateTime nextFollowTime;
 
+    @ApiModelProperty(value = "总剩余应收 (总应收账款-总应收收款金额-总应收优惠金额)")
+    private BigDecimal receivableResidue;
+
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,16 +1,11 @@
 package com.dk.mdm.model.response.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -21,8 +16,6 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  *  资金账户
@@ -44,7 +37,7 @@ public class MoneyAccountResponse extends PageInfo<MoneyAccountResponse> impleme
     /**
      * 资金账户ID
      */
-    @TableId(value = "mac_id", type = IdType.AUTO)
+//    @TableId(value = "mac_id", type = IdType.AUTO)
     @ApiModelProperty(value = "资金账户ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String macId;
@@ -137,72 +130,6 @@ public class MoneyAccountResponse extends PageInfo<MoneyAccountResponse> impleme
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-
     /**
      * 账户余额
      */
@@ -212,17 +139,6 @@ public class MoneyAccountResponse extends PageInfo<MoneyAccountResponse> impleme
 
 
 
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -51,7 +51,31 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @Excel(name = "采购订单号")
     @ApiModelProperty(value = "采购订单号")
     private String purNo;
+    /**
+     * 来源单ID (采购订单、出库退货)
+     */
+    @Excel(name = "来源单ID (采购订单、出库退货)")
+    @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String fromId;
+    /**
+     * 来源单ID (采购订单、出库退货)
+     */
+    @Excel(name = "来源单明细ID")
+    @ApiModelProperty(value = "来源单明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String fromItemId;
+
+    /**
+     * 销售订单
+     */
+    @Excel(name = "销售订单")
+    @ApiModelProperty(value = "销售订单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orderId;
 
+    @ApiModelProperty(value = "订单单号")
+    private String orderNo;
     /**
      * 商品规格
      */

src/main/java/com/dk/mdm/model/response/sale/OrderResponse.java

@@ -51,7 +51,18 @@ public class OrderResponse extends PageInfo<OrderResponse> implements Serializab
     @ApiModelProperty(value = "销售订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orderId;
-
+    /**
+     * 采购价
+     */
+    @Excel(name = "采购价")
+    @ApiModelProperty(value = "采购价")
+    private BigDecimal pricePurchase;
+    /**
+     * 零售价
+     */
+    @Excel(name = "零售价")
+    @ApiModelProperty(value = "零售价")
+    private BigDecimal priceStandard;
 
     /**
      * 销售订单号

src/main/java/com/dk/mdm/model/vo/mac/RecPayItemVO.java

@@ -145,81 +145,6 @@ public class RecPayItemVO extends PageInfo<RecPayItemVO> implements Serializable
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/vo/mac/RecPayVO.java

@@ -220,86 +220,9 @@ public class RecPayVO extends PageInfo<RecPayVO> implements Serializable {
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
-
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
     @ApiModelProperty(value = "明细")
     private List<RecPayItemVO> itemList;
 
-    @ApiModelProperty(value = "删除明细")
-    private List<RecPayItemVO> deleteItemList;
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/vo/mst/MoneyAccountVO.java

@@ -1,15 +1,11 @@
 package com.dk.mdm.model.vo.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -42,7 +38,7 @@ public class MoneyAccountVO extends PageInfo<MoneyAccountVO> implements Serializ
     /**
      * 资金账户ID
      */
-    @TableId(value = "mac_id", type = IdType.AUTO)
+//    @TableId(value = "mac_id", type = IdType.AUTO)
     @ApiModelProperty(value = "资金账户ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String macId;
@@ -129,81 +125,6 @@ public class MoneyAccountVO extends PageInfo<MoneyAccountVO> implements Serializ
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/vo/pur/PurchaseItemVO.java

@@ -55,6 +55,22 @@ public class PurchaseItemVO extends PageInfo<PurchaseItemVO> implements Serializ
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
 
+    /**
+     * 来源单ID (采购订单、出库退货)
+     */
+    @Excel(name = "来源单ID (采购订单、出库退货)")
+    @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String fromId;
+
+
+    /**
+     * 来源单明细ID (采购订单、出库退货)
+     */
+    @Excel(name = "来源单明细ID (采购订单、出库退货)")
+    @ApiModelProperty(value = "来源单明细ID (采购订单、出库退货)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String fromItemId;
 
     /**
      * 商品顺序

src/main/java/com/dk/mdm/model/vo/pur/PurchaseVO.java

@@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
-import com.dk.common.infrastructure.handler.JsonTypeHandler;
-import com.dk.common.infrastructure.handler.TimestampTypeHandler;
-import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.infrastructure.handler.*;
 import com.dk.common.model.pojo.PageInfo;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -162,6 +160,18 @@ public class PurchaseVO extends PageInfo<PurchaseVO> implements Serializable {
     private String purStatus;
 
 
+    @ApiModelProperty(value = "来源单id")
+    @TableField(typeHandler = UuidListTypeHandler.class)
+    private List<String> fromIds;
+    /**
+     *来源单号
+     */
+
+    @TableField(typeHandler = StringListTypeHandler.class)
+    @ApiModelProperty(value = "来源单号")
+    private List<String> fromNos;
+
+
     /**
      * 入库状态 (【系统字典】)
      */

src/main/java/com/dk/mdm/service/ivt/IntoReturnService.java

@@ -189,14 +189,14 @@ public class IntoReturnService extends BaseService<IntoReturn> {
         inboundVO.setOrgId(intoReturnVO.getOrgId());
         inboundVO.setMakeStaff(authUtils.getStaff().getStaffId());
         inboundVO.setMakeTime(LocalDateTime.now());
-        inboundVO.setIntoingQty(intoReturnVO.getSumQuantity());
-        inboundVO.setIntoingAmt(intoReturnVO.getSumAmount());
+        inboundVO.setIntoingQty(intoReturnVO.getSumQuantity().multiply(new BigDecimal(-1)));
+        inboundVO.setIntoingAmt(intoReturnVO.getSumAmount().multiply(new BigDecimal(-1)));
         List<InboundItemVO> list = new ArrayList<>();
         for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
             System.out.println("'id==='"+intoReturnItemVO.getItemId());
             InboundItemVO inboundItemVO = new InboundItemVO();
-            inboundItemVO.setIntoingQty(intoReturnItemVO.getItemQty());
-            inboundItemVO.setIntoingAmt(intoReturnItemVO.getItemAmt());
+            inboundItemVO.setIntoingQty(intoReturnItemVO.getItemQty().multiply(new BigDecimal(-1)));
+            inboundItemVO.setIntoingAmt(intoReturnItemVO.getItemAmt().multiply(new BigDecimal(-1)));
             inboundItemVO.setPriceInto(intoReturnItemVO.getPriceReturn());
             inboundItemVO.setFromItemId(intoReturnItemVO.getItemId());
             inboundItemVO.setSkuId(intoReturnItemVO.getSkuId());
@@ -291,8 +291,8 @@ public class IntoReturnService extends BaseService<IntoReturn> {
 //
 //
 //            } else {
-                intoReturnItemVO.setOutingQty(intoReturnItemVO.getItemQty());
-                intoReturnItemVO.setOutingAmt(intoReturnItemVO.getItemAmt());
+//                intoReturnItemVO.setOutingQty(intoReturnItemVO.getItemQty());
+//                intoReturnItemVO.setOutingAmt(intoReturnItemVO.getItemAmt());
                 intoReturnItemVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
 //            }
 //            //新建明细

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -243,16 +243,16 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
                     }
                     //多次已入库
                     else{
-                        intoReturnItem.setOutingQty(inboundVO.getIntoQty());
-                        intoReturnItem.setOutingAmt(inboundVO.getIntoQty());
+                        intoReturnItem.setOutingQty(inboundItemVO.getIntoQty());
+                        intoReturnItem.setOutingAmt(inboundItemVO.getIntoQty());
                     }
-                    intoReturnItem.setOutQty(inboundVO.getIntoQty().abs());
-                    intoReturnItem.setOutAmt(inboundVO.getIntoQty().abs());
+                    intoReturnItem.setOutQty(inboundItemVO.getIntoQty().abs());
+                    intoReturnItem.setOutAmt(inboundItemVO.getIntoQty().abs());
                 }
                 //入库中
                 else{
-                    intoReturnItem.setOutingQty(inboundVO.getIntoingQty().abs());
-                    intoReturnItem.setOutingAmt(inboundVO.getIntoingAmt().abs());
+                    intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty().abs());
+                    intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt().abs());
                     intoReturnItem.setOutQty(BigDecimal.ZERO);
                     intoReturnItem.setOutAmt(BigDecimal.ZERO);
                 }

src/main/java/com/dk/mdm/service/mac/AccountService.java

@@ -1,28 +1,90 @@
 package com.dk.mdm.service.mac;
 
+import com.dk.common.exception.BaseBusinessException;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.response.ResponseCodeEnum;
+import com.dk.mdm.mapper.mac.AccountItemMapper;
+import com.dk.mdm.mapper.mst.MoneyAccountItemMapper;
 import com.dk.mdm.model.pojo.mac.Account;
 import com.dk.mdm.mapper.mac.AccountMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.mst.MoneyAccount;
+import com.dk.mdm.service.mst.MoneyAccountService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.util.Map;
+
 @Service
 @Transactional
 public class AccountService extends BaseService<Account> {
 
-	@Override
-	public String getPrimaryKey() {
-		return "object_id";
-	}
+    @Override
+    public String getPrimaryKey() {
+        return "object_id";
+    }
+
+    @Override
+    public BaseMapper<Account> getRepository() {
+        return accountMapper;
+    }
+
+    @Autowired
+    private AccountMapper accountMapper;
+
+    @Autowired
+    private AccountItemMapper accountItemMapper;
+
+    @Autowired
+    private MoneyAccountService moneyAccountService;
+
+    @Autowired
+    private MoneyAccountItemMapper moneyAccountItemMapper;
+
+    /**
+     * @desc : 更新总帐上收款类字段
+     * @author : 付斌
+     * @date : 2024-03-22 11:08
+     */
+    public void updateReceipt(String objectId) {
+        Account accountForUpdate = accountMapper.selectByIdForUpdate(objectId);
+        Map<String, Object> mapSumAmtRec = accountItemMapper.getSumAmtRec(objectId);
+        BigDecimal sumAmtRec = new BigDecimal(mapSumAmtRec.get("sumAmtRec").toString());
+        // 可退金额 = 总收款额-应收应款额+优惠金额
+        BigDecimal sumReceiptResidue = sumAmtRec.subtract(accountForUpdate.getReceivableHandle()).add(accountForUpdate.getReceivableWaive());
+
+        // 如果可退金额小于0 ，则提示余额不足
+        if (sumReceiptResidue.compareTo(BigDecimal.ZERO) == -1) {
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
+        }
+
+        // 更新账款总表上的收款总额和可用金额
+        Account accountUpdate = new Account();
+        accountUpdate.setReceipt(sumAmtRec).setReceiptResidue(sumReceiptResidue).setObjectId(objectId);
+        super.updateByUuid(accountUpdate);
+    }
 
-	@Override
-	public BaseMapper<Account> getRepository() {
-		return accountMapper;
-	}
+    /**
+     * @desc : 更新资金账户余额
+     * @author : 付斌
+     * @date : 2024-03-22 11:08
+     */
+    public void updateMac(String macId) {
+        // 查询当前账户流水合计
+        Map<String, Object> mapSumAmtInflow = moneyAccountItemMapper.getSumAmtInflow(macId);
+        BigDecimal sumAmtInflow = new BigDecimal(mapSumAmtInflow.get("sumAmtInflow").toString());
 
-	@Autowired
-	private AccountMapper accountMapper;
+        // 如果余额小于0 ，则提示余额不足
+        if (sumAmtInflow.compareTo(BigDecimal.ZERO) == -1) {
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.RESIDUE_NO_LESS.getMessage());
+        }
 
+        // 更新账款总表上的收款总额和可用金额
+        MoneyAccount moneyAccountUpdate = new MoneyAccount();
+        moneyAccountUpdate.setBalance(sumAmtInflow).setMacId(macId);
+        moneyAccountService.updateByUuid(moneyAccountUpdate);
+    }
 }

src/main/java/com/dk/mdm/service/mac/RecPayService.java

@@ -1,6 +1,5 @@
 package com.dk.mdm.service.mac;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.dk.common.exception.BaseBusinessException;
 import com.dk.common.infrastructure.annotaiton.Pagination;
 import com.dk.common.infrastructure.constant.Constant;
@@ -14,6 +13,8 @@ import com.dk.mdm.infrastructure.convert.mac.RecPayItemConvert;
 import com.dk.mdm.mapper.mac.AccountItemMapper;
 import com.dk.mdm.mapper.mac.AccountMapper;
 import com.dk.mdm.mapper.mac.RecPayItemMapper;
+import com.dk.mdm.mapper.mst.MoneyAccountItemMapper;
+import com.dk.mdm.mapper.mst.MoneyAccountMapper;
 import com.dk.mdm.model.pojo.mac.Account;
 import com.dk.mdm.model.pojo.mac.AccountItem;
 import com.dk.mdm.model.pojo.mac.RecPay;
@@ -21,6 +22,8 @@ import com.dk.mdm.mapper.mac.RecPayMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.pojo.mac.RecPayItem;
+import com.dk.mdm.model.pojo.mst.MoneyAccount;
+import com.dk.mdm.model.pojo.mst.MoneyAccountItem;
 import com.dk.mdm.model.query.mac.RecPayItemQuery;
 import com.dk.mdm.model.query.mac.RecPayQuery;
 import com.dk.mdm.model.response.mac.RecPayItemResponse;
@@ -28,15 +31,13 @@ import com.dk.mdm.model.response.mac.RecPayResponse;
 import com.dk.mdm.model.vo.mac.RecPayItemVO;
 import com.dk.mdm.model.vo.mac.RecPayVO;
 import com.dk.mdm.service.common.CommonService;
+import com.dk.mdm.service.mst.MoneyAccountService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.stream.Collectors;
+import java.math.BigDecimal;
+import java.util.*;
 
 @Service
 @Transactional
@@ -71,9 +72,18 @@ public class RecPayService extends BaseService<RecPay> {
     private AccountItemService accountItemService;
 
     @Autowired
+    private MoneyAccountMapper moneyAccountMapper;
+
+    @Autowired
     private AccountItemMapper accountItemMapper;
 
     @Autowired
+    private MoneyAccountService moneyAccountService;
+
+    @Autowired
+    private MoneyAccountItemMapper moneyAccountItemMapper;
+
+    @Autowired
     private CommonService commonService;
 
     @Autowired
@@ -138,15 +148,29 @@ public class RecPayService extends BaseService<RecPay> {
                 AccountItem accountItem = new AccountItem();
                 accountItem.setAccItemType(Constant.accItemType.SHOU_KUAN.getName())
                         .setObjectId(recPayVO.getObjectId()).setOrgId(recPayVO.getOrgId()).setStaffId(recPayVO.getStaffId())
-                        .setAccDate(recPayVO.getAccDate()).setRecStatus(Constant.recStatuse.QUE_DING.getName()).setAmtRec(recPayItemVO.getAmtRec())
+                        .setAccDate(recPayVO.getAccDate()).setRecStatus(Constant.recStatuse.QUE_DING.getName()).setAmtRec(recPayItem.getAmtRec())
                         .setBiznisType("t_mac_rec_pay_item").setBiznisId(recPayItem.getItemId()).setBiznisNo(recPayVO.getRpNo())
                         .setMakeStaff(recPayVO.getMakeStaff()).setCpId(recPayVO.getCpId());
                 accountItemMapper.insert(accountItem);
 
-                // 更新收款单上的应收账款
+                // 更新收款单上的账款明细Id
                 RecPayItem recPayItemUpdate = new RecPayItem();
                 recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
                 recPayItemService.updateByUuid(recPayItemUpdate);
+
+                // 插入资金流水
+                MoneyAccountItem moneyAccountItem = new MoneyAccountItem();
+                moneyAccountItem.setMacId(recPayItem.getMacId()).setFlowType(Constant.FlowType.SHOU_FU_KUAN.getName())
+                        .setInvoiceId(recPayItem.getItemId()).setAmtInflow(recPayItem.getAmtRec()).setAccDate(recPayVO.getAccDate())
+                        .setMakeStaff(recPayItem.getMakeStaff()).setCpId(recPayItem.getCpId());
+                moneyAccountItemMapper.insert(moneyAccountItem);
+
+                // 更新资金账户
+                MoneyAccount moneyAccountForUpdate = moneyAccountMapper.selectByIdForUpdate(recPayItem.getMacId());
+                MoneyAccount moneyAccountUpdate = new MoneyAccount();
+                moneyAccountUpdate.setBalance(moneyAccountForUpdate.getBalance().add(recPayItem.getAmtRec()))
+                        .setMacId(moneyAccountForUpdate.getMacId());
+                moneyAccountService.updateByUuid(moneyAccountUpdate);
             }
         }
 
@@ -205,15 +229,35 @@ public class RecPayService extends BaseService<RecPay> {
                 AccountItem accountItem = new AccountItem();
                 accountItem.setAccItemType(Constant.accItemType.SHOU_KUAN.getName())
                         .setObjectId(recPayVO.getObjectId()).setOrgId(recPayVO.getOrgId()).setStaffId(recPayVO.getStaffId())
-                        .setAccDate(recPayVO.getAccDate()).setRecStatus(Constant.recStatuse.QUE_DING.getName()).setAmtRec(recPayItemVO.getAmtRec())
+                        .setAccDate(recPayVO.getAccDate()).setRecStatus(Constant.recStatuse.QUE_DING.getName()).setAmtRec(recPayItem.getAmtRec())
                         .setBiznisType("t_mac_rec_pay_item").setBiznisId(recPayItem.getItemId()).setBiznisNo(recPayVO.getRpNo())
                         .setMakeStaff(recPayVO.getMakeStaff()).setCpId(recPayVO.getCpId());
                 accountItemMapper.insert(accountItem);
 
-                // 更新收款单上的应收账款
+                // 更新收款单上的账款明细Id
                 RecPayItem recPayItemUpdate = new RecPayItem();
                 recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
                 recPayItemService.updateByUuid(recPayItemUpdate);
+
+                // 插入资金流水
+                MoneyAccountItem moneyAccountItem = new MoneyAccountItem();
+                moneyAccountItem.setMacId(recPayItem.getMacId()).setFlowType(Constant.FlowType.SHOU_FU_KUAN.getName())
+                        .setInvoiceId(recPayItem.getItemId()).setAmtInflow(recPayItem.getAmtRec()).setAccDate(recPayVO.getAccDate())
+                        .setMakeStaff(recPayItem.getMakeStaff()).setCpId(recPayItem.getCpId());
+                moneyAccountItemMapper.insert(moneyAccountItem);
+
+                // 更新资金账户
+                MoneyAccount moneyAccountForUpdate = moneyAccountMapper.selectByIdForUpdate(recPayItem.getMacId());
+
+                // 如果转账之后账户余额小于0，则提示资金账户余额不足，不能退款
+                if ((moneyAccountForUpdate.getBalance().add(recPayItem.getAmtRec())).compareTo(BigDecimal.ZERO) == -1) {
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.MAC_BALANCE_NO_LESS.getMessage());
+                }
+
+                MoneyAccount moneyAccountUpdate = new MoneyAccount();
+                moneyAccountUpdate.setBalance(moneyAccountForUpdate.getBalance().add(recPayItem.getAmtRec()))
+                        .setMacId(moneyAccountForUpdate.getMacId());
+                moneyAccountService.updateByUuid(moneyAccountUpdate);
             }
         }
 
@@ -235,31 +279,65 @@ public class RecPayService extends BaseService<RecPay> {
             rollbackFor = {Exception.class}
     )
     public ResponseResultVO<?> update(RecPayVO recPayVO) {
-        RecPay recPay = recPayConvert.convertToPo(recPayVO);
-
-        //删除的
-        List<RecPayItemVO> deleteRecPayItemVOList = recPayVO.getDeleteItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
-        if (deleteRecPayItemVOList.size() > 0) {
-            for (RecPayItemVO recPayItemVO : deleteRecPayItemVOList) {
-                recPayItemMapper.deleteById(recPayItemVO.getItemId());
+        // 将之前的明细全部删除
+        List<RecPayItem> recPayItemOriginalList = recPayItemMapper.selectByZIdForUpdate(recPayVO.getRpId());
+        // 需要重新计算的资金账户
+        List<String> macList = new ArrayList<>();
+        for (RecPayItem recPayItem : recPayItemOriginalList) {
+            // 删除收付款明细
+            recPayItemMapper.deleteById(recPayItem.getItemId());
+            // 删除账款明细
+            accountItemMapper.deleteById(recPayItem.getAccItemId());
+            // 删除账户流水
+            moneyAccountItemMapper.deleteByInvoiceId(recPayItem.getItemId());
+
+            if (!macList.contains(recPayItem.getMacId())) {
+                macList.add(recPayItem.getMacId());
             }
         }
-        // 新增的
-        List<RecPayItemVO> insertRecPayItemVOList = recPayVO.getItemList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
-        for (RecPayItemVO recPayItemVO : insertRecPayItemVOList) {
+
+        // 新增明细
+        for (RecPayItemVO recPayItemVO : recPayVO.getItemList()) {
             RecPayItem recPayItem = recPayItemConvert.convertToPo(recPayItemVO);
-            recPayItem.setRpId(recPay.getRpId()).setCpId(recPay.getCpId());
+            recPayItem.setRpId(recPayVO.getRpId()).setCpId(recPayVO.getCpId());
             recPayItemMapper.insert(recPayItem);
+
+            // 插入账款明细
+            AccountItem accountItem = new AccountItem();
+            accountItem.setAccItemType(Constant.accItemType.SHOU_KUAN.getName())
+                    .setObjectId(recPayVO.getObjectId()).setOrgId(recPayVO.getOrgId()).setStaffId(recPayVO.getStaffId())
+                    .setAccDate(recPayVO.getAccDate()).setRecStatus(Constant.recStatuse.QUE_DING.getName()).setAmtRec(recPayItem.getAmtRec())
+                    .setBiznisType("t_mac_rec_pay_item").setBiznisId(recPayItem.getItemId()).setBiznisNo(recPayVO.getRpNo())
+                    .setMakeStaff(recPayVO.getMakeStaff()).setCpId(recPayVO.getCpId());
+            accountItemMapper.insert(accountItem);
+
+            // 更新收款单上的账款明细Id
+            RecPayItem recPayItemUpdate = new RecPayItem();
+            recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
+            recPayItemService.updateByUuid(recPayItemUpdate);
+
+            // 插入资金流水
+            MoneyAccountItem moneyAccountItem = new MoneyAccountItem();
+            moneyAccountItem.setMacId(recPayItem.getMacId()).setFlowType(Constant.FlowType.SHOU_FU_KUAN.getName())
+                    .setInvoiceId(recPayItem.getItemId()).setAmtInflow(recPayItem.getAmtRec()).setAccDate(recPayVO.getAccDate())
+                    .setMakeStaff(recPayItem.getMakeStaff()).setCpId(recPayItem.getCpId());
+            moneyAccountItemMapper.insert(moneyAccountItem);
+
+            if (!macList.contains(recPayItem.getMacId())) {
+                macList.add(recPayItem.getMacId());
+            }
         }
-        // 编辑的
-        List<RecPayItemVO> editRecPayItemVOList = recPayVO.getItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
-        for (RecPayItemVO recPayItemVO : editRecPayItemVOList) {
-            RecPayItem recPayItem = recPayItemConvert.convertToPo(recPayItemVO);
-            recPayItemService.updateByUuid(recPayItem);
+
+        // 更新总账表的总收款额和可用额
+        accountService.updateReceipt(recPayVO.getObjectId());
+        // 更新账户余额
+        for (String macId : macList) {
+            accountService.updateMac(macId);
         }
-        
-        return ResponseResultUtil.success(super.update(recPay, new UpdateWrapper<RecPay>().lambda().eq(RecPay::getRpId,
-                UUID.fromString(recPay.getRpId()))));
+
+        // 更新收款单总表
+        RecPay recPay = recPayConvert.convertToPo(recPayVO);
+        return ResponseResultUtil.success(super.updateByUuid(recPay));
     }
 
     /**

src/main/java/com/dk/mdm/service/mst/CusFollowService.java

@@ -117,7 +117,7 @@ public class CusFollowService extends BaseService<CusFollow> {
         //跟进人
         cusFollow.setFollowStaff(authUtils.getStaff().getStaffId());
         //跟进部门
-        cusFollow.setFollowOrg(authUtils.getStaff().getOrgId());
+//        cusFollow.setFollowOrg(authUtils.getStaff().getOrgId());
         if (cusFollowVO.getCusId() != null) {
             //查询客户
             Customer customer = customerMapper.selectById(cusFollowVO.getCusId());
@@ -218,7 +218,7 @@ public class CusFollowService extends BaseService<CusFollow> {
             customer.setReportTime(LocalDateTime.now());
             customer.setCpId(authUtils.getStaff().getCpId());
             customer.setStaffId(authUtils.getStaff().getStaffId());
-            customer.setOrgId(authUtils.getStaff().getOrgId());
+            customer.setOrgId(cusFollowVO.getFollowOrg());
             customer.setFollowCount(1);
             customer.setLastFollowId(cusFollow.getFollowId());
             customer.setLastFollowTime(cusFollow.getFollowTime());

src/main/java/com/dk/mdm/service/t_mst/MoneyAccountItemService.java → src/main/java/com/dk/mdm/service/mst/MoneyAccountItemService.java

@@ -1,11 +1,11 @@
-package com.dk.mdm.service.t_mst;
+package com.dk.mdm.service.mst;
 
-import com.dk.mdm.model.pojo.t_mst.MoneyAccountItem;
-import com.dk.mdm.mapper.t_mst.MoneyAccountItemMapper;
-import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
-import org.springframework.stereotype.Service;
+import com.dk.common.service.BaseService;
+import com.dk.mdm.mapper.mst.MoneyAccountItemMapper;
+import com.dk.mdm.model.pojo.mst.MoneyAccountItem;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service

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

@@ -144,10 +144,11 @@ public class PurchaseService extends BaseService<Purchase> {
         purchasevo.setPurId(codeMap.get("outId").toString());
         purchasevo.setPurNo(codeMap.get("outNote").toString());
         Purchase purchase = purChaseConvert.convertToPo(purchasevo);
-        purchaseMapper.insert(purchase);
+        super.insert(purchase);
         //endregion
         //region 设置采购订单明细信息并新建
-        List<PurchaseItemVO> purchaseItemVOList = purchasevo.getPurchaseItemVOList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
+//        List<PurchaseItemVO> purchaseItemVOList = purchasevo.getPurchaseItemVOList().stream().filter(it -> it.getItemId() == null).collect(Collectors.toList());
+        List<PurchaseItemVO> purchaseItemVOList = purchasevo.getPurchaseItemVOList();
         // 商品顺序
         for (PurchaseItemVO purchaseItemVO : purchaseItemVOList) {
             PurchaseItem purchaseItem = purchaseItemConvert.convertToPo(purchaseItemVO);
@@ -155,6 +156,7 @@ public class PurchaseService extends BaseService<Purchase> {
             purchaseItem.setItemIndex(purchaseItemVO.getItemIndex());
             purchaseItem.setIntoStatus(Constant.IntoStatus.DAIRUKU.getName());
             purchaseItem.setCpId(purchase.getCpId());
+            purchaseItem.setItemId(null);
             purchaseItemMapper.insert(purchaseItem);
         }
         //endregion
@@ -227,6 +229,8 @@ public class PurchaseService extends BaseService<Purchase> {
             purchaseItem.setItemIndex(purchaseItemVO.getItemIndex());
             purchaseItem.setIntoStatus(Constant.IntoStatus.DAIRUKU.getName());
             purchaseItem.setCpId(purchase.getCpId());
+            purchaseItem.setFromId(purchaseItemVO.getFromId());
+            purchaseItem.setFromItemId(purchaseItemVO.getFromItemId());
             purchaseItemMapper.insert(purchaseItem);
         }
         // 编辑的