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

src/main/java/com/dk/mdm/controller/ivt/InboundController.java

@@ -11,7 +11,7 @@ import com.dk.mdm.service.ivt.InboundService;
 
 @Api(tags = "入库单API接口")
 @RestController
-@RequestMapping("/inbound")
+@RequestMapping("/ivt/inbound")
 public class InboundController{
 
     public BaseService<Inbound> getService() {

src/main/java/com/dk/mdm/controller/ivt/InboundItemController.java

@@ -11,7 +11,7 @@ import com.dk.mdm.service.ivt.InboundItemService;
 
 @Api(tags = "入库明细API接口")
 @RestController
-@RequestMapping("/inboundItem")
+@RequestMapping("/ivt/inboundItem")
 public class InboundItemController{
 
     public BaseService<InboundItem> getService() {

src/main/java/com/dk/mdm/controller/ivt/IntoReturnController.java

@@ -0,0 +1,24 @@
+package com.dk.mdm.controller.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturn;
+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.ivt.IntoReturnService;
+
+@Api(tags = "入库退货API接口")
+@RestController
+@RequestMapping("/ivt/intoReturn")
+public class IntoReturnController{
+
+    public BaseService<IntoReturn> getService() {
+        return intoReturnService;
+    }
+
+    @Autowired
+    private IntoReturnService intoReturnService;
+
+}

src/main/java/com/dk/mdm/controller/ivt/IntoReturnItemController.java

@@ -0,0 +1,24 @@
+package com.dk.mdm.controller.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
+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.ivt.IntoReturnItemService;
+
+@Api(tags = "入库退货明细API接口")
+@RestController
+@RequestMapping("/ivt/intoReturnItem")
+public class IntoReturnItemController{
+
+    public BaseService<IntoReturnItem> getService() {
+        return intoReturnItemService;
+    }
+
+    @Autowired
+    private IntoReturnItemService intoReturnItemService;
+
+}

src/main/java/com/dk/mdm/controller/ivt/OutboundController.java

@@ -1,17 +1,18 @@
 package com.dk.mdm.controller.ivt;
 
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Outbound;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.dk.mdm.model.vo.ivt.OutboundVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import com.dk.mdm.service.ivt.OutboundService;
 
 @Api(tags = "出库单API接口")
 @RestController
-@RequestMapping("/outbound")
+@RequestMapping("/ivt/outbound")
 public class OutboundController{
 
     public BaseService<Outbound> getService() {
@@ -21,4 +22,36 @@ public class OutboundController{
     @Autowired
     private OutboundService outboundService;
 
+    /**
+     * @desc : 新建出库单
+     * @author : 付斌
+     * @date : 2023/1/9 10:48
+     */
+    @ApiOperation(value = "新建出库单", notes = "新建出库单")
+    @PostMapping({"insert"})
+    public ResponseResultVO<?> insert(@RequestBody OutboundVO outboundVO) {
+        return outboundService.insert(outboundVO);
+    }
+
+    /**
+     * @desc   : 获取出库单信息（编辑用）
+     * @author : 付斌
+     * @date   : 2024-03-03 9:28
+     */
+    @ApiOperation(value = "编辑出库单", notes = "编辑出库单")
+    @PostMapping({"get_outbound_for_update/{id}"})
+    public ResponseResultVO<?> getOutboundForUpdate(@PathVariable String id) {
+        return outboundService.getOutboundForUpdate(id);
+    }
+
+    /**
+     * @desc : 编辑出库单
+     * @author : 付斌
+     * @date : 2023/1/9 10:49
+     */
+    @ApiOperation(value = "编辑出库单", notes = "编辑出库单")
+    @PostMapping({"update"})
+    public ResponseResultVO<Boolean> update(@RequestBody OutboundVO outboundVO) {
+        return outboundService.update(outboundVO);
+    }
 }

src/main/java/com/dk/mdm/controller/ivt/OutboundItemController.java

@@ -11,7 +11,7 @@ import com.dk.mdm.service.ivt.OutboundItemService;
 
 @Api(tags = "出库明细API接口")
 @RestController
-@RequestMapping("/outboundItem")
+@RequestMapping("/ivt/outboundItem")
 public class OutboundItemController{
 
     public BaseService<OutboundItem> getService() {

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

@@ -57,6 +57,16 @@ public class GoodsSkuController{
     public ResponseResultVO selectById(@PathVariable String id) {
         return goodsSkuService.selectById(id);
     }
+    /**
+     * @desc : 停用
+     * @author : 王英杰
+     * @date : 2023/1/9 10:34
+     */
+    @ApiOperation(value = "停用", notes = "停用")
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return this.getService().disable(id);
+    }
 
 
     /**

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

@@ -1,7 +1,6 @@
 package com.dk.mdm.controller.sale;
 
 import com.dk.mdm.model.pojo.sale.OutReturn;
-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;
@@ -11,7 +10,7 @@ import com.dk.mdm.service.sale.OutReturnService;
 
 @Api(tags = "出库退货API接口")
 @RestController
-@RequestMapping("/outReturn")
+@RequestMapping("/sale/outReturn")
 public class OutReturnController{
 
     public BaseService<OutReturn> getService() {

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

@@ -1,7 +1,6 @@
 package com.dk.mdm.controller.sale;
 
 import com.dk.mdm.model.pojo.sale.OutReturnItem;
-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;
@@ -11,7 +10,7 @@ import com.dk.mdm.service.sale.OutReturnItemService;
 
 @Api(tags = "出库退货明细API接口")
 @RestController
-@RequestMapping("/outReturnItem")
+@RequestMapping("/sale/outReturnItem")
 public class OutReturnItemController{
 
     public BaseService<OutReturnItem> getService() {

src/main/java/com/dk/mdm/infrastructure/convert/ivt/IntoReturnConvert.java

@@ -0,0 +1,11 @@
+package com.dk.mdm.infrastructure.convert.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturn;
+import com.dk.mdm.model.vo.ivt.IntoReturnVO;
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface IntoReturnConvert {
+
+    IntoReturn convertToPo(IntoReturnVO intoReturnVO);
+}

src/main/java/com/dk/mdm/infrastructure/convert/ivt/IntoReturnItemConvert.java

@@ -0,0 +1,12 @@
+package com.dk.mdm.infrastructure.convert.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
+import com.dk.mdm.model.vo.ivt.IntoReturnItemVO;
+
+import org.mapstruct.Mapper;
+
+@Mapper(componentModel = "spring")
+public interface IntoReturnItemConvert {
+
+    IntoReturnItem convertToPo(IntoReturnItemVO intoReturnVO);
+}

src/main/java/com/dk/mdm/infrastructure/convert/ivt/OutboundConvert.java

@@ -0,0 +1,21 @@
+package com.dk.mdm.infrastructure.convert.ivt;
+
+import com.dk.mdm.model.pojo.ivt.Outbound;
+import com.dk.mdm.model.vo.ivt.OutboundVO;
+import org.mapstruct.Mapper;
+
+/**
+ * @desc   : Outbound转换类
+ * @author : 付斌
+ * @date   : 2024-02-28 10:18
+ */
+@Mapper(componentModel = "spring")
+public interface OutboundConvert {
+
+    /**
+     * @desc   : 转换vo为pojo
+     * @author : 付斌
+     * @date   : 2024-02-28 15:26
+     */
+    Outbound convertToPo(OutboundVO outboundVO);
+}

src/main/java/com/dk/mdm/infrastructure/convert/ivt/OutboundItemConvert.java

@@ -0,0 +1,21 @@
+package com.dk.mdm.infrastructure.convert.ivt;
+
+import com.dk.mdm.model.pojo.ivt.OutboundItem;
+import com.dk.mdm.model.vo.ivt.OutboundItemVO;
+import org.mapstruct.Mapper;
+
+/**
+ * @desc   : OutboundItem转换类
+ * @author : 付斌
+ * @date   : 2024-02-28 10:18
+ */
+@Mapper(componentModel = "spring")
+public interface OutboundItemConvert {
+
+    /**
+     * @desc   : 转换vo为pojo
+     * @author : 付斌
+     * @date   : 2024-02-28 15:25
+     */
+    OutboundItem convertToPo(OutboundItemVO outboundVO);
+}

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

@@ -3175,7 +3175,7 @@
 
     <!-- 查询库存 -->
     <select id="getInventory" resultType="java.util.Map">
-        select tmgs.sku_id            as "skuId",
+        select tpi.sku_id            as "skuId",
                tmgs.sku_code          as "skuCode",
                tmgs.sku_name          as "skuName",
                tmgs.sku_model         as "skuModel",
@@ -3211,6 +3211,12 @@
                  left join dkic_b.t_mst_unit as tmgu on tmgs.unit_id = tmgu.unit_id
         where tpi.flg_valid
           AND tpi.cp_id = #{cpId}
+        <if test="skuId != null">
+            AND tpi.sku_id = #{skuId} ::uuid
+        </if>
+        <if test="nonStdCode != null">
+            AND tpi.non_std_code = #{nonStdCode}
+        </if>
         <if test="skuCode != null">
             AND tmgs.sku_code = #{skuCode}
         </if>
@@ -3231,6 +3237,12 @@
                 inner join dkic_b.t_mst_goods_sku as tmgs on tmgs.sku_id = tpi.sku_id
         where tpi.flg_valid
           AND tpi.cp_id = #{cpId}
+        <if test="skuId != null">
+            AND tpi.sku_id = #{skuId} ::uuid
+        </if>
+        <if test="nonStdCode != null">
+            AND tpi.non_std_code = #{nonStdCode}
+        </if>
         <if test="skuCode != null">
             AND tmgs.sku_code = #{skuCode}
         </if>

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

@@ -0,0 +1,14 @@
+package com.dk.mdm.mapper.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
+import com.dk.common.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+*  入库退货明细 Mapper
+*/
+@Repository
+public interface IntoReturnItemMapper extends BaseMapper<IntoReturnItem>{
+	
+}
+

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

@@ -0,0 +1,243 @@
+<?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.ivt.IntoReturnItemMapper">
+
+    <!-- 通用设置 -->
+    <!-- 通用查询列 -->
+    <sql id="Base_Column_List">
+        item_id, return_id, into_id, into_item_id, pur_id, pur_item_id, item_index, sku_id, item_qty, price_std, amt_std, price_return, item_amt, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, 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
+    </sql>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.ivt.IntoReturnItem">
+        <id column="item_id" property="itemId"/>
+                <result column="return_id" property="returnId" typeHandler="UuidTypeHandler"/>
+                <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
+                <result column="into_item_id" property="intoItemId" typeHandler="UuidTypeHandler"/>
+                <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
+                <result column="pur_item_id" property="purItemId" typeHandler="UuidTypeHandler"/>
+                <result column="item_index" property="itemIndex"/>
+                <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+                <result column="item_qty" property="itemQty"/>
+                <result column="price_std" property="priceStd"/>
+                <result column="amt_std" property="amtStd"/>
+                <result column="price_return" property="priceReturn"/>
+                <result column="item_amt" property="itemAmt"/>
+                <result column="non_std_code" property="nonStdCode"/>
+                <result column="into_status" property="intoStatus"/>
+                <result column="intoing_qty" property="intoingQty"/>
+                <result column="intoing_amt" property="intoingAmt"/>
+                <result column="into_qty" property="intoQty"/>
+                <result column="into_amt" property="intoAmt"/>
+                <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>
+
+    <!-- 通用条件列 -->
+    <sql id="Condition">
+        <where>
+            <if test="returnId != null and returnId != ''">
+                AND return_id = #{returnId}
+            </if>
+            <if test="intoId != null and intoId != ''">
+                AND into_id = #{intoId}
+            </if>
+            <if test="intoItemId != null and intoItemId != ''">
+                AND into_item_id = #{intoItemId}
+            </if>
+            <if test="purId != null and purId != ''">
+                AND pur_id = #{purId}
+            </if>
+            <if test="purItemId != null and purItemId != ''">
+                AND pur_item_id = #{purItemId}
+            </if>
+            <if test="itemIndex != null">
+                AND item_index = #{itemIndex}
+            </if>
+            <if test="skuId != null and skuId != ''">
+                AND sku_id = #{skuId}
+            </if>
+            <if test="itemQty != null">
+                AND item_qty = #{itemQty}
+            </if>
+            <if test="priceStd != null">
+                AND price_std = #{priceStd}
+            </if>
+            <if test="amtStd != null">
+                AND amt_std = #{amtStd}
+            </if>
+            <if test="priceReturn != null">
+                AND price_return = #{priceReturn}
+            </if>
+            <if test="itemAmt != null">
+                AND item_amt = #{itemAmt}
+            </if>
+            <if test="nonStdCode != null and nonStdCode != ''">
+                AND non_std_code = #{nonStdCode}
+            </if>
+            <if test="intoStatus != null and intoStatus != ''">
+                AND into_status = #{intoStatus}
+            </if>
+            <if test="intoingQty != null">
+                AND intoing_qty = #{intoingQty}
+            </if>
+            <if test="intoingAmt != null">
+                AND intoing_amt = #{intoingAmt}
+            </if>
+            <if test="intoQty != null">
+                AND into_qty = #{intoQty}
+            </if>
+            <if test="intoAmt != null">
+                AND into_amt = #{intoAmt}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                AND remarks = #{remarks}
+            </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">
+        <!-- 根据主键itemId批量操作 -->
+        WHERE item_id in
+        <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </sql>
+
+    <!-- 查询表t_psi_into_return_item，（条件查询+分页）列表 -->
+    <select id="selectByCond" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return_item
+        <include refid="Condition"/>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表t_psi_into_return_item，（条件查询）个数 -->
+    <select id="countByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM t_psi_into_return_item
+        <include refid="Condition"/>
+    </select>
+
+    <!-- 根据主键查询表t_psi_into_return_item的一行数据 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return_item
+        WHERE item_id = #{itemId}::uuid
+    </select>
+
+    <!-- 根据主键锁定表t_psi_into_return_item的一行数据 -->
+    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return_item
+        WHERE item_id = #{itemId}
+        for update
+    </select>
+
+    <!-- 根据主键锁定表t_psi_into_return_item的多行数据 -->
+    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return_item
+        <include refid="idsForeach"/>
+        for update
+    </select>
+
+    <insert id="insertBatch">
+        insert into t_psi_into_return_item
+        (
+        <trim suffixOverrides=",">
+            return_id,
+            into_id,
+            into_item_id,
+            pur_id,
+            pur_item_id,
+            item_index,
+            sku_id,
+            item_qty,
+            price_std,
+            amt_std,
+            price_return,
+            item_amt,
+            non_std_code,
+            into_status,
+            intoing_qty,
+            intoing_amt,
+            into_qty,
+            into_amt,
+            remarks,
+            cp_id,
+            op_app_code,
+        </trim>
+        )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (
+            <trim suffixOverrides=",">
+                #{item.returnId}::uuid,
+                #{item.intoId}::uuid,
+                #{item.intoItemId}::uuid,
+                #{item.purId}::uuid,
+                #{item.purItemId}::uuid,
+                #{item.itemIndex},
+                #{item.skuId}::uuid,
+                #{item.itemQty},
+                #{item.priceStd},
+                #{item.amtStd},
+                #{item.priceReturn},
+                #{item.itemAmt},
+                #{item.nonStdCode},
+                #{item.intoStatus},
+                #{item.intoingQty},
+                #{item.intoingAmt},
+                #{item.intoQty},
+                #{item.intoAmt},
+                #{item.remarks},
+                #{item.cpId},
+                #{item.opAppCode},
+            </trim>
+            )
+        </foreach>
+    </insert>
+</mapper>

src/main/java/com/dk/mdm/mapper/ivt/IntoReturnMapper.java

@@ -0,0 +1,14 @@
+package com.dk.mdm.mapper.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturn;
+import com.dk.common.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+*  入库退货 Mapper
+*/
+@Repository
+public interface IntoReturnMapper extends BaseMapper<IntoReturn>{
+	
+}
+

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

@@ -0,0 +1,303 @@
+<?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.ivt.IntoReturnMapper">
+
+    <!-- 通用设置 -->
+    <!-- 通用查询列 -->
+    <sql id="Base_Column_List">
+        return_id, return_no, return_type, into_id, pur_id, into_no, pur_no, org_id, staff_id, sup_id, contact_name, contact_phone, delivery_date, sum_quantity, sum_standard, sum_amount, sale_discount, return_status, out_status, outing_qty, outing_amt, out_qty, out_amt, amt_payable, amt_handle, amt_residue, remarks, annex_paths, 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>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.ivt.IntoReturn">
+        <id column="return_id" property="returnId"/>
+                <result column="return_no" property="returnNo"/>
+                <result column="return_type" property="returnType"/>
+                <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
+                <result column="pur_id" property="purId" typeHandler="UuidTypeHandler"/>
+                <result column="into_no" property="intoNo"/>
+                <result column="pur_no" property="purNo"/>
+                <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+                <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+                <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
+                <result column="contact_name" property="contactName"/>
+                <result column="contact_phone" property="contactPhone"/>
+            <result column="delivery_date" property="deliveryDate" typeHandler="TimestampTypeHandler"/>
+                <result column="sum_quantity" property="sumQuantity"/>
+                <result column="sum_standard" property="sumStandard"/>
+                <result column="sum_amount" property="sumAmount"/>
+                <result column="sale_discount" property="saleDiscount"/>
+                <result column="return_status" property="returnStatus"/>
+                <result column="out_status" property="outStatus"/>
+                <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="amt_payable" property="amtPayable"/>
+                <result column="amt_handle" property="amtHandle"/>
+                <result column="amt_residue" property="amtResidue"/>
+                <result column="remarks" property="remarks"/>
+                <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
+                <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
+            <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>
+
+    <!-- 通用条件列 -->
+    <sql id="Condition">
+        <where>
+            <if test="returnNo != null and returnNo != ''">
+                AND return_no = #{returnNo}
+            </if>
+            <if test="returnType != null and returnType != ''">
+                AND return_type = #{returnType}
+            </if>
+            <if test="intoId != null and intoId != ''">
+                AND into_id = #{intoId}
+            </if>
+            <if test="purId != null and purId != ''">
+                AND pur_id = #{purId}
+            </if>
+            <if test="intoNo != null and intoNo != ''">
+                AND into_no = #{intoNo}
+            </if>
+            <if test="purNo != null and purNo != ''">
+                AND pur_no = #{purNo}
+            </if>
+            <if test="orgId != null and orgId != ''">
+                AND org_id = #{orgId}
+            </if>
+            <if test="staffId != null and staffId != ''">
+                AND staff_id = #{staffId}
+            </if>
+            <if test="supId != null and supId != ''">
+                AND sup_id = #{supId}
+            </if>
+            <if test="contactName != null and contactName != ''">
+                AND contact_name = #{contactName}
+            </if>
+            <if test="contactPhone != null and contactPhone != ''">
+                AND contact_phone = #{contactPhone}
+            </if>
+            <if test="deliveryDate != null">
+                AND delivery_date = #{deliveryDate}
+            </if>
+            <if test="sumQuantity != null">
+                AND sum_quantity = #{sumQuantity}
+            </if>
+            <if test="sumStandard != null">
+                AND sum_standard = #{sumStandard}
+            </if>
+            <if test="sumAmount != null">
+                AND sum_amount = #{sumAmount}
+            </if>
+            <if test="saleDiscount != null">
+                AND sale_discount = #{saleDiscount}
+            </if>
+            <if test="returnStatus != null and returnStatus != ''">
+                AND return_status = #{returnStatus}
+            </if>
+            <if test="outStatus != null and outStatus != ''">
+                AND out_status = #{outStatus}
+            </if>
+            <if test="outingQty != null">
+                AND outing_qty = #{outingQty}
+            </if>
+            <if test="outingAmt != null">
+                AND outing_amt = #{outingAmt}
+            </if>
+            <if test="outQty != null">
+                AND out_qty = #{outQty}
+            </if>
+            <if test="outAmt != null">
+                AND out_amt = #{outAmt}
+            </if>
+            <if test="amtPayable != null">
+                AND amt_payable = #{amtPayable}
+            </if>
+            <if test="amtHandle != null">
+                AND amt_handle = #{amtHandle}
+            </if>
+            <if test="amtResidue != null">
+                AND amt_residue = #{amtResidue}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                AND remarks = #{remarks}
+            </if>
+            <if test="annexPaths != null and annexPaths != ''">
+                AND annex_paths = #{annexPaths}
+            </if>
+            <if test="makeStaff != null and makeStaff != ''">
+                AND make_staff = #{makeStaff}
+            </if>
+            <if test="makeTime != null">
+                AND make_time = #{makeTime}
+            </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">
+        <!-- 根据主键returnId批量操作 -->
+        WHERE return_id in
+        <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </sql>
+
+    <!-- 查询表t_psi_into_return，（条件查询+分页）列表 -->
+    <select id="selectByCond" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return
+        <include refid="Condition"/>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表t_psi_into_return，（条件查询）个数 -->
+    <select id="countByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM t_psi_into_return
+        <include refid="Condition"/>
+    </select>
+
+    <!-- 根据主键查询表t_psi_into_return的一行数据 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return
+        WHERE return_id = #{returnId}::uuid
+    </select>
+
+    <!-- 根据主键锁定表t_psi_into_return的一行数据 -->
+    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return
+        WHERE return_id = #{returnId}
+        for update
+    </select>
+
+    <!-- 根据主键锁定表t_psi_into_return的多行数据 -->
+    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_psi_into_return
+        <include refid="idsForeach"/>
+        for update
+    </select>
+
+    <insert id="insertBatch">
+        insert into t_psi_into_return
+        (
+        <trim suffixOverrides=",">
+            return_no,
+            return_type,
+            into_id,
+            pur_id,
+            into_no,
+            pur_no,
+            org_id,
+            staff_id,
+            sup_id,
+            contact_name,
+            contact_phone,
+            delivery_date,
+            sum_quantity,
+            sum_standard,
+            sum_amount,
+            sale_discount,
+            return_status,
+            out_status,
+            outing_qty,
+            outing_amt,
+            out_qty,
+            out_amt,
+            amt_payable,
+            amt_handle,
+            amt_residue,
+            remarks,
+            annex_paths,
+            make_staff,
+            make_time,
+            cp_id,
+            op_app_code,
+        </trim>
+        )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (
+            <trim suffixOverrides=",">
+                #{item.returnNo},
+                #{item.returnType},
+                #{item.intoId}::uuid,
+                #{item.purId}::uuid,
+                #{item.intoNo},
+                #{item.purNo},
+                #{item.orgId}::uuid,
+                #{item.staffId}::uuid,
+                #{item.supId}::uuid,
+                #{item.contactName},
+                #{item.contactPhone},
+                #{item.deliveryDate},
+                #{item.sumQuantity},
+                #{item.sumStandard},
+                #{item.sumAmount},
+                #{item.saleDiscount},
+                #{item.returnStatus},
+                #{item.outStatus},
+                #{item.outingQty},
+                #{item.outingAmt},
+                #{item.outQty},
+                #{item.outAmt},
+                #{item.amtPayable},
+                #{item.amtHandle},
+                #{item.amtResidue},
+                #{item.remarks},
+                #{item.annexPaths},
+                #{item.makeStaff}::uuid,
+                #{item.makeTime},
+                #{item.cpId},
+                #{item.opAppCode},
+            </trim>
+            )
+        </foreach>
+    </insert>
+</mapper>

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.java

@@ -2,13 +2,29 @@ package com.dk.mdm.mapper.ivt;
 
 import com.dk.mdm.model.pojo.ivt.OutboundItem;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.OutboundItemQuery;
+import com.dk.mdm.model.response.ivt.OutboundItemResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  出库明细 Mapper
 */
 @Repository
 public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
-	
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 付斌
+     * @date   : 2024-02-28 10:18
+     */
+    List<OutboundItemResponse> selectByCond(OutboundItemQuery orderQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 付斌
+     * @date   : 2024-02-28 10:19
+     */
+    Long countByCond(OutboundItemQuery orderQuery);
 }
 

src/main/java/com/dk/mdm/mapper/ivt/OutboundMapper.java

@@ -2,6 +2,7 @@ package com.dk.mdm.mapper.ivt;
 
 import com.dk.mdm.model.pojo.ivt.Outbound;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.response.ivt.OutboundResponse;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -9,6 +10,11 @@ import org.springframework.stereotype.Repository;
 */
 @Repository
 public interface OutboundMapper extends BaseMapper<Outbound>{
-	
+    /**
+     * @desc   : 根据Id进行查询
+     * @author : 付斌
+     * @date   : 2024-03-03 9:25
+     */
+    OutboundResponse selectById(String id);
 }
 

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

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        out_id, out_no, out_type, from_id, from_no, org_id, staff_id, order_id, order_no, into_return_id, into_return_no, cus_id, sup_id, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, out_date, remarks, annex_paths, make_staff, make_time, receivable_id, payable_id, 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
+        out_id, out_no, out_type, from_id, from_no, org_id, staff_id, cus_id, sup_id, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, out_date, remarks, annex_paths, make_staff, make_time, receivable_id, payable_id, 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>
 
     <!-- 通用查询映射结果 -->
@@ -17,10 +17,6 @@
                 <result column="from_no" property="fromNo"/>
                 <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
                 <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
-                <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
-                <result column="order_no" property="orderNo"/>
-                <result column="into_return_id" property="intoReturnId" typeHandler="UuidTypeHandler"/>
-                <result column="into_return_no" property="intoReturnNo"/>
                 <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
                 <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
                 <result column="out_status" property="outStatus"/>
@@ -69,18 +65,6 @@
             <if test="staffId != null and staffId != ''">
                 AND staff_id = #{staffId}
             </if>
-            <if test="orderId != null and orderId != ''">
-                AND order_id = #{orderId}
-            </if>
-            <if test="orderNo != null and orderNo != ''">
-                AND order_no = #{orderNo}
-            </if>
-            <if test="intoReturnId != null and intoReturnId != ''">
-                AND into_return_id = #{intoReturnId}
-            </if>
-            <if test="intoReturnNo != null and intoReturnNo != ''">
-                AND into_return_no = #{intoReturnNo}
-            </if>
             <if test="cusId != null and cusId != ''">
                 AND cus_id = #{cusId}
             </if>
@@ -256,10 +240,6 @@
                 #{item.fromNo},
                 #{item.orgId}::uuid,
                 #{item.staffId}::uuid,
-                #{item.orderId}::uuid,
-                #{item.orderNo},
-                #{item.intoReturnId}::uuid,
-                #{item.intoReturnNo},
                 #{item.cusId}::uuid,
                 #{item.supId}::uuid,
                 #{item.outStatus},

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

@@ -77,8 +77,8 @@
                 any(#{orgIds, typeHandler=UuidListTypeHandler})
             </if>
             <if test="searchText !=null">
-                AND ( t.staff_name LIKE concat('%', #{searchText}, '%')
-                or t.staff_phone LIKE concat('%', #{searchText}, '%'))
+                AND ( t.staff_name LIKE concat('%', my_ex.likequery(#{searchText}), '%')
+                or t.staff_phone LIKE concat('%', my_ex.likequery(#{searchText}), '%'))
             </if>
         </where>
     </sql>

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

@@ -48,7 +48,7 @@ public interface SupplierMapper extends BaseMapper<Supplier>{
      * @author : 王英杰
      * @date   : 2024/2/29 17:49
      */
-    int   batchDelete (Supplier supplierVo);
+    int   batchDeleteBrand (List<String> supIdList );
     /**
      * @desc   : 自动生id
      * @author : 王英杰

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

@@ -9,9 +9,9 @@
     </sql>
 <!--    ,taobj.sum_residue-->
     <sql id="msl_Base_Column_List">
-        msl.sup_id, msl.sup_code, msl.sup_name, msl.sup_type,
+        msl.sup_id, msl.sup_code, msl.sup_name,msl.sup_type,msl.service_categories,
         msl.contact_name, msl.contact_phone, msl.org_id, msl.staff_id,
-        msl.service_categories, msl.remarks, msl.flg_valid, msl.cp_id,
+        msl.remarks, msl.flg_valid, msl.cp_id,
         msl.op_create_time, msl.op_create_user_id, msl.op_update_time,
         msl.op_update_user_id, msl.op_app_code, msl.op_timestamp,
         msl.op_db_user
@@ -178,7 +178,16 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="msl_Base_Column_List"/>
-        ,tms.staff_name,
+        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS  "supTypeName"
+          ,
+        (
+        SELECT
+        string_agg ( sys.f_get_name_i18n ( tdk1.kind_name_i18n, 'zh_CN' ), ',' )
+        FROM
+        sys.t_data_kind AS tdk1
+        WHERE
+        tdk1.kind_code = ANY ( msl.service_categories )
+        ) AS "serviceCategoriesName",
         (SELECT COALESCE
         ( array_to_string( ARRAY_AGG ( tsm.brand_name ), ',' ), '' )
         FROM
@@ -191,6 +200,7 @@
         FROM dkic_b.t_mst_supplier msl
         LEFT JOIN dkic_b.t_mst_staff  tms   ON tms.staff_id = msl.staff_id
         LEFT JOIN dkic_b.t_mst_org  tmo   ON tmo.org_id = msl.org_id
+        LEFT JOIN sys.t_data_kind tdk   ON tdk.kind_code = msl.sup_type
         <include refid="msl_Condition"/>
         ORDER BY  msl.op_create_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
@@ -210,27 +220,37 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="msl_Base_Column_List"/>
-       , (SELECT COALESCE
-        ( array_to_string( ARRAY_AGG ( tsm.brand_id ), ',' ), '' )
+        ,tms.staff_name,sys.f_get_name_i18n(tdk.kind_name_i18n,'zh_CN' )AS  "supTypeName"
+        ,
+        (
+        SELECT
+        string_agg ( sys.f_get_name_i18n ( tdk1.kind_name_i18n, 'zh_CN' ), ',' )
+        FROM
+        sys.t_data_kind AS tdk1
+        WHERE
+        tdk1.kind_code = ANY ( msl.service_categories )
+        ) AS "serviceCategoriesNames",
+        (SELECT COALESCE
+        ( array_to_string( ARRAY_AGG ( tsm.brand_name ), ',' ), '' )
         FROM
         dkic_b.t_mst_supplier_brand tsmb
         LEFT JOIN dkic_b.t_mst_goods_brand tsm ON tsm.brand_id = tsmb.brand_id
         WHERE
         tsmb.sup_id = msl.sup_id
-        ) AS "brandIds",
+        ) AS "brandNames"
+        ,tmo.org_name,
         (SELECT COALESCE
-        ( array_to_string( ARRAY_AGG ( tsm.brand_name ), ',' ), '' )
+        ( array_to_string( ARRAY_AGG ( tsm.brand_id ), ',' ), '' )
         FROM
         dkic_b.t_mst_supplier_brand tsmb
         LEFT JOIN dkic_b.t_mst_goods_brand tsm ON tsm.brand_id = tsmb.brand_id
         WHERE
         tsmb.sup_id = msl.sup_id
-        ) AS "brandNames"
-        ,tms.staff_name
-        ,tmo.org_name
+        ) AS "brandIds"
         FROM dkic_b.t_mst_supplier msl
         LEFT JOIN dkic_b.t_mst_staff  tms   ON tms.staff_id = msl.staff_id
         LEFT JOIN dkic_b.t_mst_org  tmo   ON tmo.org_id = msl.org_id
+        LEFT JOIN sys.t_data_kind tdk   ON tdk.kind_code = msl.sup_type
         WHERE msl.sup_id = #{supId}::uuid
     </select>
 
@@ -325,7 +345,7 @@
                 #{brandId}::uuid
             )
     </insert>
-    <delete id="batchDelete">
+    <delete id="batchDeleteBrand">
         DELETE FROM dkic_b.t_mst_supplier_brand
         WHERE sup_id =  #{supId}::uuid;
     </delete>

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -41,7 +41,7 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
     /**
      * 明细ID
      */
-    @TableId(value = "item_id", type = IdType.AUTO)
+
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;

src/main/java/com/dk/mdm/model/pojo/ivt/IntoReturn.java

@@ -0,0 +1,385 @@
+package com.dk.mdm.model.pojo.ivt;
+
+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_into_return", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货", description="表名：t_psi_into_return")
+public class IntoReturn extends PageInfo<IntoReturn> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 退货单ID
+     */
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 退货单号
+     */
+    @Excel(name = "退货单号")
+    @ApiModelProperty(value = "退货单号")
+    private String returnNo;
+
+
+    /**
+     * 退货类型 (【系统字典】销售退货)
+     */
+    @Excel(name = "退货类型 (【系统字典】销售退货)")
+    @ApiModelProperty(value = "退货类型 (【系统字典】销售退货)")
+    private String returnType;
+
+
+    /**
+     * 入库单
+     */
+    @Excel(name = "入库单")
+    @ApiModelProperty(value = "入库单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 采购订单
+     */
+    @Excel(name = "采购订单")
+    @ApiModelProperty(value = "采购订单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 入库单号
+     */
+    @Excel(name = "入库单号")
+    @ApiModelProperty(value = "入库单号")
+    private String intoNo;
+
+
+    /**
+     * 采购订单号
+     */
+    @Excel(name = "采购订单号")
+    @ApiModelProperty(value = "采购订单号")
+    private String purNo;
+
+
+    /**
+     * 部门
+     */
+    @Excel(name = "部门")
+    @ApiModelProperty(value = "部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 员工
+     */
+    @Excel(name = "员工")
+    @ApiModelProperty(value = "员工")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 供应商
+     */
+    @Excel(name = "供应商")
+    @ApiModelProperty(value = "供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
+
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人")
+    @ApiModelProperty(value = "联系人")
+    private String contactName;
+
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+
+
+    /**
+     * 送货日期
+     */
+    @Excel(name = "送货日期")
+    @ApiModelProperty(value = "送货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime deliveryDate;
+
+
+    /**
+     * 商品总数量
+     */
+    @Excel(name = "商品总数量")
+    @ApiModelProperty(value = "商品总数量")
+    private BigDecimal sumQuantity;
+
+
+    /**
+     * 标价合计
+     */
+    @Excel(name = "标价合计")
+    @ApiModelProperty(value = "标价合计")
+    private BigDecimal sumStandard;
+
+
+    /**
+     * 合计金额
+     */
+    @Excel(name = "合计金额")
+    @ApiModelProperty(value = "合计金额")
+    private BigDecimal sumAmount;
+
+
+    /**
+     * 销售折扣 (合计金额/标价合计)
+     */
+    @Excel(name = "销售折扣 (合计金额/标价合计)")
+    @ApiModelProperty(value = "销售折扣 (合计金额/标价合计)")
+    private BigDecimal saleDiscount;
+
+
+    /**
+     * 退货状态 (【系统字典】)
+     */
+    @Excel(name = "退货状态 (【系统字典】)")
+    @ApiModelProperty(value = "退货状态 (【系统字典】)")
+    private String returnStatus;
+
+
+    /**
+     * 出库状态 (【系统字典】)
+     */
+    @Excel(name = "出库状态 (【系统字典】)")
+    @ApiModelProperty(value = "出库状态 (【系统字典】)")
+    private String outStatus;
+
+
+    /**
+     * 出库中数量
+     */
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
+
+
+    /**
+     * 出库中金额
+     */
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
+
+
+    /**
+     * 已出库数量
+     */
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
+
+
+    /**
+     * 已出库金额
+     */
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
+
+
+    /**
+     * 应付金额
+     */
+    @Excel(name = "应付金额")
+    @ApiModelProperty(value = "应付金额")
+    private BigDecimal amtPayable;
+
+
+    /**
+     * 还款金额
+     */
+    @Excel(name = "还款金额")
+    @ApiModelProperty(value = "还款金额")
+    private BigDecimal amtHandle;
+
+
+    /**
+     * 剩余应付
+     */
+    @Excel(name = "剩余应付")
+    @ApiModelProperty(value = "剩余应付")
+    private BigDecimal amtResidue;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
+     */
+    @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONObject annexPaths;
+
+
+    /**
+     * 制单员
+     */
+    @Excel(name = "制单员")
+    @ApiModelProperty(value = "制单员")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String makeStaff;
+
+
+    /**
+     * 制单时间
+     */
+    @Excel(name = "制单时间")
+    @ApiModelProperty(value = "制单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime makeTime;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/pojo/ivt/IntoReturnItem.java

@@ -0,0 +1,300 @@
+package com.dk.mdm.model.pojo.ivt;
+
+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_into_return_item", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货明细", description="表名：t_psi_into_return_item")
+public class IntoReturnItem extends PageInfo<IntoReturnItem> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 明细ID
+     */
+    @ApiModelProperty(value = "明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String itemId;
+
+
+    /**
+     * 退货单ID
+     */
+    @Excel(name = "退货单ID")
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 入库单ID
+     */
+    @Excel(name = "入库单ID")
+    @ApiModelProperty(value = "入库单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 入库单明细ID
+     */
+    @Excel(name = "入库单明细ID")
+    @ApiModelProperty(value = "入库单明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoItemId;
+
+
+    /**
+     * 采购订单ID
+     */
+    @Excel(name = "采购订单ID")
+    @ApiModelProperty(value = "采购订单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 采购明细ID
+     */
+    @Excel(name = "采购明细ID")
+    @ApiModelProperty(value = "采购明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purItemId;
+
+
+    /**
+     * 商品顺序
+     */
+    @Excel(name = "商品顺序")
+    @ApiModelProperty(value = "商品顺序")
+    private Integer itemIndex;
+
+
+    /**
+     * 商品ID
+     */
+    @Excel(name = "商品ID")
+    @ApiModelProperty(value = "商品ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String skuId;
+
+
+    /**
+     * 商品数量
+     */
+    @Excel(name = "商品数量")
+    @ApiModelProperty(value = "商品数量")
+    private BigDecimal itemQty;
+
+
+    /**
+     * 标价
+     */
+    @Excel(name = "标价")
+    @ApiModelProperty(value = "标价")
+    private BigDecimal priceStd;
+
+
+    /**
+     * 标价金额 (商品数量*标价)
+     */
+    @Excel(name = "标价金额 (商品数量*标价)")
+    @ApiModelProperty(value = "标价金额 (商品数量*标价)")
+    private BigDecimal amtStd;
+
+
+    /**
+     * 退货价
+     */
+    @Excel(name = "退货价")
+    @ApiModelProperty(value = "退货价")
+    private BigDecimal priceReturn;
+
+
+    /**
+     * 退货金额 (商品数量*退货价)
+     */
+    @Excel(name = "退货金额 (商品数量*退货价)")
+    @ApiModelProperty(value = "退货金额 (商品数量*退货价)")
+    private BigDecimal itemAmt;
+
+
+    /**
+     * 非标号
+     */
+    @Excel(name = "非标号")
+    @ApiModelProperty(value = "非标号")
+    private String nonStdCode;
+
+
+    /**
+     * 入库状态
+     */
+    @Excel(name = "入库状态")
+    @ApiModelProperty(value = "入库状态")
+    private String intoStatus;
+
+
+    /**
+     * 入库中数量
+     */
+    @Excel(name = "入库中数量")
+    @ApiModelProperty(value = "入库中数量")
+    private BigDecimal intoingQty;
+
+
+    /**
+     * 入库中金额
+     */
+    @Excel(name = "入库中金额")
+    @ApiModelProperty(value = "入库中金额")
+    private BigDecimal intoingAmt;
+
+
+    /**
+     * 已入库数量
+     */
+    @Excel(name = "已入库数量")
+    @ApiModelProperty(value = "已入库数量")
+    private BigDecimal intoQty;
+
+
+    /**
+     * 已入库金额
+     */
+    @Excel(name = "已入库金额")
+    @ApiModelProperty(value = "已入库金额")
+    private BigDecimal intoAmt;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/pojo/ivt/Outbound.java

@@ -99,40 +99,6 @@ public class Outbound extends PageInfo<Outbound> implements Serializable {
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")

src/main/java/com/dk/mdm/model/query/ivt/IntoReturnItemQuery.java

@@ -0,0 +1,299 @@
+package com.dk.mdm.model.query.ivt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *  入库退货明细
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("入库退货明细")
+@TableName(value = "t_psi_into_return_item", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货明细", description="表名：t_psi_into_return_item")
+public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 明细ID
+     */
+    @ApiModelProperty(value = "明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String itemId;
+
+
+    /**
+     * 退货单ID
+     */
+    @Excel(name = "退货单ID")
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 入库单ID
+     */
+    @Excel(name = "入库单ID")
+    @ApiModelProperty(value = "入库单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 入库单明细ID
+     */
+    @Excel(name = "入库单明细ID")
+    @ApiModelProperty(value = "入库单明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoItemId;
+
+
+    /**
+     * 采购订单ID
+     */
+    @Excel(name = "采购订单ID")
+    @ApiModelProperty(value = "采购订单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 采购明细ID
+     */
+    @Excel(name = "采购明细ID")
+    @ApiModelProperty(value = "采购明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purItemId;
+
+
+    /**
+     * 商品顺序
+     */
+    @Excel(name = "商品顺序")
+    @ApiModelProperty(value = "商品顺序")
+    private Integer itemIndex;
+
+
+    /**
+     * 商品ID
+     */
+    @Excel(name = "商品ID")
+    @ApiModelProperty(value = "商品ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String skuId;
+
+
+    /**
+     * 商品数量
+     */
+    @Excel(name = "商品数量")
+    @ApiModelProperty(value = "商品数量")
+    private BigDecimal itemQty;
+
+
+    /**
+     * 标价
+     */
+    @Excel(name = "标价")
+    @ApiModelProperty(value = "标价")
+    private BigDecimal priceStd;
+
+
+    /**
+     * 标价金额 (商品数量*标价)
+     */
+    @Excel(name = "标价金额 (商品数量*标价)")
+    @ApiModelProperty(value = "标价金额 (商品数量*标价)")
+    private BigDecimal amtStd;
+
+
+    /**
+     * 退货价
+     */
+    @Excel(name = "退货价")
+    @ApiModelProperty(value = "退货价")
+    private BigDecimal priceReturn;
+
+
+    /**
+     * 退货金额 (商品数量*退货价)
+     */
+    @Excel(name = "退货金额 (商品数量*退货价)")
+    @ApiModelProperty(value = "退货金额 (商品数量*退货价)")
+    private BigDecimal itemAmt;
+
+
+    /**
+     * 非标号
+     */
+    @Excel(name = "非标号")
+    @ApiModelProperty(value = "非标号")
+    private String nonStdCode;
+
+
+    /**
+     * 入库状态
+     */
+    @Excel(name = "入库状态")
+    @ApiModelProperty(value = "入库状态")
+    private String intoStatus;
+
+
+    /**
+     * 入库中数量
+     */
+    @Excel(name = "入库中数量")
+    @ApiModelProperty(value = "入库中数量")
+    private BigDecimal intoingQty;
+
+
+    /**
+     * 入库中金额
+     */
+    @Excel(name = "入库中金额")
+    @ApiModelProperty(value = "入库中金额")
+    private BigDecimal intoingAmt;
+
+
+    /**
+     * 已入库数量
+     */
+    @Excel(name = "已入库数量")
+    @ApiModelProperty(value = "已入库数量")
+    private BigDecimal intoQty;
+
+
+    /**
+     * 已入库金额
+     */
+    @Excel(name = "已入库金额")
+    @ApiModelProperty(value = "已入库金额")
+    private BigDecimal intoAmt;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/ivt/IntoReturnQuery.java

@@ -0,0 +1,386 @@
+package com.dk.mdm.model.query.ivt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+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.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *  入库退货
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("入库退货")
+@TableName(value = "t_psi_into_return", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货", description="表名：t_psi_into_return")
+public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 退货单ID
+     */
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 退货单号
+     */
+    @Excel(name = "退货单号")
+    @ApiModelProperty(value = "退货单号")
+    private String returnNo;
+
+
+    /**
+     * 退货类型 (【系统字典】销售退货)
+     */
+    @Excel(name = "退货类型 (【系统字典】销售退货)")
+    @ApiModelProperty(value = "退货类型 (【系统字典】销售退货)")
+    private String returnType;
+
+
+    /**
+     * 入库单
+     */
+    @Excel(name = "入库单")
+    @ApiModelProperty(value = "入库单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 采购订单
+     */
+    @Excel(name = "采购订单")
+    @ApiModelProperty(value = "采购订单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 入库单号
+     */
+    @Excel(name = "入库单号")
+    @ApiModelProperty(value = "入库单号")
+    private String intoNo;
+
+
+    /**
+     * 采购订单号
+     */
+    @Excel(name = "采购订单号")
+    @ApiModelProperty(value = "采购订单号")
+    private String purNo;
+
+
+    /**
+     * 部门
+     */
+    @Excel(name = "部门")
+    @ApiModelProperty(value = "部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 员工
+     */
+    @Excel(name = "员工")
+    @ApiModelProperty(value = "员工")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 供应商
+     */
+    @Excel(name = "供应商")
+    @ApiModelProperty(value = "供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
+
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人")
+    @ApiModelProperty(value = "联系人")
+    private String contactName;
+
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+
+
+    /**
+     * 送货日期
+     */
+    @Excel(name = "送货日期")
+    @ApiModelProperty(value = "送货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime deliveryDate;
+
+
+    /**
+     * 商品总数量
+     */
+    @Excel(name = "商品总数量")
+    @ApiModelProperty(value = "商品总数量")
+    private BigDecimal sumQuantity;
+
+
+    /**
+     * 标价合计
+     */
+    @Excel(name = "标价合计")
+    @ApiModelProperty(value = "标价合计")
+    private BigDecimal sumStandard;
+
+
+    /**
+     * 合计金额
+     */
+    @Excel(name = "合计金额")
+    @ApiModelProperty(value = "合计金额")
+    private BigDecimal sumAmount;
+
+
+    /**
+     * 销售折扣 (合计金额/标价合计)
+     */
+    @Excel(name = "销售折扣 (合计金额/标价合计)")
+    @ApiModelProperty(value = "销售折扣 (合计金额/标价合计)")
+    private BigDecimal saleDiscount;
+
+
+    /**
+     * 退货状态 (【系统字典】)
+     */
+    @Excel(name = "退货状态 (【系统字典】)")
+    @ApiModelProperty(value = "退货状态 (【系统字典】)")
+    private String returnStatus;
+
+
+    /**
+     * 出库状态 (【系统字典】)
+     */
+    @Excel(name = "出库状态 (【系统字典】)")
+    @ApiModelProperty(value = "出库状态 (【系统字典】)")
+    private String outStatus;
+
+
+    /**
+     * 出库中数量
+     */
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
+
+
+    /**
+     * 出库中金额
+     */
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
+
+
+    /**
+     * 已出库数量
+     */
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
+
+
+    /**
+     * 已出库金额
+     */
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
+
+
+    /**
+     * 应付金额
+     */
+    @Excel(name = "应付金额")
+    @ApiModelProperty(value = "应付金额")
+    private BigDecimal amtPayable;
+
+
+    /**
+     * 还款金额
+     */
+    @Excel(name = "还款金额")
+    @ApiModelProperty(value = "还款金额")
+    private BigDecimal amtHandle;
+
+
+    /**
+     * 剩余应付
+     */
+    @Excel(name = "剩余应付")
+    @ApiModelProperty(value = "剩余应付")
+    private BigDecimal amtResidue;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
+     */
+    @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONObject annexPaths;
+
+
+    /**
+     * 制单员
+     */
+    @Excel(name = "制单员")
+    @ApiModelProperty(value = "制单员")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String makeStaff;
+
+
+    /**
+     * 制单时间
+     */
+    @Excel(name = "制单时间")
+    @ApiModelProperty(value = "制单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime makeTime;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/ivt/OutboundQuery.java

@@ -100,40 +100,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")

src/main/java/com/dk/mdm/model/response/ivt/IntoReturnItemResponse.java

@@ -0,0 +1,298 @@
+package com.dk.mdm.model.response.ivt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *  入库退货明细
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ExportTitle("入库退货明细")
+@TableName(value = "t_psi_into_return_item", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货明细", description="表名：t_psi_into_return_item")
+public class IntoReturnItemResponse  implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 明细ID
+     */
+    @ApiModelProperty(value = "明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String itemId;
+
+
+    /**
+     * 退货单ID
+     */
+    @Excel(name = "退货单ID")
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 入库单ID
+     */
+    @Excel(name = "入库单ID")
+    @ApiModelProperty(value = "入库单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 入库单明细ID
+     */
+    @Excel(name = "入库单明细ID")
+    @ApiModelProperty(value = "入库单明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoItemId;
+
+
+    /**
+     * 采购订单ID
+     */
+    @Excel(name = "采购订单ID")
+    @ApiModelProperty(value = "采购订单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 采购明细ID
+     */
+    @Excel(name = "采购明细ID")
+    @ApiModelProperty(value = "采购明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purItemId;
+
+
+    /**
+     * 商品顺序
+     */
+    @Excel(name = "商品顺序")
+    @ApiModelProperty(value = "商品顺序")
+    private Integer itemIndex;
+
+
+    /**
+     * 商品ID
+     */
+    @Excel(name = "商品ID")
+    @ApiModelProperty(value = "商品ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String skuId;
+
+
+    /**
+     * 商品数量
+     */
+    @Excel(name = "商品数量")
+    @ApiModelProperty(value = "商品数量")
+    private BigDecimal itemQty;
+
+
+    /**
+     * 标价
+     */
+    @Excel(name = "标价")
+    @ApiModelProperty(value = "标价")
+    private BigDecimal priceStd;
+
+
+    /**
+     * 标价金额 (商品数量*标价)
+     */
+    @Excel(name = "标价金额 (商品数量*标价)")
+    @ApiModelProperty(value = "标价金额 (商品数量*标价)")
+    private BigDecimal amtStd;
+
+
+    /**
+     * 退货价
+     */
+    @Excel(name = "退货价")
+    @ApiModelProperty(value = "退货价")
+    private BigDecimal priceReturn;
+
+
+    /**
+     * 退货金额 (商品数量*退货价)
+     */
+    @Excel(name = "退货金额 (商品数量*退货价)")
+    @ApiModelProperty(value = "退货金额 (商品数量*退货价)")
+    private BigDecimal itemAmt;
+
+
+    /**
+     * 非标号
+     */
+    @Excel(name = "非标号")
+    @ApiModelProperty(value = "非标号")
+    private String nonStdCode;
+
+
+    /**
+     * 入库状态
+     */
+    @Excel(name = "入库状态")
+    @ApiModelProperty(value = "入库状态")
+    private String intoStatus;
+
+
+    /**
+     * 入库中数量
+     */
+    @Excel(name = "入库中数量")
+    @ApiModelProperty(value = "入库中数量")
+    private BigDecimal intoingQty;
+
+
+    /**
+     * 入库中金额
+     */
+    @Excel(name = "入库中金额")
+    @ApiModelProperty(value = "入库中金额")
+    private BigDecimal intoingAmt;
+
+
+    /**
+     * 已入库数量
+     */
+    @Excel(name = "已入库数量")
+    @ApiModelProperty(value = "已入库数量")
+    private BigDecimal intoQty;
+
+
+    /**
+     * 已入库金额
+     */
+    @Excel(name = "已入库金额")
+    @ApiModelProperty(value = "已入库金额")
+    private BigDecimal intoAmt;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/response/ivt/IntoReturnResponse.java

@@ -0,0 +1,385 @@
+package com.dk.mdm.model.response.ivt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+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.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *  入库退货
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ExportTitle("入库退货")
+@TableName(value = "t_psi_into_return", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货", description="表名：t_psi_into_return")
+public class IntoReturnResponse  implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 退货单ID
+     */
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 退货单号
+     */
+    @Excel(name = "退货单号")
+    @ApiModelProperty(value = "退货单号")
+    private String returnNo;
+
+
+    /**
+     * 退货类型 (【系统字典】销售退货)
+     */
+    @Excel(name = "退货类型 (【系统字典】销售退货)")
+    @ApiModelProperty(value = "退货类型 (【系统字典】销售退货)")
+    private String returnType;
+
+
+    /**
+     * 入库单
+     */
+    @Excel(name = "入库单")
+    @ApiModelProperty(value = "入库单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 采购订单
+     */
+    @Excel(name = "采购订单")
+    @ApiModelProperty(value = "采购订单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 入库单号
+     */
+    @Excel(name = "入库单号")
+    @ApiModelProperty(value = "入库单号")
+    private String intoNo;
+
+
+    /**
+     * 采购订单号
+     */
+    @Excel(name = "采购订单号")
+    @ApiModelProperty(value = "采购订单号")
+    private String purNo;
+
+
+    /**
+     * 部门
+     */
+    @Excel(name = "部门")
+    @ApiModelProperty(value = "部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 员工
+     */
+    @Excel(name = "员工")
+    @ApiModelProperty(value = "员工")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 供应商
+     */
+    @Excel(name = "供应商")
+    @ApiModelProperty(value = "供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
+
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人")
+    @ApiModelProperty(value = "联系人")
+    private String contactName;
+
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+
+
+    /**
+     * 送货日期
+     */
+    @Excel(name = "送货日期")
+    @ApiModelProperty(value = "送货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime deliveryDate;
+
+
+    /**
+     * 商品总数量
+     */
+    @Excel(name = "商品总数量")
+    @ApiModelProperty(value = "商品总数量")
+    private BigDecimal sumQuantity;
+
+
+    /**
+     * 标价合计
+     */
+    @Excel(name = "标价合计")
+    @ApiModelProperty(value = "标价合计")
+    private BigDecimal sumStandard;
+
+
+    /**
+     * 合计金额
+     */
+    @Excel(name = "合计金额")
+    @ApiModelProperty(value = "合计金额")
+    private BigDecimal sumAmount;
+
+
+    /**
+     * 销售折扣 (合计金额/标价合计)
+     */
+    @Excel(name = "销售折扣 (合计金额/标价合计)")
+    @ApiModelProperty(value = "销售折扣 (合计金额/标价合计)")
+    private BigDecimal saleDiscount;
+
+
+    /**
+     * 退货状态 (【系统字典】)
+     */
+    @Excel(name = "退货状态 (【系统字典】)")
+    @ApiModelProperty(value = "退货状态 (【系统字典】)")
+    private String returnStatus;
+
+
+    /**
+     * 出库状态 (【系统字典】)
+     */
+    @Excel(name = "出库状态 (【系统字典】)")
+    @ApiModelProperty(value = "出库状态 (【系统字典】)")
+    private String outStatus;
+
+
+    /**
+     * 出库中数量
+     */
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
+
+
+    /**
+     * 出库中金额
+     */
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
+
+
+    /**
+     * 已出库数量
+     */
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
+
+
+    /**
+     * 已出库金额
+     */
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
+
+
+    /**
+     * 应付金额
+     */
+    @Excel(name = "应付金额")
+    @ApiModelProperty(value = "应付金额")
+    private BigDecimal amtPayable;
+
+
+    /**
+     * 还款金额
+     */
+    @Excel(name = "还款金额")
+    @ApiModelProperty(value = "还款金额")
+    private BigDecimal amtHandle;
+
+
+    /**
+     * 剩余应付
+     */
+    @Excel(name = "剩余应付")
+    @ApiModelProperty(value = "剩余应付")
+    private BigDecimal amtResidue;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
+     */
+    @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONObject annexPaths;
+
+
+    /**
+     * 制单员
+     */
+    @Excel(name = "制单员")
+    @ApiModelProperty(value = "制单员")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String makeStaff;
+
+
+    /**
+     * 制单时间
+     */
+    @Excel(name = "制单时间")
+    @ApiModelProperty(value = "制单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime makeTime;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/response/ivt/OutboundResponse.java

@@ -100,40 +100,6 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")

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

@@ -230,14 +230,22 @@ public class SpplierResponse extends PageInfo<SpplierResponse> implements Serial
     @ApiModelProperty(value = "剩余应收付")
     private String sumResidue;
 
-    @TableField(exist = false)
     @ApiModelProperty(value = "供应品牌")
+    @TableField(typeHandler = UuidListTypeHandler.class)
     private String brandIds;
 
 
     @TableField(exist = false)
     @ApiModelProperty(value = "剩余应收付")
     private String brandNames;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "供应商类别")
+    private String supTypeName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "供应商类别")
+    private String serviceCategoriesNames;
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -0,0 +1,298 @@
+package com.dk.mdm.model.vo.ivt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *  入库退货明细
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ExportTitle("入库退货明细")
+@TableName(value = "t_psi_into_return_item", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货明细", description="表名：t_psi_into_return_item")
+public class IntoReturnItemVO  implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 明细ID
+     */
+    @ApiModelProperty(value = "明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String itemId;
+
+
+    /**
+     * 退货单ID
+     */
+    @Excel(name = "退货单ID")
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 入库单ID
+     */
+    @Excel(name = "入库单ID")
+    @ApiModelProperty(value = "入库单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 入库单明细ID
+     */
+    @Excel(name = "入库单明细ID")
+    @ApiModelProperty(value = "入库单明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoItemId;
+
+
+    /**
+     * 采购订单ID
+     */
+    @Excel(name = "采购订单ID")
+    @ApiModelProperty(value = "采购订单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 采购明细ID
+     */
+    @Excel(name = "采购明细ID")
+    @ApiModelProperty(value = "采购明细ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purItemId;
+
+
+    /**
+     * 商品顺序
+     */
+    @Excel(name = "商品顺序")
+    @ApiModelProperty(value = "商品顺序")
+    private Integer itemIndex;
+
+
+    /**
+     * 商品ID
+     */
+    @Excel(name = "商品ID")
+    @ApiModelProperty(value = "商品ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String skuId;
+
+
+    /**
+     * 商品数量
+     */
+    @Excel(name = "商品数量")
+    @ApiModelProperty(value = "商品数量")
+    private BigDecimal itemQty;
+
+
+    /**
+     * 标价
+     */
+    @Excel(name = "标价")
+    @ApiModelProperty(value = "标价")
+    private BigDecimal priceStd;
+
+
+    /**
+     * 标价金额 (商品数量*标价)
+     */
+    @Excel(name = "标价金额 (商品数量*标价)")
+    @ApiModelProperty(value = "标价金额 (商品数量*标价)")
+    private BigDecimal amtStd;
+
+
+    /**
+     * 退货价
+     */
+    @Excel(name = "退货价")
+    @ApiModelProperty(value = "退货价")
+    private BigDecimal priceReturn;
+
+
+    /**
+     * 退货金额 (商品数量*退货价)
+     */
+    @Excel(name = "退货金额 (商品数量*退货价)")
+    @ApiModelProperty(value = "退货金额 (商品数量*退货价)")
+    private BigDecimal itemAmt;
+
+
+    /**
+     * 非标号
+     */
+    @Excel(name = "非标号")
+    @ApiModelProperty(value = "非标号")
+    private String nonStdCode;
+
+
+    /**
+     * 入库状态
+     */
+    @Excel(name = "入库状态")
+    @ApiModelProperty(value = "入库状态")
+    private String intoStatus;
+
+
+    /**
+     * 入库中数量
+     */
+    @Excel(name = "入库中数量")
+    @ApiModelProperty(value = "入库中数量")
+    private BigDecimal intoingQty;
+
+
+    /**
+     * 入库中金额
+     */
+    @Excel(name = "入库中金额")
+    @ApiModelProperty(value = "入库中金额")
+    private BigDecimal intoingAmt;
+
+
+    /**
+     * 已入库数量
+     */
+    @Excel(name = "已入库数量")
+    @ApiModelProperty(value = "已入库数量")
+    private BigDecimal intoQty;
+
+
+    /**
+     * 已入库金额
+     */
+    @Excel(name = "已入库金额")
+    @ApiModelProperty(value = "已入库金额")
+    private BigDecimal intoAmt;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/vo/ivt/IntoReturnVO.java

@@ -0,0 +1,385 @@
+package com.dk.mdm.model.vo.ivt;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+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.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ *  入库退货
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ExportTitle("入库退货")
+@TableName(value = "t_psi_into_return", autoResultMap = true,schema = "dkic_b")
+@ApiModel(value="实体类：入库退货", description="表名：t_psi_into_return")
+public class IntoReturnVO  implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 退货单ID
+     */
+    @ApiModelProperty(value = "退货单ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String returnId;
+
+
+    /**
+     * 退货单号
+     */
+    @Excel(name = "退货单号")
+    @ApiModelProperty(value = "退货单号")
+    private String returnNo;
+
+
+    /**
+     * 退货类型 (【系统字典】销售退货)
+     */
+    @Excel(name = "退货类型 (【系统字典】销售退货)")
+    @ApiModelProperty(value = "退货类型 (【系统字典】销售退货)")
+    private String returnType;
+
+
+    /**
+     * 入库单
+     */
+    @Excel(name = "入库单")
+    @ApiModelProperty(value = "入库单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String intoId;
+
+
+    /**
+     * 采购订单
+     */
+    @Excel(name = "采购订单")
+    @ApiModelProperty(value = "采购订单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String purId;
+
+
+    /**
+     * 入库单号
+     */
+    @Excel(name = "入库单号")
+    @ApiModelProperty(value = "入库单号")
+    private String intoNo;
+
+
+    /**
+     * 采购订单号
+     */
+    @Excel(name = "采购订单号")
+    @ApiModelProperty(value = "采购订单号")
+    private String purNo;
+
+
+    /**
+     * 部门
+     */
+    @Excel(name = "部门")
+    @ApiModelProperty(value = "部门")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String orgId;
+
+
+    /**
+     * 员工
+     */
+    @Excel(name = "员工")
+    @ApiModelProperty(value = "员工")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String staffId;
+
+
+    /**
+     * 供应商
+     */
+    @Excel(name = "供应商")
+    @ApiModelProperty(value = "供应商")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String supId;
+
+
+    /**
+     * 联系人
+     */
+    @Excel(name = "联系人")
+    @ApiModelProperty(value = "联系人")
+    private String contactName;
+
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话")
+    @ApiModelProperty(value = "联系电话")
+    private String contactPhone;
+
+
+    /**
+     * 送货日期
+     */
+    @Excel(name = "送货日期")
+    @ApiModelProperty(value = "送货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime deliveryDate;
+
+
+    /**
+     * 商品总数量
+     */
+    @Excel(name = "商品总数量")
+    @ApiModelProperty(value = "商品总数量")
+    private BigDecimal sumQuantity;
+
+
+    /**
+     * 标价合计
+     */
+    @Excel(name = "标价合计")
+    @ApiModelProperty(value = "标价合计")
+    private BigDecimal sumStandard;
+
+
+    /**
+     * 合计金额
+     */
+    @Excel(name = "合计金额")
+    @ApiModelProperty(value = "合计金额")
+    private BigDecimal sumAmount;
+
+
+    /**
+     * 销售折扣 (合计金额/标价合计)
+     */
+    @Excel(name = "销售折扣 (合计金额/标价合计)")
+    @ApiModelProperty(value = "销售折扣 (合计金额/标价合计)")
+    private BigDecimal saleDiscount;
+
+
+    /**
+     * 退货状态 (【系统字典】)
+     */
+    @Excel(name = "退货状态 (【系统字典】)")
+    @ApiModelProperty(value = "退货状态 (【系统字典】)")
+    private String returnStatus;
+
+
+    /**
+     * 出库状态 (【系统字典】)
+     */
+    @Excel(name = "出库状态 (【系统字典】)")
+    @ApiModelProperty(value = "出库状态 (【系统字典】)")
+    private String outStatus;
+
+
+    /**
+     * 出库中数量
+     */
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
+
+
+    /**
+     * 出库中金额
+     */
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
+
+
+    /**
+     * 已出库数量
+     */
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
+
+
+    /**
+     * 已出库金额
+     */
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
+
+
+    /**
+     * 应付金额
+     */
+    @Excel(name = "应付金额")
+    @ApiModelProperty(value = "应付金额")
+    private BigDecimal amtPayable;
+
+
+    /**
+     * 还款金额
+     */
+    @Excel(name = "还款金额")
+    @ApiModelProperty(value = "还款金额")
+    private BigDecimal amtHandle;
+
+
+    /**
+     * 剩余应付
+     */
+    @Excel(name = "剩余应付")
+    @ApiModelProperty(value = "剩余应付")
+    private BigDecimal amtResidue;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
+     */
+    @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONObject annexPaths;
+
+
+    /**
+     * 制单员
+     */
+    @Excel(name = "制单员")
+    @ApiModelProperty(value = "制单员")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String makeStaff;
+
+
+    /**
+     * 制单时间
+     */
+    @Excel(name = "制单时间")
+    @ApiModelProperty(value = "制单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDateTime makeTime;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @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/vo/ivt/OutboundVO.java

@@ -21,6 +21,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  出库单
@@ -100,40 +101,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
 
 
     /**
-     * 销售订单ID
-     */
-    @Excel(name = "销售订单ID")
-    @ApiModelProperty(value = "销售订单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String orderId;
-
-
-    /**
-     * 销售订单号
-     */
-    @Excel(name = "销售订单号")
-    @ApiModelProperty(value = "销售订单号")
-    private String orderNo;
-
-
-    /**
-     * 入库退货单ID
-     */
-    @Excel(name = "入库退货单ID")
-    @ApiModelProperty(value = "入库退货单ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String intoReturnId;
-
-
-    /**
-     * 入库退货单号
-     */
-    @Excel(name = "入库退货单号")
-    @ApiModelProperty(value = "入库退货单号")
-    private String intoReturnNo;
-
-
-    /**
      * 客户
      */
     @Excel(name = "客户")
@@ -350,6 +317,11 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
+    @ApiModelProperty(value = "出库明细")
+    private List<OutboundItemVO> outboundItemList;
+
+    @ApiModelProperty(value = "删除明细")
+    private List<OutboundItemVO> deleteItemList;
 
     /*
      * 相关属性

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

@@ -0,0 +1,23 @@
+package com.dk.mdm.service.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
+import com.dk.mdm.mapper.ivt.IntoReturnItemMapper;
+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 IntoReturnItemService extends BaseService<IntoReturnItem> {
+
+	@Override
+	public BaseMapper<IntoReturnItem> getRepository() {
+		return intoReturnItemMapper;
+	}
+
+	@Autowired
+	private IntoReturnItemMapper intoReturnItemMapper;
+
+}

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

@@ -0,0 +1,23 @@
+package com.dk.mdm.service.ivt;
+
+import com.dk.mdm.model.pojo.ivt.IntoReturn;
+import com.dk.mdm.mapper.ivt.IntoReturnMapper;
+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 IntoReturnService extends BaseService<IntoReturn> {
+
+	@Override
+	public BaseMapper<IntoReturn> getRepository() {
+		return intoReturnMapper;
+	}
+
+	@Autowired
+	private IntoReturnMapper intoReturnMapper;
+
+}

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

@@ -1,13 +1,36 @@
 package com.dk.mdm.service.ivt;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.dk.common.exception.BaseBusinessException;
+import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.response.ResponseCodeEnum;
+import com.dk.common.response.ResponseResultUtil;
+import com.dk.common.response.ResponseResultVO;
+import com.dk.mdm.infrastructure.convert.ivt.OutboundConvert;
+import com.dk.mdm.infrastructure.convert.ivt.OutboundItemConvert;
+import com.dk.mdm.mapper.ivt.OutboundItemMapper;
 import com.dk.mdm.model.pojo.ivt.Outbound;
 import com.dk.mdm.mapper.ivt.OutboundMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.ivt.OutboundItem;
+import com.dk.mdm.model.query.ivt.OutboundItemQuery;
+import com.dk.mdm.model.response.ivt.OutboundItemResponse;
+import com.dk.mdm.model.response.ivt.OutboundResponse;
+import com.dk.mdm.model.vo.ivt.OutboundItemVO;
+import com.dk.mdm.model.vo.ivt.OutboundVO;
+import com.dk.mdm.service.common.CommonService;
 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;
+
 @Service
 @Transactional
 public class OutboundService extends BaseService<Outbound> {
@@ -20,4 +43,91 @@ public class OutboundService extends BaseService<Outbound> {
 	@Autowired
 	private OutboundMapper outboundMapper;
 
+	@Autowired
+	private OutboundItemService outboundItemService;
+
+	@Autowired
+	private OutboundItemMapper outboundItemMapper;
+
+	@Autowired
+	private CommonService commonService;
+
+	@Autowired
+	private OutboundConvert outboundConvert;
+
+	@Autowired
+	private OutboundItemConvert outboundItemConvert;
+
+	/**
+	 * @desc : 新建方法
+	 * @author : 付斌
+	 * @date : 2023/1/9 10:49
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> insert(OutboundVO outboundVO) {
+
+		// 获取单号
+		Map<String , Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.OUTBOUND.getName(),false);
+		outboundVO.setOutId(codeMap.get("outId").toString()).setOutNo(codeMap.get("outNote").toString()).setOutType(Constant.OutType.SALE.getName());
+		// 转化实体
+		Outbound outbound = outboundConvert.convertToPo(outboundVO);
+		// 总单保存
+		super.insert(outbound);
+
+		// 明细保存
+		if (outboundVO.getOutboundItemList() != null && outboundVO.getOutboundItemList().size() > 0) {
+			for (OutboundItemVO outboundItemVO : outboundVO.getOutboundItemList()) {
+				OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
+				outboundItem.setOutId(outbound.getOutId()).setCpId(outbound.getCpId()).setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
+				outboundItemMapper.insert(outboundItem);
+			}
+		}
+		return ResponseResultUtil.success();
+	}
+
+	/**
+	 * @desc   : 获取订单信息（编辑用）
+	 * @author : 付斌
+	 * @date   : 2024-03-02 17:27
+	 */
+	public ResponseResultVO<?> getOutboundForUpdate(String id) {
+		Map<String, Object> outboundInfo = new HashMap<>();
+		OutboundResponse outboundResponse = outboundMapper.selectById(id);
+		outboundInfo.put("outbound", outboundResponse);
+
+		// 商品明细
+		List<OutboundItemResponse> outboundItemResponse = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(id));
+		outboundInfo.put("outboundItem", outboundItemResponse);
+		return ResponseResultUtil.success(outboundInfo);
+	}
+
+	/**
+	 * @desc : 编辑方法
+	 * @author : 付斌
+	 * @date : 2023/1/9 10:49
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<Boolean> update(OutboundVO outboundVO) {
+		// 转化实体
+		Outbound outbound = outboundConvert.convertToPo(outboundVO);
+
+		// 编辑的
+		List<OutboundItemVO> editOutboundItemVOList = outboundVO.getOutboundItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());
+		for (OutboundItemVO outboundItemVO : editOutboundItemVOList) {
+			// 商品数量不能小于出库中数量
+			if(outboundItemVO.getItemQty().compareTo(outboundItemVO.getOutingQty()) == -1){
+				throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ITEMQTY_NO_LESS_OUTQTY.getMessage());
+			} else {
+				OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
+				outboundItemService.updateByUuid(outboundItem);
+			}
+		}
+
+		return ResponseResultUtil.success(super.update(outbound, new UpdateWrapper<Outbound>().lambda().eq(Outbound::getOutId,
+				UUID.fromString(outbound.getOutId()))));
+	}
 }

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

@@ -91,7 +91,7 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 	public ResponseResultVO<?> update(GoodsSkuVO goodsSkuVO) {
 		GoodsSku goodsSku = goodsSkuConvert.convertToPo(goodsSkuVO);
 		// 获取编码和主键UuId
-		super.update(goodsSku);
+		super.updateByUuid(goodsSku);
 		return ResponseResultUtil.success();
 	}
 

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

@@ -93,7 +93,7 @@ public class SupplierService extends BaseService<Supplier> {
             supplier.setSupCode(codeMap.get("outNote").toString());  //插入供应商表的实体
 
             super.insert(supplier);// 先插入自己的供应商表
-            if (supplier.getBrandIds() != null) {  //如果有 商品品牌 一起插入品牌
+            if ((supplier.getBrandIds() != null) && (supplier.getBrandIds().size()>0)) {  //如果有 商品品牌 一起插入品牌
                 List<Supplier>  Supplierlst   = new ArrayList<>();
                 List<String> BrandIdList =  new ArrayList<>();
                 BrandIdList = supplier.getBrandIds();
@@ -127,10 +127,19 @@ public class SupplierService extends BaseService<Supplier> {
         Supplier supplier = supplierConvert.convertToPo(supplierVo);
         try {
           super.updateByUuid(supplier);// 先更新的供应商表
-            supplierMapper.batchDelete(supplier);//批量删除供应商对应的供应商品牌
-            if (supplierVo.getBrandId() != null) {  //如果有 商品品牌
-                // 设置supplierVo的supplierId
-                supplierMapper.insertSupplierBrand(supplier); // 向供应商品牌表插入数据
+          supplierMapper.batchDeleteBrand(supplier.getBrandIds());//批量删除供应商对应的供应商品牌
+            if ((supplier.getBrandIds() != null) && (supplier.getBrandIds().size()>0)) {  //如果有 商品品牌 一起插入品牌
+                List<Supplier>  Supplierlst   = new ArrayList<>();
+                List<String> BrandIdList =  new ArrayList<>();
+                BrandIdList = supplier.getBrandIds();
+                Supplier supplier_center = null;
+                for (int i = 0;  i< BrandIdList.size();i++){
+                    supplier_center= new Supplier();
+                    supplier_center.setBrandId(BrandIdList.get(i));
+                    supplier_center.setSupId(supplier.getSupId());
+                    Supplierlst.add(supplier_center);
+                }
+                supplierMapper.insertSupplierBrandtBatch(Supplierlst); // 向供应商品牌表插入数据
             }
           return ResponseResultUtil.success();
         } catch (Exception e) {