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

# Conflicts:
#	src/main/java/com/dk/mdm/mapper/pur/PurchaseItemMapper.xml
#	src/main/java/com/dk/mdm/mapper/pur/PurchaseMapper.xml

src/main/java/com/dk/mdm/controller/common/CommonController.java

@@ -620,6 +620,34 @@ public class CommonController extends BaseController<Map<String, Object>> {
     public ResponseResultVO<PageList<Map<String, Object>>> getMoneyAccountByPage(@RequestBody Map<String, Object> param) {
         return commonService.getMoneyAccountByPage(param);
     }
+
+    /**
+     * @desc   : 获取多业务部门
+     * @author : 付斌
+     * @date   : 2024-03-20 16:54
+     */
+    @ApiOperation(
+            value = "获取多业务部门",
+            notes = "获取多业务部门"
+    )
+    @PostMapping("get_multi_org")
+    public ResponseResultVO<List<Map<String, Object>>> selectMultiOrg(@RequestBody Map<String, Object> param) {
+        return commonService.selectMultiOrg(param);
+    }
+
+    /**
+     * @desc   : 获取多业务员
+     * @author : 付斌
+     * @date   : 2024-03-20 16:54
+     */
+    @ApiOperation(
+            value = "获取多业务员",
+            notes = "获取多业务员"
+    )
+    @PostMapping("get_multi_staff")
+    public ResponseResultVO<List<Map<String, Object>>> selectMultiStaff(@RequestBody Map<String, Object> param) {
+        return commonService.selectMultiStaff(param);
+    }
 }
 
 

src/main/java/com/dk/mdm/controller/ivt/inbound/InboundPurchaseReturnController.java

@@ -19,7 +19,7 @@ import javax.validation.Valid;
 
 @Api(tags = "采购退货入库单API接口")
 @RestController
