退货

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

@@ -1,14 +1,23 @@
 package com.dk.mdm.controller.ivt;
 
+
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Inbound;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 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.InboundService;
 
+
 @Api(tags = "入库单API接口")
 @RestController
 @RequestMapping("/ivt/inbound")
@@ -21,4 +30,17 @@ public class InboundController{
     @Autowired
     private InboundService inboundService;
 
+
+
+
+    /**
+     * @desc : 查看来源单据,总单加明细  采购退货用
+     * @author : 于继渤
+     * @date : 2024/3/6 10:36
+     */
+    @ApiOperation(value = "条件查询", notes = "条件查询")
+    @PostMapping({"select_inbound_and_item"})
+    public ResponseResultVO<PageList<InboundResponse>> selectInboundAndItem(@RequestBody InboundQuery inboundQuery) {
+        return inboundService.selectInboundAndItem(inboundQuery);
+    }
 }

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

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

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

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

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

@@ -1,267 +0,0 @@
-<?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.InboundItemMapper">
-
-    <!-- 通用设置 -->
-    <!-- 通用查询列 -->
-    <sql id="Base_Column_List">
-        item_id, into_id, into_type, from_id, from_item_id, item_index, sku_id, item_qty, price_into, item_amt, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, remarks, inv_id, cost_price, cost_amt, out_qty, inv_qty, 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.response.ivt.InboundItemResponse">
-        <id column="item_id" property="itemId"/>
-                <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
-                <result column="into_type" property="intoType"/>
-                <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
-                <result column="from_item_id" property="fromItemId" 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_into" property="priceInto"/>
-                <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="return_qty" property="returnQty"/>
-                <result column="return_amt" property="returnAmt"/>
-                <result column="remarks" property="remarks"/>
-                <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
-                <result column="cost_price" property="costPrice"/>
-                <result column="cost_amt" property="costAmt"/>
-                <result column="out_qty" property="outQty"/>
-                <result column="inv_qty" property="invQty"/>
-                <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="intoId != null and intoId != ''">
-                AND into_id = #{intoId}
-            </if>
-            <if test="intoType != null and intoType != ''">
-                AND into_type = #{intoType}
-            </if>
-            <if test="fromId != null and fromId != ''">
-                AND from_id = #{fromId}
-            </if>
-            <if test="fromItemId != null and fromItemId != ''">
-                AND from_item_id = #{fromItemId}
-            </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="priceInto != null">
-                AND price_into = #{priceInto}
-            </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="returnQty != null">
-                AND return_qty = #{returnQty}
-            </if>
-            <if test="returnAmt != null">
-                AND return_amt = #{returnAmt}
-            </if>
-            <if test="remarks != null and remarks != ''">
-                AND remarks = #{remarks}
-            </if>
-            <if test="invId != null and invId != ''">
-                AND inv_id = #{invId}
-            </if>
-            <if test="costPrice != null">
-                AND cost_price = #{costPrice}
-            </if>
-            <if test="costAmt != null">
-                AND cost_amt = #{costAmt}
-            </if>
-            <if test="outQty != null">
-                AND out_qty = #{outQty}
-            </if>
-            <if test="invQty != null">
-                AND inv_qty = #{invQty}
-            </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_inbound_item，（条件查询+分页）列表 -->
-    <select id="selectByCond" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_psi_inbound_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_inbound_item，（条件查询）个数 -->
-    <select id="countByCond" resultType="Long">
-        SELECT
-        count(1)
-        FROM t_psi_inbound_item
-        <include refid="Condition"/>
-    </select>
-
-    <!-- 根据主键查询表t_psi_inbound_item的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_psi_inbound_item
-        WHERE item_id = #{itemId}::uuid
-    </select>
-
-    <!-- 根据主键锁定表t_psi_inbound_item的一行数据 -->
-    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_psi_inbound_item
-        WHERE item_id = #{itemId}
-        for update
-    </select>
-
-    <!-- 根据主键锁定表t_psi_inbound_item的多行数据 -->
-    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_psi_inbound_item
-        <include refid="idsForeach"/>
-        for update
-    </select>
-
-    <insert id="insertBatch">
-        insert into t_psi_inbound_item
-        (
-        <trim suffixOverrides=",">
-            into_id,
-            into_type,
-            from_id,
-            from_item_id,
-            item_index,
-            sku_id,
-            item_qty,
-            price_into,
-            item_amt,
-            non_std_code,
-            into_status,
-            intoing_qty,
-            intoing_amt,
-            into_qty,
-            into_amt,
-            return_qty,
-            return_amt,
-            remarks,
-            inv_id,
-            cost_price,
-            cost_amt,
-            out_qty,
-            inv_qty,
-            cp_id,
-            op_app_code,
-        </trim>
-        )
-        values
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-            <trim suffixOverrides=",">
-                #{item.intoId}::uuid,
-                #{item.intoType},
-                #{item.fromId}::uuid,
-                #{item.fromItemId}::uuid,
-                #{item.itemIndex},
-                #{item.skuId}::uuid,
-                #{item.itemQty},
-                #{item.priceInto},
-                #{item.itemAmt},
-                #{item.nonStdCode},
-                #{item.intoStatus},
-                #{item.intoingQty},
-                #{item.intoingAmt},
-                #{item.intoQty},
-                #{item.intoAmt},
-                #{item.returnQty},
-                #{item.returnAmt},
-                #{item.remarks},
-                #{item.invId}::uuid,
-                #{item.costPrice},
-                #{item.costAmt},
-                #{item.outQty},
-                #{item.invQty},
-                #{item.cpId},
-                #{item.opAppCode},
-            </trim>
-            )
-        </foreach>
-    </insert>
-</mapper>

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