-@RequestMapping("/ivt/inbound_sale_return")
+@RequestMapping("/ivt/inbound_purchase_return")
 public class InboundPurchaseReturnController {
 
     public BaseService<Inbound> getService() {

src/main/java/com/dk/mdm/controller/mac/RecPayController.java

@@ -62,10 +62,21 @@ public class RecPayController{
      * @author : 付斌
      * @date : 2023/1/9 10:48
      */
-    @ApiOperation(value = "新建", notes = "新建")
-    @PostMapping({"insert"})
-    public ResponseResultVO<?> insert(@RequestBody RecPayVO recPayVO) {
-        return recPayService.insert(recPayVO);
+    @ApiOperation(value = "新建收款", notes = "新建收款")
+    @PostMapping({"insert_receipt"})
+    public ResponseResultVO<?> insertReceipt(@RequestBody RecPayVO recPayVO) {
+        return recPayService.insertReceipt(recPayVO);
+    }
+
+    /**
+     * @desc : 新建
+     * @author : 付斌
+     * @date : 2023/1/9 10:48
+     */
+    @ApiOperation(value = "新建退款", notes = "新建退款")
+    @PostMapping({"insert_refund"})
+    public ResponseResultVO<?> insertRefund(@RequestBody RecPayVO recPayVO) {
+        return recPayService.insertRefund(recPayVO);
     }
 
     /**

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -217,4 +217,18 @@ public class StaffController {
         return staffService.getInfoAfterLogin(param);
     }
 
+    /**
+     * @desc : 退出登录
+     * @author : 周兴
+     * @date : 2024/3/18 12:47
+     */
+    @ApiOperation(
+            value = "退出登录",
+            notes = "退出登录"
+    )
+    @PostMapping("logout")
+    public ResponseResultVO<Boolean> logout(@RequestBody Map<String, Object> param) {
+        return staffService.logout(param);
+    }
+
 }

src/main/java/com/dk/mdm/controller/sale/MultiOwnerController.java

@@ -0,0 +1,24 @@
+package com.dk.mdm.controller.sale;
+
+import com.dk.mdm.model.pojo.sale.MultiOwner;
+import com.dk.common.controller.BaseController;
+import com.dk.common.service.BaseService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import com.dk.mdm.service.sale.MultiOwnerService;
+
+@Api(tags = "多业务归属API接口")
+@RestController
+@RequestMapping("/multiOwner")
+public class MultiOwnerController{
+
+    public BaseService<MultiOwner> getService() {
+        return multiOwnerService;
+    }
+
+    @Autowired
+    private MultiOwnerService multiOwnerService;
+
+}

src/main/java/com/dk/mdm/mapper/common/CommonMapper.java

@@ -437,4 +437,18 @@ public interface CommonMapper extends BaseMapper<Map<String, Object>> {
      * @date : 2024-03-05 10:52
      */
     Long getMoneyAccountCountByPage(Map param);
+
+    /**
+     * @desc   : 获取多业务部门
+     * @author : 付斌
+     * @date   : 2024-03-20 16:52
+     */
+    List<Map<String, Object>> selectMultiOrg(Map param);
+
+    /**
+     * @desc   : 获取多业务员
+     * @author : 付斌
+     * @date   : 2024-03-20 16:52
+     */
+    List<Map<String, Object>> selectMultiStaff(Map param);
 }

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -1294,4 +1294,68 @@
             AND tmma.mac_name LIKE concat('%',my_ex.likequery(#{macName}),'%')
         </if>
     </select>
+
+    <!-- 查询表core.t_m_organization，查询业务部门多业务归属 -->
+    <select id="selectMultiOrg" resultType="java.util.Map">
+        select t.org_id                                                                    as "orgId",
+               t.org_code                                                                  as "orgCode",
+               t.org_name                                                                  as "orgName",
+               case when mo.allocation_ratio is null then 100 else mo.allocation_ratio end as "allocationRatio",
+               case when mo.multi_id is null then 0 else 1 end                             as "selectFlag",
+               case when mo.owner_type = '归属类型-主部门' then true else false end           as "ownerFlag"
+        from dkic_b.t_mst_org t
+                 left join (SELECT tpmo.owner_id, tpmo.allocation_ratio, tpmo.multi_id, tpmo.owner_type
+                            from dkic_b.t_psi_order tpo
+                                     inner join dkic_b.t_psi_multi_owner tpmo
+                                                on tpo.order_id = tpmo.order_id
+                            where tpmo.flg_valid
+                              and tpmo.owner_type = any (array ['归属类型-主部门' , '归属类型-从部门'])
+                              and tpo.order_id = #{orderId}) mo
+                           on mo.owner_id = t.org_id
+        where t.flg_valid
+
+        <if test="orgCode !=null and orgCode !=''">
+            AND t.org_code LIKE concat('%',my_ex.likequery(#{orgCode}),'%')
+        </if>
+        <if test="orgName !=null and orgName !=''">
+            AND t.org_name LIKE concat('%',my_ex.likequery(#{orgName}),'%')
+        </if>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表core.t_m_user，查询员工多业务归属 -->
+    <select id="selectMultiStaff" resultType="java.util.Map">
+        select t.staff_id                                                                  as "staffId",
+               t.staff_code                                                                as "staffCode",
+               t.staff_name                                                                as "staffName",
+               tmo.org_name                                                                as "orgName",
+               case when mo.allocation_ratio is null then 100 else mo.allocation_ratio end as "allocationRatio",
+               case when mo.multi_id is null then 0 else 1 end                             as "selectFlag",
+               case when mo.owner_type = '归属类型-主员工' then true else false end               as "ownerFlag"
+        from dkic_b.t_mst_staff t
+                 left join dkic_b.t_mst_org as tmo on tmo.org_id = t.org_id
+                 left join (SELECT tpmo.owner_id, tpmo.allocation_ratio, tpmo.multi_id, tpmo.owner_type
+                            from dkic_b.t_psi_order tpo
+                                     inner join dkic_b.t_psi_multi_owner tpmo
+                                                on tpo.order_id = tpmo.order_id
+                            where tpmo.flg_valid
+                              and tpmo.owner_type = any (array ['归属类型-主员工' , '归属类型-从员工'])
+                              and tpo.order_id = #{orderId}) mo
+                           on mo.owner_id = t.staff_id
+        where t.flg_valid
+
+        <if test="staffCode!=null and staffCode!='' ">
+            and t.staff_code LIKE concat('%',my_ex.likequery(#{staffCode}),'%')
+        </if>
+        <if test="staffName!=null and staffName!='' ">
+            and t.staff_name LIKE concat('%',my_ex.likequery(#{staffName}),'%')
+        </if>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+
 </mapper>

src/main/java/com/dk/mdm/mapper/ivt/InboundMapper.xml

@@ -494,11 +494,11 @@
         tmgs.price_purchase AS  list_price_purchase,
         tmgs.sku_images AS  list_sku_images,
 
-        ( tpii.into_qty + tpii.return_qty)  AS list_reject_qty,
-        tpit.usable_qty AS list_usable_qty,
-        tpit.inv_qty AS list_inv_qty,
-        tpit.outing_qty AS list_outing_qty
-        ,
+        ( tpii.into_qty - tpii.return_qty)  AS list_reject_qty,
+--         tpit.usable_qty AS list_usable_qty,
+--         tpit.inv_qty AS list_inv_qty,
+--         tpit.outing_qty AS list_outing_qty
+--         ,
         tmgs.price_standard AS list_price_std
     </sql>
 
@@ -509,9 +509,9 @@
         <include refid="Base_Column_List_Item_Response"/>,
         <include refid="Base_Column_List_Item_Response_Join"/>
         FROM dkic_b.t_psi_inbound  tpi
-        left join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
+        INNER  join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
         left join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
-        left join  dkic_b.t_psi_inventory  tpit on tpit.sku_id = tpii.sku_id
+--         left join  dkic_b.t_psi_inventory  tpit on tpit.sku_id = tpii.sku_id
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -523,6 +523,7 @@
         SELECT
         count(1)
         FROM dkic_b.t_psi_inbound tpi
+        left join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
         <include refid="Condition"/>
     </select>
 

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnItemMapper.xml

@@ -73,8 +73,8 @@
         <result column="item_amt" property="itemAmt"/>
         <result column="non_std_code" property="nonStdCode"/>
         <result column="out_status" property="outStatus"/>
-        <result column="outoing_qty" property="outingQty"/>
-        <result column="outoing_amt" property="outingAmt"/>
+        <result column="outing_qty" property="outingQty"/>
+        <result column="outing_amt" property="outingAmt"/>
         <result column="out_qty" property="outQty"/>
         <result column="out_amt" property="outAmt"/>
         <result column="remarks" property="remarks"/>
@@ -346,17 +346,17 @@
             <if test=" et!=null and et.nonStdCode != null">
                 non_std_code = #{et.nonStdCode,jdbcType=VARCHAR},
             </if>
-            <if test=" et!=null and et.intoStatus != null">
-                into_status = #{et.intoStatus,jdbcType=VARCHAR},
+            <if test=" et!=null and et.outStatus != null">
+                out_status = #{et.outStatus,jdbcType=VARCHAR},
             </if>
-            <if test=" et!=null and et.outoingQty != null">
-                outoing_qty = outoing_qty + #{et.outoingQty,jdbcType=NUMERIC},
+            <if test=" et!=null and et.outingQty != null">
+                outing_qty = outing_qty + #{et.outingQty,jdbcType=NUMERIC},
             </if>
-            <if test=" et!=null and et.outoingAmt != null">
-                outoing_amt = outoing_amt + #{et.outoingAmt,jdbcType=NUMERIC},
+            <if test=" et!=null and et.outingAmt != null">
+                outing_amt = outing_amt + #{et.outingAmt,jdbcType=NUMERIC},
             </if>
             <if test=" et!=null and et.outQty != null">
-                out_qty = out_qty + #{outQty,jdbcType=NUMERIC},
+                out_qty = out_qty + #{et.outQty,jdbcType=NUMERIC},
             </if>
             <if test=" et!=null and et.outAmt != null">
                 out_amt = out_amt + #{et.outAmt,jdbcType=NUMERIC},
@@ -372,7 +372,7 @@
             </if>
         </set>
         where item_id = #{et.itemId,typeHandler=UuidTypeHandler}
-        and  item_qty >= (out_qty + outoing_qty)
+        and  item_qty >= (out_qty + outing_qty)
     </update>
 
 </mapper>

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

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        rp_id, rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, acc_date, remarks, annex_paths, biznis_type, biznis_id, biznis_no, flg_lock, 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
+        rp_id, rp_no, rp_type, object_id, org_id, staff_id, sum_amt_rec, sum_amt_pay, sum_amt_receivable_handle, sum_amt_payable_handle, sum_waive_amt, acc_date, remarks, annex_paths, biznis_type, biznis_id, biznis_no, flg_lock, 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
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -18,7 +18,10 @@
                 <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
                 <result column="sum_amt_rec" property="sumAmtRec"/>
                 <result column="sum_amt_pay" property="sumAmtPay"/>
-            <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
+                <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
+                <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
+                <result column="sum_waive_amt" property="sumWaiveAmt"/>
+                <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
                 <result column="remarks" property="remarks"/>
                 <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
                 <result column="biznis_type" property="biznisType"/>
@@ -26,15 +29,15 @@
                 <result column="biznis_no" property="biznisNo"/>
                 <result column="flg_lock" property="flgLock"/>
                 <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
-            <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+                <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_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_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_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
@@ -48,7 +51,10 @@
                 <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
                 <result column="sum_amt_rec" property="sumAmtRec"/>
                 <result column="sum_amt_pay" property="sumAmtPay"/>
-            <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
+                <result column="sum_amt_receivable_handle" property="sumAmtReceivableHandle"/>
+                <result column="sum_amt_payable_handle" property="sumAmtPayableHandle"/>
+                <result column="sum_waive_amt" property="sumWaiveAmt"/>
+                <result column="acc_date" property="accDate" typeHandler="TimestampTypeHandler"/>
                 <result column="remarks" property="remarks"/>
                 <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
                 <result column="biznis_type" property="biznisType"/>
@@ -56,15 +62,15 @@
                 <result column="biznis_no" property="biznisNo"/>
                 <result column="flg_lock" property="flgLock"/>
                 <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
-            <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+                <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_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_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_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
                 <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
@@ -92,6 +98,15 @@
             <if test="sumAmtPay != null">
                 AND t.sum_amt_pay = #{sumAmtPay}
             </if>
+            <if test="sumAmtReceivableHandle != null">
+                AND t.sum_amt_receivable_handle = #{sumAmtReceivableHandle}
+            </if>
+            <if test="sumAmtPayableHandle != null">
+                AND t.sum_amt_payable_handle = #{sumAmtPayableHandle}
+            </if>
+            <if test="sumWaiveAmt != null">
+                AND t.sum_waive_amt = #{sumWaiveAmt}
+            </if>
             <if test="accDate != null">
                 AND t.acc_date = #{accDate}
             </if>
@@ -169,6 +184,9 @@
                tms.staff_name                                    as "staffName",
                t.sum_amt_rec,
                t.sum_amt_pay,
+               t.sum_amt_receivable_handle,
+               t.sum_amt_payable_handle,
+               t.sum_waive_amt,
                t.acc_date,
                t.remarks,
                t.annex_paths,
@@ -241,6 +259,9 @@
             staff_id,
             sum_amt_rec,
             sum_amt_pay,
+            sum_amt_receivable_handle,
+            sum_amt_payable_handle,
+            sum_waive_amt,
             acc_date,
             remarks,
             annex_paths,
@@ -265,6 +286,9 @@
                 #{item.staffId}::uuid,
                 #{item.sumAmtRec},
                 #{item.sumAmtPay},
+                #{item.sumAmtReceivableHandle},
+                #{item.sumAmtPayableHandle},
+                #{item.sumWaiveAmt},
                 #{item.accDate},
                 #{item.remarks},
                 #{item.annexPaths},

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

@@ -297,6 +297,9 @@
         ,tmgs.sku_name  as "skuName"
         ,tmgb.brand_name  as "brandName"
         ,tmgb.short_name  as "shortName"
+        ,tmgs.sku_spec  as "skuSpec"
+        ,tmgs.price_purchase  as "pricePurchase"
+        ,tmgs.price_standard  as "priceStandard"
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, 'zh_CN') as "intoStatusName"
         FROM dkic_b.t_psi_purchase_item tppi
         left join dkic_b.t_mst_goods_sku tmgs on tppi.sku_id = tmgs.sku_id

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

@@ -173,6 +173,7 @@
         <result column="cp_id" property="cpId"/>
         <result column="sku_code" property="skuCode"/>
         <result column="sku_name" property="skuName"/>
+        <result column="price_standard" property="priceStandard"/>
         <result column="sku_model" property="skuModel"/>
         <result column="short_name" property="shortName"/>
         <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
@@ -455,8 +456,8 @@
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, 'zh_CN') as "intoStatusName"
         ,sys.f_get_name_i18n(tdk2.kind_name_i18n, 'zh_CN') as "purStatusName"
         ,CASE
-        WHEN tpp.pur_status = '订单状态-暂存' THEN tpp.pur_status
-        WHEN tpp.pur_status != '订单状态-暂存' THEN tpp.into_status
+        WHEN tpp.pur_status = '订单状态-暂存' THEN   sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n})
+        WHEN tpp.pur_status != '订单状态-暂存' THEN  sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n})
         END AS "displayedStatus"
         FROM dkic_b.t_psi_purchase tpp
         Left join dkic_b.t_mst_org tmo on tpp.org_id = tmo.org_id
@@ -506,6 +507,7 @@
         tmgb.short_name AS  list_short_name,
         tmgs.sku_model AS  list_sku_model,
         tmgs.price_purchase AS  list_price_purchase,
+        tmgs.price_standard AS  list_price_standard,
         tmgs.sku_images AS  list_sku_images,
         tpit.usable_qty AS list_usable_qty,
         tpit.inv_qty AS list_inv_qty,

src/main/java/com/dk/mdm/mapper/sale/MultiOwnerMapper.java

@@ -0,0 +1,22 @@
+package com.dk.mdm.mapper.sale;
+
+import com.dk.mdm.model.pojo.sale.MultiOwner;
+import com.dk.common.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+*  多业务归属 Mapper
+*/
+@Repository
+public interface MultiOwnerMapper extends BaseMapper<MultiOwner>{
+
+
+    /**
+     * @desc : 删除明细(通过订单Id)
+     * @author : 付斌
+     * @date : 2024-03-03 14:17
+     */
+    int deleteByOrderId(@Param("orderId") String orderId);
+}
+

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

@@ -0,0 +1,157 @@
+<?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.sale.MultiOwnerMapper">
+
+    <!-- 通用设置 -->
+    <!-- 通用查询列 -->
+    <sql id="Base_Column_List">
+        multi_id, order_id, owner_type, owner_id, allocation_ratio, 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
+    </sql>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.sale.MultiOwner">
+        <id column="multi_id" property="multiId"/>
+                <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
+                <result column="owner_type" property="ownerType"/>
+                <result column="owner_id" property="ownerId" typeHandler="UuidTypeHandler"/>
+                <result column="allocation_ratio" property="allocationRatio"/>
+                <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>
+
+    <!-- 通用条件列 -->
+    <sql id="Condition">
+        <where>
+            <if test="orderId != null and orderId != ''">
+                AND order_id = #{orderId}
+            </if>
+            <if test="ownerType != null and ownerType != ''">
+                AND owner_type = #{ownerType}
+            </if>
+            <if test="ownerId != null and ownerId != ''">
+                AND owner_id = #{ownerId}
+            </if>
+            <if test="allocationRatio != null">
+                AND allocation_ratio = #{allocationRatio}
+            </if>
+            <if test="flgValid != null">
+                AND flg_valid = #{flgValid}
+            </if>
+            <if test="cpId != null">
+                AND cp_id = #{cpId}
+            </if>
+            <if test="opCreateTime != null">
+                AND op_create_time = #{opCreateTime}
+            </if>
+            <if test="opCreateUserId != null and opCreateUserId != ''">
+                AND op_create_user_id = #{opCreateUserId}
+            </if>
+            <if test="opUpdateTime != null">
+                AND op_update_time = #{opUpdateTime}
+            </if>
+            <if test="opUpdateUserId != null and opUpdateUserId != ''">
+                AND op_update_user_id = #{opUpdateUserId}
+            </if>
+            <if test="opAppCode != null and opAppCode != ''">
+                AND op_app_code = #{opAppCode}
+            </if>
+            <if test="opTimestamp != null">
+                AND op_timestamp = #{opTimestamp}
+            </if>
+            <if test="opDbUser != null and opDbUser != ''">
+                AND op_db_user = #{opDbUser}
+            </if>
+        </where>
+    </sql>
+
+    <sql id="idsForeach">
+        <!-- 根据主键multiId批量操作 -->
+        WHERE multi_id in
+        <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </sql>
+
+    <!-- 查询表t_psi_multi_owner，（条件查询+分页）列表 -->
+    <select id="selectByCond" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_psi_multi_owner
+        <include refid="Condition"/>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表t_psi_multi_owner，（条件查询）个数 -->
+    <select id="countByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM dkic_b.t_psi_multi_owner
+        <include refid="Condition"/>
+    </select>
+
+    <!-- 根据主键查询表t_psi_multi_owner的一行数据 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_psi_multi_owner
+        WHERE multi_id = #{multiId}::uuid
+    </select>
+
+    <!-- 根据主键锁定表t_psi_multi_owner的一行数据 -->
+    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_psi_multi_owner
+        WHERE multi_id = #{id}::uuid
+        for update
+    </select>
+
+    <!-- 根据主键锁定表t_psi_multi_owner的多行数据 -->
+    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_b.t_psi_multi_owner
+        <include refid="idsForeach"/>
+        for update
+    </select>
+
+    <insert id="insertBatch">
+        insert into dkic_b.t_psi_multi_owner
+        (
+        <trim suffixOverrides=",">
+            order_id,
+            owner_type,
+            owner_id,
+            allocation_ratio,
+            cp_id,
+            op_app_code,
+        </trim>
+        )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (
+            <trim suffixOverrides=",">
+                #{item.orderId}::uuid,
+                #{item.ownerType},
+                #{item.ownerId}::uuid,
+                #{item.allocationRatio},
+                #{item.cpId},
+                #{item.opAppCode},
+            </trim>
+            )
+        </foreach>
+    </insert>
+
+    <delete id="deleteByOrderId">
+        DELETE FROM dkic_b.t_psi_multi_owner WHERE order_id = #{orderId}::uuid
+    </delete>
+</mapper>

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

@@ -119,6 +119,7 @@
         <id column="item_id" property="itemId"/>
         <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
         <result column="item_index" property="itemIndex"/>
+        <result column="order_no" property="orderNo"/>
         <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
         <result column="item_qty" property="itemQty"/>
         <result column="price_std" property="priceStd"/>
@@ -356,6 +357,8 @@
     </select>
     <sql id="Base_Column_List_Item_Response_Join">
         toi.item_id AS toi_item_id,
+        t.order_id AS toi_order_id,
+        t.order_no AS toi_order_no,
     toi.order_id AS toi_order_id,
     toi.item_index AS toi_item_index,
     toi.sku_id AS toi_sku_id,

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

@@ -107,6 +107,21 @@ public class RecPay extends PageInfo<RecPay> implements Serializable {
     private BigDecimal sumAmtPay;
 
 
+    @Excel(name = "合计应收冲抵金额")
+    @ApiModelProperty(value = "合计应收冲抵金额")
+    private BigDecimal sumAmtReceivableHandle;
+
+
+    @Excel(name = "合计应付冲抵金额")
+    @ApiModelProperty(value = "合计应付冲抵金额")
+    private BigDecimal sumAmtPayableHandle;
+
+
+    @Excel(name = "合计核销金额")
+    @ApiModelProperty(value = "合计核销金额")
+    private BigDecimal sumWaiveAmt;
+
+
     /**
      * 收付款日期 (账务日期)
      */

src/main/java/com/dk/mdm/model/pojo/sale/MultiOwner.java

@@ -0,0 +1,178 @@
+package com.dk.mdm.model.pojo.sale;
+
+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.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+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;
+
+/**
+ *  多业务归属
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("多业务归属")
+@TableName(value = "t_psi_multi_owner", autoResultMap = true)
+@ApiModel(value="实体类：多业务归属", description="表名：t_psi_multi_owner")
+public class MultiOwner extends PageInfo<MultiOwner> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 多业务ID
+     */
+//    @TableId(value = "multi_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "多业务ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String multiId;
+
+
+    /**
+     * 订单Id
+     */
+    @Excel(name = "订单Id")
+    @ApiModelProperty(value = "订单Id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orderId;
+
+
+    /**
+     * 归属类型 (【系统字典】)
+     */
+    @Excel(name = "归属类型 (【系统字典】)")
+    @ApiModelProperty(value = "归属类型 (【系统字典】)")
+    private String ownerType;
+
+
+    /**
+     * 归属ID
+     */
+    @Excel(name = "归属ID")
+    @ApiModelProperty(value = "归属ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String ownerId;
+
+
+    /**
+     * 分配比例
+     */
+    @Excel(name = "分配比例")
+    @ApiModelProperty(value = "分配比例")
+    private BigDecimal allocationRatio;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "企业ID")
+    @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

@@ -109,6 +109,21 @@ public class RecPayQuery extends PageInfo<RecPayQuery> implements Serializable {
     private BigDecimal sumAmtPay;
 
 
+    @Excel(name = "合计应收冲抵金额")
+    @ApiModelProperty(value = "合计应收冲抵金额")
+    private BigDecimal sumAmtReceivableHandle;
+
+
+    @Excel(name = "合计应付冲抵金额")
+    @ApiModelProperty(value = "合计应付冲抵金额")
+    private BigDecimal sumAmtPayableHandle;
+
+
+    @Excel(name = "合计核销金额")
+    @ApiModelProperty(value = "合计核销金额")
+    private BigDecimal sumWaiveAmt;
+
+
     /**
      * 收付款日期 (账务日期)
      */

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

@@ -209,6 +209,9 @@ public class RecPayItemResponse extends PageInfo<RecPayItemResponse> implements
     private String opDbUser;
 
 
+    @ApiModelProperty(value = "账号名称")
+    private String macName;
+
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -109,6 +109,21 @@ public class RecPayResponse extends PageInfo<RecPayResponse> implements Serializ
     private BigDecimal sumAmtPay;
 
 
+    @Excel(name = "合计应收冲抵金额")
+    @ApiModelProperty(value = "合计应收冲抵金额")
+    private BigDecimal sumAmtReceivableHandle;
+
+
+    @Excel(name = "合计应付冲抵金额")
+    @ApiModelProperty(value = "合计应付冲抵金额")
+    private BigDecimal sumAmtPayableHandle;
+
+
+    @Excel(name = "合计核销金额")
+    @ApiModelProperty(value = "合计核销金额")
+    private BigDecimal sumWaiveAmt;
+
+
     /**
      * 收付款日期 (账务日期)
      */

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

@@ -45,8 +45,19 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
+    /**
+     * 采购订单号
+     */
+    @Excel(name = "采购订单号")
+    @ApiModelProperty(value = "采购订单号")
+    private String purNo;
 
-
+    /**
+     * 商品规格
+     */
+    @Excel(name = "商品规格")
+    @ApiModelProperty(value = "商品规格")
+    private String skuSpec;
     /**
      * 订单ID
      */
@@ -54,8 +65,18 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
-
-
+    /**
+     * 零售价
+     */
+    @Excel(name = "零售价")
+    @ApiModelProperty(value = "零售价")
+    private BigDecimal priceStandard;
+    /**
+     * 采购价
+     */
+    @Excel(name = "采购价")
+    @ApiModelProperty(value = "采购价")
+    private BigDecimal pricePurchase;
     /**
      * 商品顺序
      */
@@ -293,12 +314,7 @@ public class PurchaseItemResponse extends PageInfo<PurchaseItemResponse> impleme
     @ApiModelProperty(value = "商品型号")
     private String skuModel;
 
-    /**
-     * 采购标价
-     */
-    @Excel(name = "采购标价")
-    @ApiModelProperty(value = "采购标价")
-    private BigDecimal pricePurchase;
+
 
     /**
      * 商品型号

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

@@ -61,7 +61,12 @@ public class PurchaseResponse extends PageInfo<PurchaseResponse> implements Seri
     @ApiModelProperty(value = "采购订单号")
     private String purNo;
 
-
+    /**
+     * 零售价
+     */
+    @Excel(name = "零售价")
+    @ApiModelProperty(value = "零售价")
+    private BigDecimal priceStandard;
     /**
      * 订单类型 (【系统字典】采购订单)
      */

src/main/java/com/dk/mdm/model/vo/ivt/IntoReturnVO.java

@@ -335,7 +335,7 @@ public class IntoReturnVO {
     private List<String> intoReturnIdList;
 
     @ApiModelProperty(value = "自动出库办理标识")
-    private Boolean flgAutoIvt;
+    private Boolean automaticFlg;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -110,6 +110,21 @@ public class RecPayVO extends PageInfo<RecPayVO> implements Serializable {
     private BigDecimal sumAmtPay;
 
 
+    @Excel(name = "合计应收冲抵金额")
+    @ApiModelProperty(value = "合计应收冲抵金额")
+    private BigDecimal sumAmtReceivableHandle;
+
+
+    @Excel(name = "合计应付冲抵金额")
+    @ApiModelProperty(value = "合计应付冲抵金额")
+    private BigDecimal sumAmtPayableHandle;
+
+
+    @Excel(name = "合计核销金额")
+    @ApiModelProperty(value = "合计核销金额")
+    private BigDecimal sumWaiveAmt;
+
+
     /**
      * 收付款日期 (账务日期)
      */

src/main/java/com/dk/mdm/model/vo/sale/OrderVO.java

@@ -25,9 +25,10 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
- *  销售订单
+ * 销售订单
  */
 @Data
 @AllArgsConstructor
@@ -36,7 +37,7 @@ import java.util.List;
 @Accessors(chain = true)
 @ExportTitle("销售订单")
 @TableName(value = "t_psi_order", autoResultMap = true)
-@ApiModel(value="实体类：销售订单", description="表名：t_psi_order")
+@ApiModel(value = "实体类：销售订单", description = "表名：t_psi_order")
 public class OrderVO extends PageInfo<OrderVO> implements Serializable {
 
     /*
@@ -413,6 +414,12 @@ public class OrderVO extends PageInfo<OrderVO> implements Serializable {
     @ApiModelProperty(value = "删除明细")
     private List<OrderItemVO> deleteItemList;
 
+    @ApiModelProperty(value = "部门明细")
+    private List<Map<String, Object>> orgList;
+
+    @ApiModelProperty(value = "员工明细")
+    private List<Map<String, Object>> staffList;
+
     @ApiModelProperty(value = "客户编号")
     private String cusCode;
 

src/main/java/com/dk/mdm/service/common/CommonService.java

@@ -838,4 +838,24 @@ public class CommonService extends BaseService<Map<String, Object>> {
         return super.mergeListWithCount(param, commonMapper.getMoneyAccount(param),
                 commonMapper.getMoneyAccountCountByPage(param));
     }
+
+    /**
+     * @desc   : 获取多业务部门
+     * @author : 付斌
+     * @date   : 2024-03-20 16:54
+     */
+    public ResponseResultVO<List<Map<String, Object>>> selectMultiOrg(Map<String, Object> param) {
+        List<Map<String, Object>> list = commonMapper.selectMultiOrg(param);
+        return ResponseResultUtil.success(list);
+    }
+
+    /**
+     * @desc   : 获取多业务员
+     * @author : 付斌
+     * @date   : 2024-03-20 16:54
+     */
+    public ResponseResultVO<List<Map<String, Object>>> selectMultiStaff(Map<String, Object> param) {
+        List<Map<String, Object>> list = commonMapper.selectMultiStaff(param);
+        return ResponseResultUtil.success(list);
+    }
 }

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

@@ -12,6 +12,7 @@ import com.dk.mdm.infrastructure.convert.ivt.IntoReturnItemConvert;
 import com.dk.mdm.infrastructure.util.AuthUtils;
 import com.dk.mdm.mapper.ivt.InboundItemMapper;
 import com.dk.mdm.mapper.ivt.InboundMapper;
+import com.dk.mdm.mapper.ivt.IntoReturnItemMapper;
 import com.dk.mdm.mapper.pur.PurchaseItemMapper;
 import com.dk.mdm.mapper.pur.PurchaseMapper;
 import com.dk.mdm.model.pojo.ivt.Inbound;
@@ -31,18 +32,18 @@ import com.dk.mdm.model.response.ivt.IntoReturnItemResponse;
 import com.dk.mdm.model.response.ivt.IntoReturnResponse;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.dk.mdm.model.response.pur.PurchaseResponse;
-import com.dk.mdm.model.vo.ivt.IntoReturnItemVO;
-import com.dk.mdm.model.vo.ivt.IntoReturnVO;
-import com.dk.mdm.model.vo.ivt.OutboundItemVO;
-import com.dk.mdm.model.vo.ivt.OutboundVO;
+import com.dk.mdm.model.vo.ivt.*;
 import com.dk.mdm.service.common.CommonService;
 import com.dk.mdm.service.ivt.inbound.InboundItemService;
+import com.dk.mdm.service.ivt.inbound.InboundPurchaseReturnService;
+import com.dk.mdm.service.ivt.inbound.InboundPurchaseService;
 import com.dk.mdm.service.ivt.outbound.OutboundService;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -74,6 +75,11 @@ public class IntoReturnService extends BaseService<IntoReturn> {
     @Autowired
     private IntoReturnItemService intoReturnItemService;
 
+
+    @Autowired
+    private IntoReturnItemMapper intoReturnItemMapper;
+
+
     @Autowired
     private CommonService commonService;
 
@@ -92,6 +98,9 @@ public class IntoReturnService extends BaseService<IntoReturn> {
     @Autowired
     private InboundItemService inboundItemService;
 
+    @Autowired
+    private InboundPurchaseReturnService inboundPurchaseReturnService;
+
     /**
      * @desc : 查询
      * @author : 于继渤
@@ -120,6 +129,8 @@ public class IntoReturnService extends BaseService<IntoReturn> {
         }
         //查询采购订单
         PurchaseResponse purchaseResponse = purchaseMapper.selectById(intoReturnVO.getPurId());
+        intoReturnVO.setSumQuantity(intoReturnVO.getSumQuantity().abs());
+        intoReturnVO.setSumAmount(intoReturnVO.getSumAmount().abs());
         //设置总单
         intoReturnVO = this.insertTotal(intoReturnVO, purchaseResponse);
         //设置明细
@@ -165,43 +176,41 @@ public class IntoReturnService extends BaseService<IntoReturn> {
 
             );
         }
-
-        //新建出库单
-        OutboundVO outboundVO = new OutboundVO();
-        //来源ID
-        outboundVO.setFromId(intoReturnVO.getReturnId());
-        //来源单号
-        outboundVO.setFromNo(intoReturnVO.getReturnNo());
-        //部门
-        outboundVO.setOrgId(intoReturnVO.getOrgId());
-        //员工
-        outboundVO.setStaffId(intoReturnVO.getStaffId());
-        //出库状态 待出库
-        outboundVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
-        //供应商
-        outboundVO.setSupId(intoReturnVO.getSupId());
-        outboundVO.setMakeStaff(authUtils.getStaff().getStaffId());
-        outboundVO.setCpId(authUtils.getStaff().getCpId());
-
-        outboundVO.setFromId(intoReturnVO.getReturnId());
-        List<OutboundItemVO> itemList = new ArrayList<>();
-        Integer itemIndex = 0;
+        //生成逆向  负数的 入库单
+
+
+        InboundVO inboundVO = new InboundVO();
+        //自动标识
+        inboundVO.setAutomaticFlg(intoReturnVO.getAutomaticFlg());
+
+        inboundVO.setFromId(intoReturnVO.getReturnId());
+        inboundVO.setFromNo(intoReturnVO.getReturnNo());
+        inboundVO.setStaffId(intoReturnVO.getStaffId());
+        inboundVO.setOrgId(intoReturnVO.getOrgId());
+        inboundVO.setMakeStaff(authUtils.getStaff().getStaffId());
+        inboundVO.setMakeTime(LocalDateTime.now());
+        inboundVO.setIntoingQty(intoReturnVO.getSumQuantity());
+        inboundVO.setIntoingAmt(intoReturnVO.getSumAmount());
+        List<InboundItemVO> list = new ArrayList<>();
         for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
-            //来源单ID 入库退货
-            OutboundItemVO outboundItemVO = new OutboundItemVO();
-
-            outboundItemVO.setFromId(intoReturnItemVO.getReturnId());
-            outboundItemVO.setFromItemId(intoReturnItemVO.getItemId());
-            outboundItemVO.setSkuId(intoReturnItemVO.getSkuId());
-            outboundItemVO.setItemIndex(itemIndex + 1);
-            outboundItemVO.setPriceOut(intoReturnItemVO.getPriceReturn());
-            outboundItemVO.setInvId(intoReturnItemVO.getInvId());
-            itemList.add(outboundItemVO);
+            System.out.println("'id==='"+intoReturnItemVO.getItemId());
+            InboundItemVO inboundItemVO = new InboundItemVO();
+            inboundItemVO.setIntoingQty(intoReturnItemVO.getItemQty());
+            inboundItemVO.setIntoingAmt(intoReturnItemVO.getItemAmt());
+            inboundItemVO.setPriceInto(intoReturnItemVO.getPriceReturn());
+            inboundItemVO.setFromItemId(intoReturnItemVO.getItemId());
+            inboundItemVO.setSkuId(intoReturnItemVO.getSkuId());
+            inboundItemVO.setItemIndex(intoReturnItemVO.getItemIndex());
+            inboundItemVO.setNonStdCode(intoReturnItemVO.getNonStdCode());
+            inboundItemVO.setReturnQty(intoReturnItemVO.getItemQty());
+            inboundItemVO.setReturnAmt(intoReturnItemVO.getItemAmt());
+            list.add(inboundItemVO);
         }
 
-        outboundVO.setItemList(itemList);
-        //新建出库单
-        outboundService.insertOutBound(outboundVO);
+        inboundVO.setItemList(list);
+
+        inboundPurchaseReturnService.purchaseReturnInboundInsert(inboundVO);
+
 
         return ResponseResultUtil.success();
     }
@@ -211,10 +220,10 @@ public class IntoReturnService extends BaseService<IntoReturn> {
      * @date : 2023/9/28 16:20
      * @author : 于继渤
      */
-    @Transactional(rollbackFor = {Exception.class})
+
     public IntoReturnVO insertTotal(IntoReturnVO intoReturnVO, PurchaseResponse purchaseResponse) {
         // 获取单号
-        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.OUTBOUND.getName(), false);
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.PURCHASEOUT.getName(), false);
         intoReturnVO.setReturnId(codeMap.get("outId").toString()).setReturnNo(codeMap.get("outNote").toString())
                 .setReturnType(Constant.returnType.PURRETURN.getName());
 
@@ -248,13 +257,15 @@ public class IntoReturnService extends BaseService<IntoReturn> {
      * @date : 2023/9/28 16:20
      * @author : 于继渤
      */
-    @Transactional(rollbackFor = {Exception.class})
+
     public List<IntoReturnItemVO> insertDetail(IntoReturnVO intoReturnVO, List<IntoReturnItemVO> intoReturnItemVOList) {
         for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
             //总单Id
             intoReturnItemVO.setReturnId(intoReturnVO.getReturnId());
             //公司Id
             intoReturnItemVO.setCpId(intoReturnVO.getCpId());
+            intoReturnItemVO.setPriceReturn(intoReturnItemVO.getPriceReturn().abs());
+            intoReturnItemVO.setItemQty(intoReturnItemVO.getItemQty().abs());
             //根据分销订单明细Id查询数据
             //查询明细数据
             PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(intoReturnItemVO.getFromItemId());
@@ -262,7 +273,8 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             intoReturnItemVO.setPurId(purchaseItemResponse.getPurId());
             intoReturnItemVO.setPurItemId(purchaseItemResponse.getItemId());
             intoReturnItemVO.setIntoItemId(intoReturnItemVO.getIntoItemId());
-           intoReturnItemVO.setItemId(null);
+            Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.PURCHASEOUT.getName(), false);
+            intoReturnItemVO.setItemId(codeMap.get("outId").toString());
             //标价
             intoReturnItemVO.setPriceStd(purchaseItemResponse.getPriceStd());
             //标价金额 (商品数量*标价)
@@ -272,20 +284,20 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             //退货金额 (商品数量*退货价)
             intoReturnItemVO.setItemAmt(intoReturnItemVO.getItemQty().multiply(intoReturnItemVO.getPriceReturn()).setScale(2, BigDecimal.ROUND_HALF_UP));
             //自动]出库赋值  已入库数量、已入库金额
-            if (intoReturnVO.getFlgAutoIvt() != null && intoReturnVO.getFlgAutoIvt()) {
-                intoReturnItemVO.setOutQty(intoReturnItemVO.getItemQty().abs());
-                intoReturnItemVO.setOutAmt(intoReturnItemVO.getItemAmt().abs());
-                intoReturnItemVO.setOutStatus(Constant.OutStatus.YICHUKU.getName());
-
-
-            } else {
-                intoReturnItemVO.setOutingQty(intoReturnItemVO.getItemQty().abs());
-                intoReturnItemVO.setOutingAmt(intoReturnItemVO.getItemAmt().abs());
+//            if (intoReturnVO.getFlgAutoIvt() != null && intoReturnVO.getFlgAutoIvt()) {
+//                intoReturnItemVO.setOutQty(intoReturnItemVO.getItemQty().abs());
+//                intoReturnItemVO.setOutAmt(intoReturnItemVO.getItemAmt().abs());
+//                intoReturnItemVO.setOutStatus(Constant.OutStatus.YICHUKU.getName());
+//
+//
+//            } else {
+                intoReturnItemVO.setOutingQty(intoReturnItemVO.getItemQty());
+                intoReturnItemVO.setOutingAmt(intoReturnItemVO.getItemAmt());
                 intoReturnItemVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
-            }
-            //新建明细
+//            }
+//            //新建明细
             IntoReturnItem intoReturnItem = intoReturnItemConvert.convertToPo(intoReturnItemVO);
-            intoReturnItemService.insert(intoReturnItem);
+            intoReturnItemMapper.insert(intoReturnItem);
 
         }
         return intoReturnItemVOList;

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

@@ -106,14 +106,78 @@ public class RecPayService extends BaseService<RecPay> {
     }
 
     /**
-     * @desc : 新建方法
+     * @desc : 新建收款
      * @author : 付斌
      * @date : 2023/1/9 10:49
      */
     @Transactional(
             rollbackFor = {Exception.class}
     )
-    public ResponseResultVO<?> insert(RecPayVO recPayVO) {
+    public ResponseResultVO<?> insertReceipt(RecPayVO recPayVO) {
+
+        // 获取单号
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.RECPAY.getName(), false);
+        recPayVO.setRpId(codeMap.get("outId").toString()).setRpNo(codeMap.get("outNote").toString());
+        // 转化实体
+        RecPay recPay = recPayConvert.convertToPo(recPayVO);
+        // 总单保存
+        super.insert(recPay);
+
+        // 明细保存
+        if (recPayVO.getItemList() != null && recPayVO.getItemList().size() > 0) {
+            for (RecPayItemVO recPayItemVO : recPayVO.getItemList()) {
+                RecPayItem recPayItem = recPayItemConvert.convertToPo(recPayItemVO);
+                recPayItem.setRpId(recPay.getRpId()).setCpId(recPay.getCpId()).setMakeStaff(recPay.getMakeStaff()).setAccDate(recPay.getAccDate());
+                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(recPayItemVO.getAmtRec())
+                        .setBiznisType("t_mac_rec_pay_item").setBiznisId(recPayItem.getItemId()).setBiznisNo(recPayVO.getRpNo())
+                        .setMakeStaff(recPayVO.getMakeStaff()).setCpId(recPayVO.getCpId());
+                accountItemMapper.insert(accountItem);
+
+                // 更新收款单上的应收账款
+                RecPayItem recPayItemUpdate = new RecPayItem();
+                recPayItemUpdate.setAccItemId(accountItem.getItemId()).setRpId(recPayVO.getRpId());
+                recPayItemService.updateByUuid(recPayItemUpdate);
+            }
+        }
+
+        // 插入账款总表
+        Account accountForUpdate = accountMapper.selectByIdForUpdate(recPayVO.getObjectId());
+
+        // 没有账款对象，需要新建
+        if (accountForUpdate == null) {
+            accountForUpdate = new Account();
+            accountForUpdate.setObjectId(recPayVO.getObjectId()).setObjectType(Constant.ObjectType.CUS.getName());
+            accountMapper.insert(accountForUpdate);
+            accountForUpdate = accountMapper.selectByIdForUpdate(recPayVO.getObjectId());
+        }
+
+        // 更新账款总表上收款的相关字段
+        Account accountUpdate = new Account();
+        accountUpdate.setReceipt(accountForUpdate.getReceipt().add(recPayVO.getSumAmtRec()))// 总收款金额
+                .setReceiptResidue(accountForUpdate.getReceiptResidue().add(recPayVO.getSumAmtRec()))//  可退金额
+                .setObjectId(accountForUpdate.getObjectId());
+        accountService.updateByUuid(accountUpdate);
+        return ResponseResultUtil.success();
+    }
+
+    /**
+     * @desc : 新建退款
+     * @author : 付斌
+     * @date : 2023/1/9 10:49
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<?> insertRefund(RecPayVO recPayVO) {
+
+        // 查总账，看可退金额是否满足
+
 
         // 获取单号
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.RECPAY.getName(), false);

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

@@ -287,6 +287,7 @@ public class StaffService extends BaseService<Staff> {
         }else{
             return ResponseResultUtil.error(ErrorCodeEnum.STAFF_NOT_EXIST.getCode(), ErrorCodeEnum.STAFF_NOT_EXIST.getMessage());
         }
+
         // 获取菜单
         List menuList = commonMapper.getMenuByUser(param);
         Dictionary<String,Object> dic = new Hashtable<>();
@@ -295,4 +296,17 @@ public class StaffService extends BaseService<Staff> {
         return ResponseResultUtil.success(dic);
     }
 
+    /**
+     * @desc : 退出登录
+     * @author : 周兴
+     * @date : 2024-03-18 09:03
+     */
+    @Transactional(
+            rollbackFor = {Exception.class}
+    )
+    public ResponseResultVO<Boolean> logout(Map<String, Object> param) {
+        // 更新员工登录状态
+        this.updateByUuid(new Staff().setStaffId(param.get("staffId").toString()).setFlgCanLogin(false));
+        return ResponseResultUtil.success(true);
+    }
 }

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

@@ -188,6 +188,9 @@ public class PurchaseService extends BaseService<Purchase> {
         }
         //查询明细
         List<PurchaseItemResponse> purchaseItemResponses = purchaseItemMapper.selectByCond(new PurchaseItemQuery().setPurId(purId));
+        for (PurchaseItemResponse item : purchaseItemResponses) {
+            item.setPurNo(purchaseResponse.getPurNo());
+        }
         purchaseResponse.setPurchaseItemResponseList(purchaseItemResponses);
         return ResponseResultUtil.success(purchaseResponse);
     }

src/main/java/com/dk/mdm/service/sale/MultiOwnerService.java

@@ -0,0 +1,28 @@
+package com.dk.mdm.service.sale;
+
+import com.dk.mdm.model.pojo.sale.MultiOwner;
+import com.dk.mdm.mapper.sale.MultiOwnerMapper;
+import com.dk.common.service.BaseService;
+import com.dk.common.mapper.BaseMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class MultiOwnerService extends BaseService<MultiOwner> {
+
+	@Override
+	public String getPrimaryKey() {
+		return "multi_id";
+	}
+
+	@Override
+	public BaseMapper<MultiOwner> getRepository() {
+		return multiOwnerMapper;
+	}
+
+	@Autowired
+	private MultiOwnerMapper multiOwnerMapper;
+
+}

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -12,9 +12,11 @@ import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.infrastructure.convert.sale.OrderConvert;
 import com.dk.mdm.infrastructure.convert.sale.OrderItemConvert;
 import com.dk.mdm.mapper.mst.CustomerMapper;
+import com.dk.mdm.mapper.sale.MultiOwnerMapper;
 import com.dk.mdm.mapper.sale.OrderItemMapper;
 import com.dk.mdm.mapper.sale.OrderMapper;
 import com.dk.mdm.model.pojo.mst.Customer;
+import com.dk.mdm.model.pojo.sale.MultiOwner;
 import com.dk.mdm.model.pojo.sale.Order;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
@@ -64,6 +66,9 @@ public class OrderService extends BaseService<Order> {
     private CustomerMapper customerMapper;
 
     @Autowired
+    MultiOwnerMapper multiOwnerMapper;
+
+    @Autowired
     private OrderConvert orderConvert;
 
     @Autowired
@@ -79,6 +84,7 @@ public class OrderService extends BaseService<Order> {
         return super.mergeListWithCount(orderQuery, orderMapper.selectByCond(orderQuery),
                 orderMapper.countByCond(orderQuery));
     }
+
     /**
      * @desc : 以销定采 查询
      * @author : 王英杰
@@ -89,6 +95,7 @@ public class OrderService extends BaseService<Order> {
         return super.mergeListWithCount(orderQuery, orderMapper.purSaleSelectByCond(orderQuery),
                 orderMapper.countByCond(orderQuery));
     }
+
     /**
      * @desc : 查询订单明细（货物、收款、附件）
      * @author : 付斌
@@ -146,6 +153,36 @@ public class OrderService extends BaseService<Order> {
         // 订单总单保存
         super.insert(order);
 
+        // 业务部门业绩保存
+        if (orderVO.getOrgList() != null && orderVO.getOrgList().size() > 0) {
+            for (Map<String, Object> map : orderVO.getOrgList()) {
+                MultiOwner multiOwner = new MultiOwner();
+                multiOwner.setOrderId(order.getOrderId()).setOwnerId(map.get("orgId").toString())
+                        .setAllocationRatio(new BigDecimal(map.get("allocationRatio").toString())).setCpId(order.getCpId());
+                if (Boolean.parseBoolean(map.get("ownerFlag").toString())) {
+                    multiOwner.setOwnerType(Constant.OwnerType.Z_ORG.getName());
+                } else {
+                    multiOwner.setOwnerType(Constant.OwnerType.C_ORG.getName());
+                }
+                multiOwnerMapper.insert(multiOwner);
+            }
+        }
+
+        // 业务员业绩保存
+        if (orderVO.getStaffList() != null && orderVO.getStaffList().size() > 0) {
+            for (Map<String, Object> map : orderVO.getStaffList()) {
+                MultiOwner multiOwner = new MultiOwner();
+                multiOwner.setOrderId(order.getOrderId()).setOwnerId(map.get("staffId").toString())
+                        .setAllocationRatio(new BigDecimal(map.get("allocationRatio").toString())).setCpId(order.getCpId());
+                if (Boolean.parseBoolean(map.get("ownerFlag").toString())) {
+                    multiOwner.setOwnerType(Constant.OwnerType.Z_STAFF.getName());
+                } else {
+                    multiOwner.setOwnerType(Constant.OwnerType.C_STAFF.getName());
+                }
+                multiOwnerMapper.insert(multiOwner);
+            }
+        }
+
         // 订单明细保存
         if (orderVO.getItemList() != null && orderVO.getItemList().size() > 0) {
             for (OrderItemVO orderItemVO : orderVO.getItemList()) {
@@ -202,6 +239,40 @@ public class OrderService extends BaseService<Order> {
             orderItemService.updateByUuid(orderItem);
         }
 
+        // 删除业绩信息
+        multiOwnerMapper.deleteByOrderId(order.getOrderId());
+
+        // 重新保存业绩信息
+        // 业务部门业绩保存
+        if (orderVO.getOrgList() != null && orderVO.getOrgList().size() > 0) {
+            for (Map<String, Object> map : orderVO.getOrgList()) {
+                MultiOwner multiOwner = new MultiOwner();
+                multiOwner.setOrderId(order.getOrderId()).setOwnerId(map.get("orgId").toString())
+                        .setAllocationRatio(new BigDecimal(map.get("allocationRatio").toString())).setCpId(order.getCpId());
+                if (Boolean.parseBoolean(map.get("ownerFlag").toString())) {
+                    multiOwner.setOwnerType(Constant.OwnerType.Z_ORG.getName());
+                } else {
+                    multiOwner.setOwnerType(Constant.OwnerType.C_ORG.getName());
+                }
+                multiOwnerMapper.insert(multiOwner);
+            }
+        }
+
+        // 业务员业绩保存
+        if (orderVO.getStaffList() != null && orderVO.getStaffList().size() > 0) {
+            for (Map<String, Object> map : orderVO.getStaffList()) {
+                MultiOwner multiOwner = new MultiOwner();
+                multiOwner.setOrderId(order.getOrderId()).setOwnerId(map.get("staffId").toString())
+                        .setAllocationRatio(new BigDecimal(map.get("allocationRatio").toString())).setCpId(order.getCpId());
+                if (Boolean.parseBoolean(map.get("ownerFlag").toString())) {
+                    multiOwner.setOwnerType(Constant.OwnerType.Z_STAFF.getName());
+                } else {
+                    multiOwner.setOwnerType(Constant.OwnerType.C_STAFF.getName());
+                }
+                multiOwnerMapper.insert(multiOwner);
+            }
+        }
+
         return ResponseResultUtil.success(super.update(order, new UpdateWrapper<Order>().lambda().eq(Order::getOrderId,
                 UUID.fromString(order.getOrderId()))));
     }
@@ -214,7 +285,7 @@ public class OrderService extends BaseService<Order> {
     public ResponseResultVO<?> invalid(String id) {
         Order orderForUpdate = orderMapper.selectByIdForUpdate(id);
         // 并发校验
-        if(!orderForUpdate.getFlgValid()){
+        if (!orderForUpdate.getFlgValid()) {
             throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISFLGVALID_FALSE.getMessage());
         }