@@ -2,13 +2,33 @@ package com.dk.mdm.mapper.ivt;
 
 import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.response.mst.DictionaryDataResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  入库单 Mapper
 */
 @Repository
 public interface InboundMapper extends BaseMapper<Inbound>{
+
+
+
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    List<DictionaryDataResponse> selectInboundAndItem(InboundQuery inboundQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    Long selectInboundAndItemCountByCond(InboundQuery inboundQuery);
 	
 }
 

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

@@ -5,45 +5,122 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        into_id, into_no, into_type, from_id, from_no, org_id, staff_id, cus_id, sup_id, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, into_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
+        into_id
+        , into_no, into_type, from_id, from_no, org_id, staff_id, cus_id, sup_id, into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt, into_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>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.response.ivt.InboundResponse">
         <id column="into_id" property="intoId"/>
-                <result column="into_no" property="intoNo"/>
-                <result column="into_type" property="intoType"/>
-                <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
-                <result column="from_no" property="fromNo"/>
-                <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
-                <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
-                <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
-                <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
-                <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="return_qty" property="returnQty"/>
-                <result column="return_amt" property="returnAmt"/>
-            <result column="into_date" property="intoDate" typeHandler="TimestampTypeHandler"/>
-                <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="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
-                <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
-                <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"/>
+        <result column="into_no" property="intoNo"/>
+        <result column="into_type" property="intoType"/>
+        <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
+        <result column="from_no" property="fromNo"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
+        <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
+        <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="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="into_date" property="intoDate" typeHandler="TimestampTypeHandler"/>
+        <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="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
+        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
+        <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="Base_Column_List_Item_Response">
+        tpi.into_id
+        , tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id, tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt,
+        tpi.into_qty, tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths, tpi.make_staff, tpi.make_time,
+        tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id
+    </sql>
+    <!--    关联明细映射-->
+    <resultMap id="BaseResultMapItemResponse" type="com.dk.mdm.model.response.ivt.InboundResponse">
+        <id column="into_id" property="intoId"/>
+        <result column="into_no" property="intoNo"/>
+        <result column="into_type" property="intoType"/>
+        <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
+        <result column="from_no" property="fromNo"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
+        <result column="sup_id" property="supId" typeHandler="UuidTypeHandler"/>
+        <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="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="into_date" property="intoDate" typeHandler="TimestampTypeHandler"/>
+        <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="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
+        <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <collection property="inboundItemList" resultMap="inboundItemListMap" columnPrefix="list_"/>
+    </resultMap>
+
+    <!--    关联映射-->
+    <resultMap id="inboundItemListMap" type="java.util.Map">
+        <result column="item_id" property="itemId" typeHandler="UuidTypeHandler"/>
+        <result column="into_id" property="intoId" typeHandler="UuidTypeHandler"/>
+        <result column="into_type" property="intoType"/>
+        <result column="from_id" property="fromId" typeHandler="UuidTypeHandler"/>
+        <result column="from_item_id" property="fromItemId" 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_into" property="priceInto"/>
+        <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="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="remarks" property="remarks"/>
+        <result column="inv_id" property="invId" typeHandler="UuidTypeHandler"/>
+        <result column="cost_price" property="costPrice"/>
+        <result column="cost_amt" property="costAmt"/>
+        <result column="out_qty" property="outQty"/>
+        <result column="inv_qty" property="invQty"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="sku_code" property="skuCode"/>
+        <result column="sku_name" property="skuName"/>
+        <result column="sku_model" property="skuModel"/>
+        <result column="price_purchase" property="pricePurchase"/>
+        <result column="reject_qty" property="rejectQty"/>
+        <result column="sku_images" property="skuImages"  typeHandler="JsonTypeHandler"/>
+    </resultMap>
+
+
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
@@ -143,6 +220,85 @@
         </where>
     </sql>
 
+
+    <sql id="Condition_Join">
+        <where>
+            <if test="intoNo != null and intoNo != ''">
+                AND tpi.into_no = #{intoNo}
+            </if>
+            <if test="intoType != null and intoType != ''">
+                AND tpi.into_type = #{intoType}
+            </if>
+            <if test="fromId != null and fromId != ''">
+                AND tpi.from_id = #{fromId}::uuid
+            </if>
+            <if test="fromNo != null and fromNo != ''">
+                AND tpi.from_no = #{fromNo}
+            </if>
+            <if test="orgId != null and orgId != ''">
+                AND tpi.org_id = #{orgId}::uuid
+            </if>
+            <if test="staffId != null and staffId != ''">
+                AND tpi.staff_id = #{staffId}::uuid
+            </if>
+            <if test="cusId != null and cusId != ''">
+                AND tpi.cus_id = #{cusId}::uuid
+            </if>
+            <if test="supId != null and supId != ''">
+                AND tpi.sup_id = #{supId}::uuid
+            </if>
+            <if test="intoStatus != null and intoStatus != ''">
+                AND tpi.into_status = #{intoStatus}
+            </if>
+            <if test="intoingQty != null">
+                AND tpi.intoing_qty = #{intoingQty}
+            </if>
+            <if test="intoingAmt != null">
+                AND tpi.intoing_amt = #{intoingAmt}
+            </if>
+            <if test="intoQty != null">
+                AND tpi.into_qty = #{intoQty}
+            </if>
+            <if test="intoAmt != null">
+                AND tpi.into_amt = #{intoAmt}
+            </if>
+            <if test="returnQty != null">
+                AND tpi.return_qty = #{returnQty}
+            </if>
+            <if test="returnAmt != null">
+                AND tpi.return_amt = #{returnAmt}
+            </if>
+            <if test="intoDate != null">
+                AND tpi.into_date = #{intoDate}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                AND tpi.remarks = #{remarks}
+            </if>
+            <if test="annexPaths != null and annexPaths != ''">
+                AND tpi.annex_paths = #{annexPaths}
+            </if>
+            <if test="makeStaff != null and makeStaff != ''">
+                AND tpi.make_staff = #{makeStaff}
+            </if>
+            <if test="makeTime != null">
+                AND tpi.make_time = #{makeTime}
+            </if>
+            <if test="receivableId != null and receivableId != ''">
+                AND tpi.receivable_id = #{receivableId}
+            </if>
+            <if test="payableId != null and payableId != ''">
+                AND tpi.payable_id = #{payableId}
+            </if>
+            <if test="flgValid != null">
+                AND tpi.flg_valid = #{flgValid}
+            </if>
+            <if test="cpId != null">
+                AND tpi.cp_id = #{cpId}
+            </if>
+
+        </where>
+    </sql>
+
     <sql id="idsForeach">
         <!-- 根据主键intoId批量操作 -->
         WHERE into_id in
@@ -155,7 +311,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -166,7 +322,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         <include refid="Condition"/>
     </select>
 
@@ -174,7 +330,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         WHERE into_id = #{intoId}::uuid
     </select>
 
@@ -182,7 +338,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         WHERE into_id = #{intoId}
         for update
     </select>
@@ -191,13 +347,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_inbound
+        FROM dkic_b.t_psi_inbound
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_psi_inbound
+        insert into dkic_b.t_psi_inbound
         (
         <trim suffixOverrides=",">
             into_no,
@@ -258,4 +414,67 @@
             )
         </foreach>
     </insert>
+
+
+    <sql id="Base_Column_List_Item_Response_Join">
+        tpii
+        .
+        item_id
+        AS list_item_id,
+        tpii.into_id AS list_into_id,
+        tpii.into_type AS list_into_type,
+        tpii.from_id AS list_from_id,
+        tpii.from_item_id AS list_from_item_id,
+        tpii.item_index AS list_item_index,
+        tpii.sku_id AS list_sku_id,
+        tpii.item_qty AS list_item_qty,
+        tpii.price_into AS list_price_into,
+        tpii.item_amt AS list_item_amt,
+        tpii.non_std_code AS list_non_std_code,
+        tpii.into_status AS list_into_status,
+        tpii.intoing_qty AS list_intoing_qty,
+        tpii.intoing_amt AS list_intoing_amt,
+        tpii.into_qty AS list_into_qty,
+        tpii.into_amt AS list_into_amt,
+        tpii.return_qty AS list_return_qty,
+        tpii.return_amt AS list_return_amt,
+        tpii.remarks AS list_remarks,
+        tpii.inv_id AS list_inv_id,
+        tpii.cost_price AS list_cost_price,
+        tpii.cost_amt AS list_cost_amt,
+        tpii.out_qty AS list_out_qty,
+        tpii.inv_qty AS list_inv_qty,
+        tpii.flg_valid AS list_flg_valids,
+        tpii.cp_id AS list_cp_id,
+        tmgs.sku_code AS  list_sku_code,
+        tmgs.sku_name AS  list_sku_name,
+        tmgs.sku_model AS  list_sku_model,
+        tmgs.price_purchase AS  list_price_purchase,
+        tmgs.sku_images AS  list_sku_images,
+
+        ( tpii.into_qty - tpii.return_qty)  AS list_reject_qty
+    </sql>
+
+
+    <!-- 查询表t_psi_inbound，（条件查询+分页）列表 -->
+    <select id="selectInboundAndItem" resultMap="BaseResultMapItemResponse">
+        SELECT
+        <include refid="Base_Column_List_Item_Response"/>,
+        <include refid="Base_Column_List_Item_Response_Join"/>
+        FROM dkic_b.t_psi_inbound  tpi
+        left join dkic_b.t_psi_inbound_item tpii  on tpi.into_id = tpii.into_id
+        left join  dkic_b.t_mst_goods_sku  tmgs on tmgs.sku_id = tpii.sku_id
+        <include refid="Condition_Join"/>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表t_psi_inbound，（条件查询）个数 -->
+    <select id="selectInboundAndItemCountByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM dkic_b.t_psi_inbound tpi
+        <include refid="Condition_Join"/>
+    </select>
 </mapper>

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

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.alibaba.fastjson.JSONObject;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.time.LocalDateTime;
 
@@ -41,7 +42,6 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
     /**
      * 入库单ID
      */
-    @TableId(value = "into_id", type = IdType.AUTO)
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -177,9 +177,9 @@ public class Inbound extends PageInfo<Inbound> implements Serializable {
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**

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

@@ -1,332 +0,0 @@
-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_inbound_item", autoResultMap = true)
-@ApiModel(value="实体类：入库明细", description="表名：t_psi_inbound_item")
-public class InboundItem extends PageInfo<InboundItem> 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 intoId;
-
-
-    /**
-     * 入库类型 (【系统字典】采购入库、销退入库、其他入库)
-     */
-    @Excel(name = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
-    @ApiModelProperty(value = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
-    private String intoType;
-
-
-    /**
-     * 来源单ID (采购订单、出库退货)
-     */
-    @Excel(name = "来源单ID (采购订单、出库退货)")
-    @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String fromId;
-
-
-    /**
-     * 来源单明细ID (采购订单、出库退货)
-     */
-    @Excel(name = "来源单明细ID (采购订单、出库退货)")
-    @ApiModelProperty(value = "来源单明细ID (采购订单、出库退货)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String fromItemId;
-
-
-    /**
-     * 商品顺序
-     */
-    @Excel(name = "商品顺序")
-    @ApiModelProperty(value = "商品顺序")
-    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 priceInto;
-
-
-    /**
-     * 入库金额 (商品数量*入库价)
-     */
-    @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 BigDecimal returnQty;
-
-
-    /**
-     * 已入库退货金额
-     */
-    @Excel(name = "已入库退货金额")
-    @ApiModelProperty(value = "已入库退货金额")
-    private BigDecimal returnAmt;
-
-
-    /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-
-
-    /**
-     * 库存ID
-     */
-    @Excel(name = "库存ID")
-    @ApiModelProperty(value = "库存ID")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String invId;
-
-
-    /**
-     * 成本单价
-     */
-    @Excel(name = "成本单价")
-    @ApiModelProperty(value = "成本单价")
-    private BigDecimal costPrice;
-
-
-    /**
-     * 成本金额
-     */
-    @Excel(name = "成本金额")
-    @ApiModelProperty(value = "成本金额")
-    private BigDecimal costAmt;
-
-
-    /**
-     * 出库数量
-     */
-    @Excel(name = "出库数量")
-    @ApiModelProperty(value = "出库数量")
-    private BigDecimal outQty;
-
-
-    /**
-     * 库存数量 (库存数量=商品数量-出库数量)
-     */
-    @Excel(name = "库存数量 (库存数量=商品数量-出库数量)")
-    @ApiModelProperty(value = "库存数量 (库存数量=商品数量-出库数量)")
-    private BigDecimal invQty;
-
-
-    /**
-     * 有效标识 (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/InboundItemQuery.java

@@ -1,9 +1,7 @@
 package com.dk.mdm.model.query.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -42,7 +40,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 明细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/query/ivt/InboundQuery.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -180,9 +181,9 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**

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

@@ -1,9 +1,7 @@
 package com.dk.mdm.model.response.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -42,7 +40,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 明细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/response/ivt/InboundResponse.java

@@ -22,7 +22,9 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  *  入库单
@@ -180,9 +182,9 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**
@@ -328,7 +330,7 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
-
+    private List<InboundItemResponse> inboundItemList;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -44,13 +44,14 @@ public class IntoReturnItemResponse  implements Serializable {
     private String itemId;
 
 
-    /**
-     * 退货单ID
-     */
-    @Excel(name = "退货单ID")
-    @ApiModelProperty(value = "退货单ID")
+
+    private String fromId;
+
+    private String intoType;
+
+
     @TableField(typeHandler = UuidTypeHandler.class)
-    private String returnId;
+    private String fromItemId;
 
 
     /**

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

@@ -1,9 +1,7 @@
 package com.dk.mdm.model.vo.ivt;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dk.common.infrastructure.annotaiton.ExportTitle;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
@@ -42,7 +40,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 明细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/vo/ivt/InboundVO.java

@@ -22,6 +22,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -180,9 +181,9 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
      */
     @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime intoDate;
+    private LocalDate intoDate;
 
 
     /**

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

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

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

@@ -1,13 +1,20 @@
 package com.dk.mdm.service.ivt;
 
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.mdm.mapper.ivt.InboundMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.ivt.InboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+
+
 @Service
 @Transactional
 public class InboundService extends BaseService<Inbound> {
@@ -20,4 +27,18 @@ public class InboundService extends BaseService<Inbound> {
 	@Autowired
 	private InboundMapper inboundMapper;
 
+
+
+
+	/**
+	 * @desc : 查看来源单据,总单加明细  采购退货用
+	 * @author : 于继渤
+	 * @date : 2024/3/6 10:36
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<InboundResponse>> selectInboundAndItem(InboundQuery inboundQuery) {
+		return super.mergeListWithCount(inboundQuery, inboundMapper.selectInboundAndItem(inboundQuery),
+				inboundMapper.selectInboundAndItemCountByCond(inboundQuery));
+	}
+
 }