入库出库

src/main/java/com/dk/mdm/controller/ivt/InboundSaleReturnController.java → src/main/java/com/dk/mdm/controller/ivt/InboundPurchaseReturnController.java

@@ -8,8 +8,7 @@ import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.mdm.model.query.ivt.InboundQuery;
 import com.dk.mdm.model.response.ivt.InboundResponse;
 import com.dk.mdm.model.vo.ivt.InboundVO;
-import com.dk.mdm.service.ivt.InboundPurchaseService;
-import com.dk.mdm.service.ivt.InboundSaleReturnService;
+import com.dk.mdm.service.ivt.InboundPurchaseReturnService;
 import com.dk.mdm.service.ivt.InboundService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,22 +18,19 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 
-@Api(tags = "销售退货入库单API接口")
+@Api(tags = "采购退货入库单API接口")
 @RestController
 @RequestMapping("/ivt/inbound_sale_return")
-public class InboundSaleReturnController {
+public class InboundPurchaseReturnController {
 
     public BaseService<Inbound> getService() {
-        return inboundSaleReturnService;
+        return inboundPurchaseReturnService;
     }
 
     @Autowired
-    private InboundSaleReturnService inboundSaleReturnService;
+    private InboundPurchaseReturnService inboundPurchaseReturnService;
 
 
-    @Autowired
-    private InboundService inboundService;
-
 
 
     /**
@@ -45,54 +41,54 @@ public class InboundSaleReturnController {
     @ApiOperation(value = "条件查询", notes = "条件查询")
     @PostMapping({"select_inbound_and_item"})
     public ResponseResultVO<PageList<InboundResponse>> selectInboundAndItem(@RequestBody InboundQuery inboundQuery) {
-        return inboundSaleReturnService.selectInboundAndItem(inboundQuery);
+        return inboundPurchaseReturnService.selectInboundAndItem(inboundQuery);
     }
 
 
 
     /**
-     * @desc   : 销售退货入库新建
+     * @desc   : 采购退货入库新建
      * @date   : 2024/3/7 14:00
      * @author : 寇珊珊
      */
     @ApiOperation(
-            value = "销售退货入库新建",
-            notes = "销售退货入库新建"
+            value = "采购退货入库新建",
+            notes = "采购退货入库新建"
     )
-    @PostMapping({"sale_return_inbound_insert"})
-    public ResponseResultVO<?> saleReturnInboundInsert(@Valid @RequestBody InboundVO inboundVO) {
-        return inboundSaleReturnService.saleReturnInboundInsert(inboundVO);
+    @PostMapping({"purchase_return_inbound_insert"})
+    public ResponseResultVO<?> purchaseReturnInboundInsert(@Valid @RequestBody InboundVO inboundVO) {
+        return inboundPurchaseReturnService.purchaseReturnInboundInsert(inboundVO);
     }
 
 
     /**
-     * @desc   : 销售退货入库办理
+     * @desc   : 采购退货入库办理
      * @date   : 2024/3/7 15:34
      * @author : 寇珊珊
      */
     @ApiOperation(
-            value = "销售退货入库办理",
-            notes = "销售退货入库办理"
+            value = "采购退货入库办理",
+            notes = "采购退货入库办理"
     )
     @PostMapping({"sale_return_handle_inbound"})
     public ResponseResultVO<?> saleReturnHandleInbound(@RequestBody InboundVO inboundVO) {
-        return inboundSaleReturnService.saleReturnHandleInbound(inboundVO);
+        return inboundPurchaseReturnService.saleReturnHandleInbound(inboundVO);
     }
 
 
 
     /**
-     * @desc   : 销售退货入库撤销
+     * @desc   : 采购退货入库撤销
      * @date   : 2024/3/7 17:06
      * @author : 寇珊珊
      */
     @ApiOperation(
-            value = "销售退货入库撤销",
-            notes = "销售退货入库撤销"
+            value = "采购退货入库撤销",
+            notes = "采购退货入库撤销"
     )
     @PostMapping({"sale_return_inbound_cancel"})
     public ResponseResultVO<?> saleReturnInboundCancel(@RequestBody InboundVO inboundVO) {
-        return inboundSaleReturnService.saleReturnInboundCancel(inboundVO);
+        return inboundPurchaseReturnService.saleReturnInboundCancel(inboundVO);
     }
 
 
@@ -104,6 +100,6 @@ public class InboundSaleReturnController {
     @ApiOperation(value = "获取单据信息（编辑用）", notes = "获取单据信息（编辑用）")
     @PostMapping({"select_by_update/{id}"})
     public ResponseResultVO<?> selectByUpdate(@PathVariable String id) {
-        return inboundSaleReturnService.selectByUpdate(id);
+        return inboundPurchaseReturnService.selectByUpdate(id);
     }
 }

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

@@ -0,0 +1,109 @@
+package com.dk.mdm.controller.ivt;
+
+
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
+import com.dk.common.service.BaseService;
+import com.dk.mdm.model.pojo.ivt.Outbound;
+import com.dk.mdm.model.query.ivt.OutboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
+import com.dk.mdm.model.vo.ivt.OutboundVO;
+import com.dk.mdm.service.ivt.OutboundSaleReturnService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+
+@Api(tags = "销售退货出库单API接口")
+@RestController
+@RequestMapping("/ivt/outbound_sale_return")
+public class OutboundSaleReturnController {
+
+    public BaseService<Outbound> getService() {
+        return outboundSaleReturnService;
+    }
+
+    @Autowired
+    private OutboundSaleReturnService outboundSaleReturnService;
+
+
+    /**
+     * @desc : 条件查询
+     * @date : 2024/3/18 15:23
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "条件查询", notes = "条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<InboundResponse>> selectByCond(@RequestBody OutboundQuery outboundQuery) {
+        return outboundSaleReturnService.selectByCond(outboundQuery);
+    }
+
+    /**
+     * @desc : 明细信息条件查询
+     * @date : 2024/3/18 15:23
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "明细信息条件查询", notes = "明细信息条件查询")
+    @PostMapping({"select_outbound_sale_return_item_info_by_id/{id}"})
+    public ResponseResultVO<Map<String, Object>> selectOutBoundSaleReturnItemInfoById(@PathVariable String id) {
+        return outboundSaleReturnService.selectOutBoundSaleReturnItemInfoById(id);
+    }
+
+    /**
+     * @desc :  销售退货出库新建
+     * @date : 2024/3/18 15:22
+     * @author : 寇珊珊
+     */
+    @ApiOperation(
+            value = "销售退货出库新建",
+            notes = "销售退货出库新建"
+    )
+    @PostMapping({"sale_return_outbound_insert"})
+    public ResponseResultVO<?> saleReturnOutboundInsert(@Valid @RequestBody OutboundVO outboundVO) {
+        return outboundSaleReturnService.saleReturnOutboundInsert(outboundVO);
+    }
+
+    /**
+     * @desc : 销售退货出库办理
+     * @date : 2024/3/18 15:22
+     * @author : 寇珊珊
+     */
+    @ApiOperation(
+            value = "销售退货出库办理",
+            notes = "销售退货出库办理"
+    )
+    @PostMapping({"sale_return_handle_outbound"})
+    public ResponseResultVO<?> saleReturnHandleOutbound(@Valid @RequestBody OutboundVO outboundVO) {
+        return outboundSaleReturnService.saleReturnHandleOutbound(outboundVO);
+    }
+
+    /**
+     * @desc : 销售退货出库撤销
+     * @date : 2024/3/18 15:22
+     * @author : 寇珊珊
+     */
+    @ApiOperation(
+            value = "销售退货出库撤销",
+            notes = "销售退货出库撤销"
+    )
+    @PostMapping({"sale_return_outbound_cancel"})
+    public ResponseResultVO<?> saleReturnOutboundCancel(@Valid @RequestBody OutboundVO outboundVO) {
+        return outboundSaleReturnService.saleReturnOutboundCancel(outboundVO);
+    }
+
+    /**
+     * @desc : 获取单据信息（编辑用）
+     * @date : 2024/3/18 15:22
+     * @author : 寇珊珊
+     */
+    @ApiOperation(value = "获取单据信息（编辑用）", notes = "获取单据信息（编辑用）")
+    @PostMapping({"select_by_update/{id}"})
+    public ResponseResultVO<?> selectByUpdate(@PathVariable String id) {
+        return outboundSaleReturnService.selectByUpdate(id);
+    }
+
+}

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

@@ -93,6 +93,20 @@
         <result column="cp_id" property="cpId"/>
         <result column="into_reason" property="intoReason" typeHandler="UuidTypeHandler"/>
         <result column="into_reason_name" property="intoReasonName" />
+        <result column="org_name" property="orgName" />
+        <result column="staff_name" property="staffName" />
+        <result column="cus_code" property="cusCode" />
+        <result column="cus_name" property="cusName" />
+        <result column="cus_phone" property="cusPhone" />
+        <result column="contact_phone" property="contactPhone" />
+        <result column="contact_name" property="contactName" />
+        <result column="address_area" property="addressArea" typeHandler="JsonTypeHandler"/>
+        <result column="address_name" property="addressName"/>
+        <result column="address_no" property="addressNo"/>
+        <result column="address_gcj02" property="addressGcj02" typeHandler="JsonTypeHandler"/>
+        <result column="address_full" property="addressFull"/>
+        <result column="channel_name" property="channelName" />
+        <result column="cus_from_name" property="cusFromName" />
     </resultMap>
 
 

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

@@ -142,27 +142,6 @@
             <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>
 
@@ -343,21 +322,6 @@
     <update id="updateById" parameterType="com.dk.mdm.model.pojo.ivt.IntoReturnItem">
         update dkic_b.t_psi_into_return_item
         <set>
-            <if test=" et!=null and et.returnId != null">
-                return_id = #{et.returnId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.intoId != null">
-                into_id = #{et.intoId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.intoItemId != null">
-                into_item_id = #{et.intoItemId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.purId != null">
-                pur_id = #{et.purId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.purItemId != null">
-                pur_item_id = #{et.purItemId,typeHandler=UuidTypeHandler},
-            </if>
             <if test=" et!=null and et.itemIndex != null">
                 item_index = #{et.itemIndex,jdbcType=INTEGER},
             </if>

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

@@ -118,11 +118,9 @@
             <if test="returnType != null and returnType != ''">
                 AND return_type = #{returnType}
             </if>
-
             <if test="purId != null and purId != ''">
                 AND pur_id = #{purId}
             </if>
-
             <if test="purNo != null and purNo != ''">
                 AND pur_no = #{purNo}
             </if>
@@ -201,27 +199,6 @@
             <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>
 
@@ -500,24 +477,9 @@
     <update id="updateById" parameterType="com.dk.mdm.model.pojo.ivt.IntoReturn">
         update dkic_b.t_psi_into_return
         <set>
-            <if test=" et!=null and et.returnNo != null">
-                return_no = #{et.returnNo,jdbcType=VARCHAR},
-            </if>
             <if test=" et!=null and et.returnType != null">
                 return_type = #{et.returnType,jdbcType=VARCHAR},
             </if>
-            <if test=" et!=null and et.intoId != null">
-                into_id = #{et.intoId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.purId != null">
-                pur_id = #{et.purId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.intoNo != null">
-                into_no = #{et.intoNo,jdbcType=VARCHAR},
-            </if>
-            <if test=" et!=null and et.purNo != null">
-                pur_no = #{et.purNo,jdbcType=VARCHAR},
-            </if>
             <if test=" et!=null and et.orgId != null">
                 org_id = #{et.orgId,typeHandler=UuidTypeHandler},
             </if>

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

@@ -3,7 +3,9 @@ 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.InboundItemResponse;
 import com.dk.mdm.model.response.ivt.OutboundItemResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -40,5 +42,15 @@ public interface OutboundItemMapper extends BaseMapper<OutboundItem>{
      * @date   : 2024-03-12 9:36
      */
     List<OutboundItemResponse> selectByCondForOutEdit(String id);
+
+
+    /**
+     * @desc   : 根据id查询
+     * @date   : 2024/3/18 13:41
+     * @author : 寇珊珊
+     */
+    OutboundItemResponse selectById(@Param("itemId") String itemId);
+
+
 }
 

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

@@ -8,6 +8,13 @@
         item_id, out_id, out_type, from_id, from_item_id, item_index, sku_id, price_out, non_std_code, out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks, inv_id, cost_price, cost_amt, 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>
 
+    <sql id="Base_Column_List_Response">
+        tpoi.item_id, tpoi.out_id, tpoi.out_type, tpoi.from_id, tpoi.from_item_id, tpoi.item_index,
+        tpoi.sku_id, tpoi.price_out, tpoi.non_std_code, tpoi.out_status, tpoi.outing_qty, tpoi.outing_amt,
+        tpoi.out_qty, tpoi.out_amt, tpoi.return_qty, tpoi.return_amt, tpoi.remarks, tpoi.inv_id,
+        tpoi.cost_price, tpoi.cost_amt, tpoi.flg_valid, tpoi.cp_id
+    </sql>
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.ivt.OutboundItem">
         <id column="item_id" property="itemId"/>
@@ -78,67 +85,67 @@
     <sql id="Condition">
         <where>
             <if test="outId != null and outId != ''">
-                AND t.out_id = #{outId}::uuid
+                AND tpoi.out_id = #{outId}::uuid
             </if>
             <if test="outType != null and outType != ''">
-                AND t.out_type = #{outType}
+                AND tpoi.out_type = #{outType}
             </if>
             <if test="fromId != null and fromId != ''">
-                AND t.from_id = #{fromId}
+                AND tpoi.from_id = #{fromId}
             </if>
             <if test="fromItemId != null and fromItemId != ''">
-                AND t.from_item_id = #{fromItemId}
+                AND tpoi.from_item_id = #{fromItemId}
             </if>
             <if test="itemIndex != null">
-                AND t.item_index = #{itemIndex}
+                AND tpoi.item_index = #{itemIndex}
             </if>
             <if test="skuId != null and skuId != ''">
-                AND t.sku_id = #{skuId}
+                AND tpoi.sku_id = #{skuId}
             </if>
             <if test="priceOut != null">
-                AND t.price_out = #{priceOut}
+                AND tpoi.price_out = #{priceOut}
             </if>
             <if test="nonStdCode != null and nonStdCode != ''">
-                AND t.non_std_code = #{nonStdCode}
+                AND tpoi.non_std_code = #{nonStdCode}
             </if>
             <if test="outStatus != null and outStatus != ''">
-                AND t.out_status = #{outStatus}
+                AND tpoi.out_status = #{outStatus}
             </if>
             <if test="outingQty != null">
-                AND t.outing_qty = #{outingQty}
+                AND tpoi.outing_qty = #{outingQty}
             </if>
             <if test="outingAmt != null">
-                AND t.outing_amt = #{outingAmt}
+                AND tpoi.outing_amt = #{outingAmt}
             </if>
             <if test="outQty != null">
-                AND t.out_qty = #{outQty}
+                AND tpoi.out_qty = #{outQty}
             </if>
             <if test="outAmt != null">
-                AND t.out_amt = #{outAmt}
+                AND tpoi.out_amt = #{outAmt}
             </if>
             <if test="returnQty != null">
-                AND t.return_qty = #{returnQty}
+                AND tpoi.return_qty = #{returnQty}
             </if>
             <if test="returnAmt != null">
-                AND t.return_amt = #{returnAmt}
+                AND tpoi.return_amt = #{returnAmt}
             </if>
             <if test="remarks != null and remarks != ''">
-                AND t.remarks = #{remarks}
+                AND tpoi.remarks = #{remarks}
             </if>
             <if test="invId != null and invId != ''">
-                AND t.inv_id = #{invId}
+                AND tpoi.inv_id = #{invId}
             </if>
             <if test="costPrice != null">
-                AND t.cost_price = #{costPrice}
+                AND tpoi.cost_price = #{costPrice}
             </if>
             <if test="costAmt != null">
-                AND t.cost_amt = #{costAmt}
+                AND tpoi.cost_amt = #{costAmt}
             </if>
             <if test="flgValid != null">
-                AND t.flg_valid = #{flgValid}
+                AND tpoi.flg_valid = #{flgValid}
             </if>
             <if test="cpId != null">
-                AND t.cp_id = #{cpId}
+                AND tpoi.cp_id = #{cpId}
             </if>
         </where>
     </sql>
@@ -153,38 +160,38 @@
 
     <!-- 查询表t_psi_outbound_item，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMapResponse">
-        SELECT t.item_id,
-               t.out_id,
-               t.out_type,
-               t.from_id,
-               t.from_item_id,
-               t.item_index,
-               t.sku_id,
+        SELECT tpoi.item_id,
+               tpoi.out_id,
+               tpoi.out_type,
+               tpoi.from_id,
+               tpoi.from_item_id,
+               tpoi.item_index,
+               tpoi.sku_id,
                tmgs.sku_code                                    as "skuCode",
                tmgs.sku_model                                   as "skuModel",
                tmgs.sku_name                                    as "skuName",
-               t.price_out,
-               t.non_std_code,
-               t.out_status,
-               t.outing_qty,
-               t.outing_amt,
-               t.out_qty,
-               t.out_amt,
-               t.return_qty,
-               t.return_amt,
-               t.remarks,
-               t.inv_id,
-               t.cost_price,
-               t.cost_amt,
-               t.flg_valid,
-               t.cp_id,
+               tpoi.price_out,
+               tpoi.non_std_code,
+               tpoi.out_status,
+               tpoi.outing_qty,
+               tpoi.outing_amt,
+               tpoi.out_qty,
+               tpoi.out_amt,
+               tpoi.return_qty,
+               tpoi.return_amt,
+               tpoi.remarks,
+               tpoi.inv_id,
+               tpoi.cost_price,
+               tpoi.cost_amt,
+               tpoi.flg_valid,
+               tpoi.cp_id,
                tmw.wh_name                                      as "whName",
                sys.f_get_name_i18n(tdk.kind_name_i18n, #{i18n}) as "outStatusName"
-        FROM t_psi_outbound_item as t
-                 left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = t.sku_id
-                 left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = t.inv_id
+        FROM dkic_b.t_psi_outbound_item as tpoi
+                 left join dkic_b.t_mst_goods_sku tmgs on tmgs.sku_id = tpoi.sku_id
+                 left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
                  left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
-                 left join sys.t_data_kind as tdk on tdk.kind_code = t.out_status
+                 left join sys.t_data_kind as tdk on tdk.kind_code = tpoi.out_status
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -195,23 +202,23 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_psi_outbound_item as t
+        FROM dkic_b.t_psi_outbound_item as tpoi
         <include refid="Condition"/>
     </select>
 
     <!-- 根据主键查询表t_psi_outbound_item的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
+    <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_psi_outbound_item
-        WHERE item_id = #{itemId}::uuid
+        <include refid="Base_Column_List_Response"/>
+        FROM dkic_b.t_psi_outbound_item tpoi
+        WHERE tpoi.item_id = #{itemId}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_outbound_item的一行数据 -->
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_outbound_item
+        FROM dkic_b.t_psi_outbound_item
         WHERE item_id = #{id}::uuid
         for update
     </select>
@@ -220,7 +227,7 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_outbound_item
+        FROM dkic_b.t_psi_outbound_item
         <include refid="idsForeach"/>
         for update
     </select>
@@ -229,13 +236,13 @@
     <select id="selectByZIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_outbound_item
+        FROM dkic_b.t_psi_outbound_item
         WHERE out_id = #{id}::uuid
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_psi_outbound_item
+        insert into dkic_b.t_psi_outbound_item
         (
         <trim suffixOverrides=",">
             out_id,
@@ -293,36 +300,36 @@
 
     <!-- 根据条件进行查询（出库编辑用） -->
     <select id="selectByCondForOutEdit" resultMap="BaseResultMapResponse">
-        SELECT t.item_id,
-               t.out_id,
-               t.from_item_id,
-               t.from_id,
-               t.item_index,
-               t.sku_id,
+        SELECT tpoi.item_id,
+               tpoi.out_id,
+               tpoi.from_item_id,
+               tpoi.from_id,
+               tpoi.item_index,
+               tpoi.sku_id,
                tmgs.sku_code                                  as "skuCode",
                tmgs.sku_model                                 as "skuModel",
                tmgs.sku_name                                  as "skuName",
-               tpoi.item_qty                                  as "orderQty",
-               tpoi.item_qty - tpoi.outing_qty + t.outing_qty as "canOutingQty",
-               t.outing_qty,
-               t.price_out,
-               t.outing_amt,
-               t.out_qty,
-               t.out_amt,
-               t.non_std_code,
-               t.remarks,
-               t.inv_id,
+               tpoi1.item_qty                                  as "orderQty",
+               tpoi1.item_qty - tpoi1.outing_qty + tpoi.outing_qty as "canOutingQty",
+               tpoi.outing_qty,
+               tpoi.price_out,
+               tpoi.outing_amt,
+               tpoi.out_qty,
+               tpoi.out_amt,
+               tpoi.non_std_code,
+               tpoi.remarks,
+               tpoi.inv_id,
                tpi.wh_id                                      as "whId",
                tpi.inv_qty                                    as "invQty",
                tpi.usable_qty                                 as "usableQty",
                tmw.wh_name                                    as "whName"
-        FROM t_psi_outbound_item as t
-                 left join dkic_b.t_psi_order_item as tpoi on tpoi.item_id = t.from_item_id
-                 left join dkic_b.t_mst_goods_sku tmgs on tpoi.sku_id = tmgs.sku_id
-                 left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = t.inv_id
+        FROM dkic_b.t_psi_outbound_item as tpoi
+                 left join dkic_b.t_psi_order_item as tpoi1 on tpoi1.item_id = tpoi.from_item_id
+                 left join dkic_b.t_mst_goods_sku tmgs on tpoi1.sku_id = tmgs.sku_id
+                 left join dkic_b.t_psi_inventory as tpi on tpi.inv_id = tpoi.inv_id
                  left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
-        where t.flg_valid
-          and t.out_id = #{id}::uuid
-        order by t.item_index
+        where tpoi.flg_valid
+          and tpoi.out_id = #{id}::uuid
+        order by tpoi.item_index
     </select>
 </mapper>

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

@@ -2,7 +2,9 @@ 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.query.ivt.InboundQuery;
 import com.dk.mdm.model.query.ivt.OutboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
 import com.dk.mdm.model.response.ivt.OutboundResponse;
 import org.springframework.stereotype.Repository;
 
@@ -33,5 +35,13 @@ public interface OutboundMapper extends BaseMapper<Outbound>{
      * @date   : 2024-03-03 9:25
      */
     OutboundResponse selectById(String id);
+
+
+    /**
+     * @desc   : 根据传入的信息查询数据（销售退货出库办理用）
+     * @date   : 2024/3/18 15:24
+     * @author : 寇珊珊
+     */
+    OutboundResponse selectMessageByOtherQuery(OutboundQuery outboundQuery);
 }
 

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

@@ -8,6 +8,13 @@
         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
     </sql>
 
+    <sql id="Base_Column_List_Response">
+        tpo.out_id, tpo.out_no, tpo.out_type, tpo.from_id, tpo.from_no, tpo.org_id, tpo.staff_id,
+        tpo.cus_id, tpo.sup_id, tpo.out_status, tpo.outing_qty, tpo.outing_amt, tpo.out_qty, tpo.out_amt,
+        tpo.return_qty, tpo.return_amt, tpo.out_date, tpo.remarks, tpo.annex_paths, tpo.make_staff,
+        tpo.make_time, tpo.receivable_id, tpo.payable_id, tpo.flg_valid, tpo.cp_id
+    </sql>
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.ivt.Outbound">
         <id column="out_id" property="outId"/>
@@ -47,37 +54,44 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.ivt.OutboundResponse">
         <id column="out_id" property="outId"/>
-                <result column="out_no" property="outNo"/>
-                <result column="out_type" property="outType"/>
-                <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="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="return_qty" property="returnQty"/>
-                <result column="return_amt" property="returnAmt"/>
-            <result column="out_date" property="outDate" 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="out_no" property="outNo"/>
+        <result column="out_type" property="outType"/>
+        <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="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="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="out_date" property="outDate" 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="org_name" property="orgName"/>
+        <result column="staff_name" property="staffName"/>
+        <result column="cus_code" property="cusCode"/>
+        <result column="cus_name" property="cusName"/>
+        <result column="cus_phone" property="cusPhone"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="contact_name" property="contactName"/>
+        <result column="address_area" property="addressArea" typeHandler="JsonTypeHandler"/>
+        <result column="address_name" property="addressName"/>
+        <result column="address_no" property="addressNo"/>
+        <result column="address_gcj02" property="addressGcj02" typeHandler="JsonTypeHandler"/>
+        <result column="address_full" property="addressFull"/>
+        <result column="channel_name" property="channelName"/>
+        <result column="cus_from_name" property="cusFromName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -186,7 +200,7 @@
         </foreach>
     </sql>
 
-    <!-- 查询表t_psi_outbound，（条件查询+分页）列表 -->
+    <!-- 查询表dkic_b.t_psi_outbound，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT t.out_id,
                t.out_no,
@@ -227,7 +241,7 @@
                t.payable_id,
                t.cp_id,
                t.flg_valid
-        FROM t_psi_outbound as t
+        FROM dkic_b.t_psi_outbound as t
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  Left join dkic_b.t_mst_supplier tmp on tmp.sup_id = t.sup_id
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
@@ -242,16 +256,16 @@
         </if>
     </select>
 
-    <!-- 查询表t_psi_outbound，（条件查询）个数 -->
+    <!-- 查询表dkic_b.t_psi_outbound，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_psi_outbound as t
+        FROM dkic_b.t_psi_outbound as t
                 left join dkic_b.t_mst_customer tmc on t.cus_id = tmc.cus_id
         <include refid="Condition"/>
     </select>
 
-    <!-- 根据主键查询表t_psi_outbound的一行数据 -->
+    <!-- 根据主键查询表dkic_b.t_psi_outbound的一行数据 -->
     <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT t.out_id,
                t.out_no,
@@ -271,14 +285,14 @@
                tmc.contact_phone                                 as "contactPhone",
                tmc.address_full                                  as "addressFull",
                tmdd.data_value                                   as "cusFromName",
-               tpo.address_area,
-               tpo.address_name,
-               tpo.address_no,
-               tpo.address_gcj02,
-               tpo.address_full,
-               tpo.contact_name,
-               tpo.contact_phone,
-               tpo.sales_channel,
+               tpo1.address_area,
+               tpo1.address_name,
+               tpo1.address_no,
+               tpo1.address_gcj02,
+               tpo1.address_full,
+               tpo1.contact_name,
+               tpo1.contact_phone,
+               tpo1.sales_channel,
                tmsc.channel_name                                 as "channelName",
                t.sup_id,
                t.out_status,
@@ -299,9 +313,9 @@
                t.payable_id,
                t.cp_id,
                t.flg_valid
-        FROM t_psi_outbound as t
-                 left join dkic_b.t_psi_order as tpo on tpo.order_id = t.from_id
-                 left join dkic_b.t_mst_sale_channel tmsc on tmsc.channel_id = tpo.sales_channel
+        FROM dkic_b.t_psi_outbound as t
+                 left join dkic_b.t_psi_order as tpo1 on tpo1.order_id = t.from_id
+                 left join dkic_b.t_mst_sale_channel tmsc on tmsc.channel_id = tpo1.sales_channel
                  left join dkic_b.t_mst_org tmo on tmo.org_id = t.org_id
                  left join dkic_b.t_mst_staff tms on tms.staff_id = t.staff_id
                  left join dkic_b.t_mst_staff as makestaff on makestaff.staff_id = t.make_staff
@@ -311,26 +325,26 @@
         WHERE t.out_id = #{id}::uuid
     </select>
 
-    <!-- 根据主键锁定表t_psi_outbound的一行数据 -->
+    <!-- 根据主键锁定表dkic_b.t_psi_outbound的一行数据 -->
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_outbound
+        FROM dkic_b.t_psi_outbound
         WHERE out_id = #{id}::uuid
         for update
     </select>
 
-    <!-- 根据主键锁定表t_psi_outbound的多行数据 -->
+    <!-- 根据主键锁定表dkic_b.t_psi_outbound的多行数据 -->
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_psi_outbound
+        FROM dkic_b.t_psi_outbound
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_psi_outbound
+        insert into dkic_b.t_psi_outbound
         (
         <trim suffixOverrides=",">
             out_no,
@@ -395,4 +409,40 @@
             )
         </foreach>
     </insert>
+
+    <!-- 根据id查询带出销售退货单数据（销售退货出库办理用）-->
+    <select id="selectMessageByOtherQuery" resultMap="BaseResultMapResponse">
+        SELECT
+        <include refid="Base_Column_List_Response"/>
+        ,tmo.org_name
+        ,tms.staff_name
+        ,tmc.cus_code
+        ,tmc.cus_name
+        ,tmc.cus_phone
+        ,tmc.contact_phone
+        ,tmc.contact_name
+        ,tmc.address_area
+        ,tmc.address_name
+        ,tmc.address_no
+        ,tmc.address_gcj02
+        ,tmc.address_full
+        ,tmsc.channel_name
+        ,tmsc.channel_name
+        ,tmsc.channel_name
+        ,tmd.data_value  as cus_from_name
+        FROM dkic_b.t_psi_outbound tpo
+        Left join dkic_b.t_mst_org tmo on tmo.org_id = tpo.org_id
+        Left join dkic_b.t_mst_staff tms on tms.staff_id = tpo.staff_id
+        left join dkic_b.t_mst_customer tmc on tpo.cus_id = tmc.cus_id
+        left join dkic_b.t_mst_sale_channel tmsc on tmc.channel_id = tmsc.channel_id
+        left join dkic_b.t_mst_dictionary_data tmd on tmc.cus_from = tmd.data_id
+        <where>
+            <if test="outId != null and outId != ''">
+                AND tpo.out_id = #{outId}::uuid
+            </if>
+            <if test="outStatus != null and outStatus != ''">
+                AND tpo.out_status = #{outStatus}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.sale.OutReturnItemQuery;
 import com.dk.mdm.model.response.ivt.OutboundItemResponse;
 import com.dk.mdm.model.response.sale.OutReturnItemResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -41,5 +42,12 @@ public interface OutReturnItemMapper extends BaseMapper<OutReturnItem>{
      * @date   : 2024-03-12 11:07
      */
     List<OutReturnItemResponse> selectByCondForReturnEdit(String id);
+
+    /**
+     * @desc   : 根据id查询
+     * @date   : 2024/3/18 13:50
+     * @author : 寇珊珊
+     */
+    OutReturnItemResponse selectById(@Param("itemId") String itemId);
 }
 

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

@@ -8,6 +8,14 @@
         item_id, return_id, out_id, out_item_id, order_id, order_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>
 
+    <sql id="Base_Column_List_Response">
+        tpori.item_id, tpori.return_id, tpori.out_id, tpori.out_item_id, tpori.order_id,
+        tpori.order_item_id, tpori.item_index, tpori.sku_id, tpori.item_qty, tpori.price_std,
+        tpori.amt_std, tpori.price_return, tpori.item_amt, tpori.non_std_code, tpori.into_status,
+        tpori.intoing_qty, tpori.intoing_amt, tpori.into_qty, tpori.into_amt, tpori.remarks,
+        tpori.flg_valid, tpori.cp_id
+    </sql>
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.sale.OutReturnItem">
         <id column="item_id" property="itemId"/>
@@ -197,11 +205,11 @@
     </select>
 
     <!-- 根据主键查询表t_psi_out_return_item的一行数据 -->
-    <select id="selectById" resultMap="BaseResultMap">
+    <select id="selectById" resultMap="BaseResultMapResponse">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM dkic_b.t_psi_out_return_item
-        WHERE item_id = #{itemId}::uuid
+        <include refid="Base_Column_List_Response"/>
+        FROM dkic_b.t_psi_out_return_item  tpori
+        WHERE tpori.item_id = #{itemId}::uuid
     </select>
 
     <!-- 根据主键锁定表t_psi_out_return_item的一行数据 -->
@@ -323,23 +331,8 @@
 
     <!-- 根据id修改-->
     <update id="updateById" parameterType="com.dk.mdm.model.pojo.sale.OutReturnItem">
-        update dkic_b.t_psi_into_return_item
+        update dkic_b.t_psi_out_return_item
         <set>
-            <if test=" et!=null and et.returnId != null">
-                return_id = #{et.returnId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.intoId != null">
-                into_id = #{et.intoId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.intoItemId != null">
-                into_item_id = #{et.intoItemId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.purId != null">
-                pur_id = #{et.purId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.purItemId != null">
-                pur_item_id = #{et.purItemId,typeHandler=UuidTypeHandler},
-            </if>
             <if test=" et!=null and et.itemIndex != null">
                 item_index = #{et.itemIndex,jdbcType=INTEGER},
             </if>
@@ -390,7 +383,7 @@
             </if>
         </set>
         where item_id = #{et.itemId,typeHandler=UuidTypeHandler}
-        and  sum_quantity >= (into_qty + intoing_qty)
+        and  item_qty >= (into_qty + intoing_qty)
     </update>
 
 </mapper>

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

@@ -480,18 +480,9 @@
     <update id="updateById" parameterType="com.dk.mdm.model.pojo.sale.OutReturn">
         update dkic_b.t_psi_out_return
         <set>
-            <if test=" et!=null and et.returnNo != null">
-                return_no = #{et.returnNo,jdbcType=VARCHAR},
-            </if>
             <if test=" et!=null and et.returnType != null">
                 return_type = #{et.returnType,jdbcType=VARCHAR},
             </if>
-            <if test=" et!=null and et.orderId != null">
-                order_id = #{et.orderId,typeHandler=UuidTypeHandler},
-            </if>
-            <if test=" et!=null and et.orderNo != null">
-                order_no = #{et.orderNo,jdbcType=VARCHAR},
-            </if>
             <if test=" et!=null and et.orgId != null">
                 org_id = #{et.orgId,typeHandler=UuidTypeHandler},
             </if>

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

@@ -29,11 +29,12 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("入库单")
 @TableName(value = "t_psi_inbound", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：入库单", description="表名：t_psi_inbound")
-public class Inbound implements Serializable {
+public class Inbound extends PageInfo<Inbound> implements Serializable {
 
     /*
      * 数据库字段

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

@@ -27,11 +27,12 @@ import java.time.LocalDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("入库明细")
 @TableName(value = "t_psi_inbound_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类：入库明细", description="表名：t_psi_inbound_item")
-public class InboundItem implements Serializable {
+public class InboundItem  extends PageInfo<InboundItem> implements Serializable {
 
     /*
      * 数据库字段

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

@@ -1,22 +1,14 @@
 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;
 
@@ -24,14 +16,8 @@ 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 InboundItemQuery extends PageInfo<InboundItemQuery> implements Serializable {
+public class InboundItemQuery extends PageInfo<InboundItemQuery>  {
 
     /*
      * 数据库字段
@@ -48,7 +34,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 入库ID
      */
-    @Excel(name = "入库ID")
     @ApiModelProperty(value = "入库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -57,7 +42,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 入库类型 (【系统字典】采购入库、销退入库、其他入库)
      */
-    @Excel(name = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     @ApiModelProperty(value = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     private String intoType;
 
@@ -65,7 +49,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 来源单ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -74,7 +57,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 来源单明细ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单明细ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单明细ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
@@ -83,7 +65,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 商品顺序
      */
-    @Excel(name = "商品顺序")
     @ApiModelProperty(value = "商品顺序")
     private Integer itemIndex;
 
@@ -91,7 +72,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -100,7 +80,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 入库价
      */
-    @Excel(name = "入库价")
     @ApiModelProperty(value = "入库价")
     private BigDecimal priceInto;
 
@@ -108,7 +87,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 非标号
      */
-    @Excel(name = "非标号")
     @ApiModelProperty(value = "非标号")
     private String nonStdCode;
 
@@ -116,7 +94,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 入库状态 (【系统字典】)
      */
-    @Excel(name = "入库状态 (【系统字典】)")
     @ApiModelProperty(value = "入库状态 (【系统字典】)")
     private String intoStatus;
 
@@ -124,7 +101,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 入库中数量
      */
-    @Excel(name = "入库中数量")
     @ApiModelProperty(value = "入库中数量")
     private BigDecimal intoingQty;
 
@@ -132,7 +108,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 入库中金额
      */
-    @Excel(name = "入库中金额")
     @ApiModelProperty(value = "入库中金额")
     private BigDecimal intoingAmt;
 
@@ -140,7 +115,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 已入库数量
      */
-    @Excel(name = "已入库数量")
     @ApiModelProperty(value = "已入库数量")
     private BigDecimal intoQty;
 
@@ -148,7 +122,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 已入库金额
      */
-    @Excel(name = "已入库金额")
     @ApiModelProperty(value = "已入库金额")
     private BigDecimal intoAmt;
 
@@ -156,7 +129,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 已入库退货数量
      */
-    @Excel(name = "已入库退货数量")
     @ApiModelProperty(value = "已入库退货数量")
     private BigDecimal returnQty;
 
@@ -164,7 +136,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 已入库退货金额
      */
-    @Excel(name = "已入库退货金额")
     @ApiModelProperty(value = "已入库退货金额")
     private BigDecimal returnAmt;
 
@@ -172,7 +143,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -180,7 +150,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 库存ID
      */
-    @Excel(name = "库存ID")
     @ApiModelProperty(value = "库存ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;
@@ -189,7 +158,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 成本单价
      */
-    @Excel(name = "成本单价")
     @ApiModelProperty(value = "成本单价")
     private BigDecimal costPrice;
 
@@ -197,7 +165,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 成本金额
      */
-    @Excel(name = "成本金额")
     @ApiModelProperty(value = "成本金额")
     private BigDecimal costAmt;
 
@@ -205,7 +172,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 出库数量
      */
-    @Excel(name = "出库数量")
     @ApiModelProperty(value = "出库数量")
     private BigDecimal outQty;
 
@@ -213,7 +179,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 库存数量 (库存数量=商品数量-出库数量)
      */
-    @Excel(name = "库存数量 (库存数量=商品数量-出库数量)")
     @ApiModelProperty(value = "库存数量 (库存数量=商品数量-出库数量)")
     private BigDecimal invQty;
 
@@ -221,7 +186,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -229,7 +193,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
@@ -237,7 +200,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 创建时间 (触发器自动处理)
      */
-    @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)
@@ -247,7 +209,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 创建用户 (触发器自动处理)
      */
-    @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opCreateUserId;
@@ -256,7 +217,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 修改时间 (触发器自动处理)
      */
-    @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)
@@ -266,7 +226,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 修改用户 (触发器自动处理)
      */
-    @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opUpdateUserId;
@@ -275,7 +234,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 数据操作应用 (触发器自动处理)
      */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
     private String opAppCode;
 
@@ -283,7 +241,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 数据时间戳 (触发器自动处理)
      */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
     @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -293,7 +250,6 @@ public class InboundItemQuery extends PageInfo<InboundItemQuery> implements Seri
     /**
      * 数据操作数据库用户 (触发器自动处理)
      */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 

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

@@ -1,28 +1,15 @@
 package com.dk.mdm.model.query.ivt;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.alibaba.fastjson.JSONObject;
-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.JsonTypeHandler;
 import com.dk.common.infrastructure.handler.StringListTypeHandler;
 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.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -31,14 +18,8 @@ import java.util.List;
  *  入库单
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("入库单")
-@TableName(value = "t_psi_inbound", autoResultMap = true)
-@ApiModel(value="实体类：入库单", description="表名：t_psi_inbound")
-public class InboundQuery extends PageInfo<InboundQuery> implements Serializable {
+public class InboundQuery extends PageInfo<InboundQuery>{
 
     /*
      * 数据库字段
@@ -47,7 +28,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 入库单ID
      */
-    @TableId(value = "into_id", type = IdType.AUTO)
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -56,7 +36,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 入库单号
      */
-    @Excel(name = "入库单号")
     @ApiModelProperty(value = "入库单号")
     private String intoNo;
 
@@ -64,7 +43,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 入库类型 (【系统字典】采购入库、销退入库、其他入库)
      */
-    @Excel(name = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     @ApiModelProperty(value = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     private String intoType;
 
@@ -84,7 +62,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 来源单ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -93,7 +70,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 来源单号
      */
-    @Excel(name = "来源单号")
     @ApiModelProperty(value = "来源单号")
     private String fromNo;
 
@@ -101,7 +77,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -110,7 +85,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -119,7 +93,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 客户
      */
-    @Excel(name = "客户")
     @ApiModelProperty(value = "客户")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String cusId;
@@ -128,7 +101,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -137,7 +109,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 入库状态 (【系统字典】)
      */
-    @Excel(name = "入库状态 (【系统字典】)")
     @ApiModelProperty(value = "入库状态 (【系统字典】)")
     private String intoStatus;
 
@@ -146,7 +117,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 入库日期
      */
-    @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -156,7 +126,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -165,7 +134,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 制单时间
      */
-    @Excel(name = "制单时间")
     @ApiModelProperty(value = "制单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -176,7 +144,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -184,7 +151,6 @@ public class InboundQuery extends PageInfo<InboundQuery> implements Serializable
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 

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

@@ -24,14 +24,8 @@ 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 {
+public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery>{
 
     /*
      * 数据库字段
@@ -48,7 +42,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 退货单ID
      */
-    @Excel(name = "退货单ID")
     @ApiModelProperty(value = "退货单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String returnId;
@@ -57,7 +50,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 入库单ID
      */
-    @Excel(name = "入库单ID")
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -66,7 +58,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 入库单明细ID
      */
-    @Excel(name = "入库单明细ID")
     @ApiModelProperty(value = "入库单明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoItemId;
@@ -75,7 +66,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 采购订单ID
      */
-    @Excel(name = "采购订单ID")
     @ApiModelProperty(value = "采购订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
@@ -84,7 +74,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 采购明细ID
      */
-    @Excel(name = "采购明细ID")
     @ApiModelProperty(value = "采购明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purItemId;
@@ -93,7 +82,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 商品顺序
      */
-    @Excel(name = "商品顺序")
     @ApiModelProperty(value = "商品顺序")
     private Integer itemIndex;
 
@@ -101,7 +89,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -110,7 +97,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 商品数量
      */
-    @Excel(name = "商品数量")
     @ApiModelProperty(value = "商品数量")
     private BigDecimal itemQty;
 
@@ -118,7 +104,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 标价
      */
-    @Excel(name = "标价")
     @ApiModelProperty(value = "标价")
     private BigDecimal priceStd;
 
@@ -126,7 +111,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 标价金额 (商品数量*标价)
      */
-    @Excel(name = "标价金额 (商品数量*标价)")
     @ApiModelProperty(value = "标价金额 (商品数量*标价)")
     private BigDecimal amtStd;
 
@@ -134,7 +118,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 退货价
      */
-    @Excel(name = "退货价")
     @ApiModelProperty(value = "退货价")
     private BigDecimal priceReturn;
 
@@ -142,7 +125,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 退货金额 (商品数量*退货价)
      */
-    @Excel(name = "退货金额 (商品数量*退货价)")
     @ApiModelProperty(value = "退货金额 (商品数量*退货价)")
     private BigDecimal itemAmt;
 
@@ -150,7 +132,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 非标号
      */
-    @Excel(name = "非标号")
     @ApiModelProperty(value = "非标号")
     private String nonStdCode;
 
@@ -158,7 +139,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 入库状态
      */
-    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
     private String outStatus;
 
@@ -167,7 +147,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -175,7 +154,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -183,7 +161,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -191,7 +168,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -199,7 +175,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -207,7 +182,6 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -215,75 +189,10 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 企业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)

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

@@ -29,14 +29,8 @@ import java.util.List;
  *  入库退货
  */
 @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 {
+public class IntoReturnQuery extends PageInfo<IntoReturnQuery> {
 
     /*
      * 数据库字段
@@ -53,7 +47,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 退货单号
      */
-    @Excel(name = "退货单号")
     @ApiModelProperty(value = "退货单号")
     private String returnNo;
 
@@ -61,7 +54,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 退货类型 (【系统字典】销售退货)
      */
-    @Excel(name = "退货类型 (【系统字典】销售退货)")
     @ApiModelProperty(value = "退货类型 (【系统字典】销售退货)")
     private String returnType;
 
@@ -72,7 +64,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 采购订单
      */
-    @Excel(name = "采购订单")
     @ApiModelProperty(value = "采购订单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
@@ -81,7 +72,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 入库单号
      */
-    @Excel(name = "入库单号")
     @ApiModelProperty(value = "入库单号")
     private String intoNo;
 
@@ -89,7 +79,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 采购订单号
      */
-    @Excel(name = "采购订单号")
     @ApiModelProperty(value = "采购订单号")
     private String purNo;
 
@@ -97,7 +86,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -106,7 +94,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -115,7 +102,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -124,7 +110,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 联系人
      */
-    @Excel(name = "联系人")
     @ApiModelProperty(value = "联系人")
     private String contactName;
 
@@ -132,7 +117,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 联系电话
      */
-    @Excel(name = "联系电话")
     @ApiModelProperty(value = "联系电话")
     private String contactPhone;
 
@@ -140,7 +124,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 送货日期
      */
-    @Excel(name = "送货日期")
     @ApiModelProperty(value = "送货日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -150,7 +133,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 商品总数量
      */
-    @Excel(name = "商品总数量")
     @ApiModelProperty(value = "商品总数量")
     private BigDecimal sumQuantity;
 
@@ -158,7 +140,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 标价合计
      */
-    @Excel(name = "标价合计")
     @ApiModelProperty(value = "标价合计")
     private BigDecimal sumStandard;
 
@@ -166,7 +147,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 合计金额
      */
-    @Excel(name = "合计金额")
     @ApiModelProperty(value = "合计金额")
     private BigDecimal sumAmount;
 
@@ -174,7 +154,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 销售折扣 (合计金额/标价合计)
      */
-    @Excel(name = "销售折扣 (合计金额/标价合计)")
     @ApiModelProperty(value = "销售折扣 (合计金额/标价合计)")
     private BigDecimal saleDiscount;
 
@@ -182,7 +161,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 退货状态 (【系统字典】)
      */
-    @Excel(name = "退货状态 (【系统字典】)")
     @ApiModelProperty(value = "退货状态 (【系统字典】)")
     private String returnStatus;
 
@@ -190,7 +168,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 出库状态 (【系统字典】)
      */
-    @Excel(name = "出库状态 (【系统字典】)")
     @ApiModelProperty(value = "出库状态 (【系统字典】)")
     private String outStatus;
 
@@ -198,7 +175,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -206,7 +182,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -214,7 +189,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -222,7 +196,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -230,7 +203,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 应付金额
      */
-    @Excel(name = "应付金额")
     @ApiModelProperty(value = "应付金额")
     private BigDecimal amtPayable;
 
@@ -238,7 +210,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 还款金额
      */
-    @Excel(name = "还款金额")
     @ApiModelProperty(value = "还款金额")
     private BigDecimal amtHandle;
 
@@ -246,7 +217,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 剩余应付
      */
-    @Excel(name = "剩余应付")
     @ApiModelProperty(value = "剩余应付")
     private BigDecimal amtResidue;
 
@@ -254,7 +224,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -262,7 +231,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 附件 (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;
@@ -271,7 +239,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -280,7 +247,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 制单时间
      */
-    @Excel(name = "制单时间")
     @ApiModelProperty(value = "制单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -290,7 +256,6 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -298,80 +263,18 @@ public class IntoReturnQuery extends PageInfo<IntoReturnQuery> implements Serial
     /**
      * 企业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;
-
 
     @ApiModelProperty(value = "退货单id数组")
     @TableField(typeHandler = UuidListTypeHandler.class)
     private List<String> intoReturnIdList;
 
+
     private String searchText;
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -24,14 +24,8 @@ import java.time.LocalDateTime;
  *  出库明细
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("出库明细")
-@TableName(value = "t_psi_outbound_item", autoResultMap = true)
-@ApiModel(value="实体类：出库明细", description="表名：t_psi_outbound_item")
-public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Serializable {
+public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
 
     /*
      * 数据库字段
@@ -40,7 +34,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 明细ID
      */
-//    @TableId(value = "item_id", type = IdType.AUTO)
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
@@ -49,7 +42,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 出库ID
      */
-    @Excel(name = "出库ID")
     @ApiModelProperty(value = "出库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String outId;
@@ -58,7 +50,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 入库类型 (【系统字典】销售出库、采退出库、其他出库)
      */
-    @Excel(name = "入库类型 (【系统字典】销售出库、采退出库、其他出库)")
     @ApiModelProperty(value = "入库类型 (【系统字典】销售出库、采退出库、其他出库)")
     private String outType;
 
@@ -66,7 +57,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 来源单ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -75,7 +65,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 来源单明细ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单明细ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单明细ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
@@ -84,7 +73,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 商品顺序
      */
-    @Excel(name = "商品顺序")
     @ApiModelProperty(value = "商品顺序")
     private Integer itemIndex;
 
@@ -92,7 +80,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -101,7 +88,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 出库价
      */
-    @Excel(name = "出库价")
     @ApiModelProperty(value = "出库价")
     private BigDecimal priceOut;
 
@@ -109,7 +95,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 非标号
      */
-    @Excel(name = "非标号")
     @ApiModelProperty(value = "非标号")
     private String nonStdCode;
 
@@ -117,7 +102,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 出库状态
      */
-    @Excel(name = "出库状态")
     @ApiModelProperty(value = "出库状态")
     private String outStatus;
 
@@ -125,7 +109,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -133,7 +116,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -141,7 +123,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -149,7 +130,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -157,7 +137,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 已出库退货数量
      */
-    @Excel(name = "已出库退货数量")
     @ApiModelProperty(value = "已出库退货数量")
     private BigDecimal returnQty;
 
@@ -165,7 +144,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 已出库退货金额
      */
-    @Excel(name = "已出库退货金额")
     @ApiModelProperty(value = "已出库退货金额")
     private BigDecimal returnAmt;
 
@@ -173,7 +151,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -181,7 +158,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 库存ID
      */
-    @Excel(name = "库存ID")
     @ApiModelProperty(value = "库存ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;
@@ -190,7 +166,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 成本单价
      */
-    @Excel(name = "成本单价")
     @ApiModelProperty(value = "成本单价")
     private BigDecimal costPrice;
 
@@ -198,7 +173,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 成本金额
      */
-    @Excel(name = "成本金额")
     @ApiModelProperty(value = "成本金额")
     private BigDecimal costAmt;
 
@@ -206,7 +180,6 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -214,75 +187,10 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery> implements Se
     /**
      * 企业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)

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

@@ -28,14 +28,8 @@ import java.util.List;
  *  出库单
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("出库单")
-@TableName(value = "t_psi_outbound", autoResultMap = true)
-@ApiModel(value="实体类：出库单", description="表名：t_psi_outbound")
-public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializable {
+public class OutboundQuery extends PageInfo<OutboundQuery> {
 
     /*
      * 数据库字段
@@ -44,7 +38,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 出库单ID
      */
-//    @TableId(value = "out_id", type = IdType.AUTO)
     @ApiModelProperty(value = "出库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String outId;
@@ -53,7 +46,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 出库单号
      */
-    @Excel(name = "出库单号")
     @ApiModelProperty(value = "出库单号")
     private String outNo;
 
@@ -61,7 +53,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 出库类型 (【系统字典】销售出库、采退出库、其他出库)
      */
-    @Excel(name = "出库类型 (【系统字典】销售出库、采退出库、其他出库)")
     @ApiModelProperty(value = "出库类型 (【系统字典】销售出库、采退出库、其他出库)")
     private String outType;
 
@@ -69,7 +60,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 来源单ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -78,7 +68,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 来源单号
      */
-    @Excel(name = "来源单号")
     @ApiModelProperty(value = "来源单号")
     private String fromNo;
 
@@ -86,7 +75,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -95,7 +83,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -104,7 +91,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 客户
      */
-    @Excel(name = "客户")
     @ApiModelProperty(value = "客户")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String cusId;
@@ -113,7 +99,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -122,7 +107,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 出库状态 (【系统字典】)
      */
-    @Excel(name = "出库状态 (【系统字典】)")
     @ApiModelProperty(value = "出库状态 (【系统字典】)")
     private String outStatus;
 
@@ -130,7 +114,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -138,7 +121,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -146,7 +128,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -154,7 +135,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -162,7 +142,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 已出库退货数量
      */
-    @Excel(name = "已出库退货数量")
     @ApiModelProperty(value = "已出库退货数量")
     private BigDecimal returnQty;
 
@@ -170,7 +149,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 已出库退货金额
      */
-    @Excel(name = "已出库退货金额")
     @ApiModelProperty(value = "已出库退货金额")
     private BigDecimal returnAmt;
 
@@ -178,7 +156,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 出库日期
      */
-    @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -188,7 +165,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -196,7 +172,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 附件 (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;
@@ -205,7 +180,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -214,7 +188,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 制单时间
      */
-    @Excel(name = "制单时间")
     @ApiModelProperty(value = "制单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -224,7 +197,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 应收款单
      */
-    @Excel(name = "应收款单")
     @ApiModelProperty(value = "应收款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String receivableId;
@@ -233,7 +205,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 应付款单
      */
-    @Excel(name = "应付款单")
     @ApiModelProperty(value = "应付款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String payableId;
@@ -242,7 +213,6 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -250,74 +220,9 @@ public class OutboundQuery extends PageInfo<OutboundQuery> implements Serializab
     /**
      * 企业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;
-
     @ApiModelProperty(value = "订单单号")
     private String orderNo;
 

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

@@ -1,39 +1,24 @@
 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;
 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)
+@AllArgsConstructor
 @ExportTitle("入库明细")
-@TableName(value = "t_psi_inbound_item", autoResultMap = true)
-@ApiModel(value="实体类：入库明细", description="表名：t_psi_inbound_item")
-public class InboundItemResponse extends PageInfo<InboundItemResponse> implements Serializable {
+public class InboundItemResponse  {
 
     /*
      * 数据库字段
@@ -50,10 +35,10 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 入库ID
      */
-    @Excel(name = "入库ID")
     @ApiModelProperty(value = "入库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
+
     /**
      * 商品规格
      */
@@ -73,7 +58,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 来源单ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -82,7 +66,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 来源单明细ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单明细ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单明细ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
@@ -99,7 +82,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -188,7 +170,6 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 库存ID
      */
-    @Excel(name = "库存ID")
     @ApiModelProperty(value = "库存ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;
@@ -237,75 +218,11 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 企业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;
-
-    /**
      * 商品编号
      */
     @Excel(name = "商品编号")
@@ -337,7 +254,7 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
     /**
      * 商品型号
      */
-    @Excel(name = "商品品牌简称")
+    @Excel(name = "品牌简称")
     @ApiModelProperty(value = "商品品牌简称")
     private String shortName;
     /*
@@ -349,10 +266,10 @@ public class InboundItemResponse extends PageInfo<InboundItemResponse> implement
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
+
     /**
      * 仓库ID
      */
-    @TableId(value = "wh_id", type = IdType.AUTO)
     @ApiModelProperty(value = "仓库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;

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

@@ -32,14 +32,10 @@ import java.util.List;
  *  入库单
  */
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
+@AllArgsConstructor
 @ExportTitle("入库单")
-@TableName(value = "t_psi_inbound", autoResultMap = true)
-@ApiModel(value="实体类：入库单", description="表名：t_psi_inbound")
-public class InboundResponse extends PageInfo<InboundResponse> implements Serializable {
+public class InboundResponse  {
 
     /*
      * 数据库字段
@@ -48,7 +44,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 入库单ID
      */
-    @TableId(value = "into_id", type = IdType.AUTO)
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -73,7 +68,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 来源单ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -90,7 +84,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -112,7 +105,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 仓库"
      */
-    @Excel(name = "仓库")
     @ApiModelProperty(value = "仓库")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String whId;
@@ -120,13 +112,13 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 收货仓库
      */
+    @Excel(name = "仓库")
     @ApiModelProperty(value = "收货仓库")
     private String whName;
 
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -135,7 +127,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 客户
      */
-    @Excel(name = "客户")
     @ApiModelProperty(value = "客户")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String cusId;
@@ -144,7 +135,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -153,7 +143,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 入库状态 (【系统字典】)
      */
-    @Excel(name = "入库状态 (【系统字典】)")
     @ApiModelProperty(value = "入库状态 (【系统字典】)")
     private String intoStatus;
 
@@ -236,7 +225,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -255,7 +243,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 应收款单
      */
-    @Excel(name = "应收款单")
     @ApiModelProperty(value = "应收款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String receivableId;
@@ -264,7 +251,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 应付款单
      */
-    @Excel(name = "应付款单")
     @ApiModelProperty(value = "应付款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String payableId;
@@ -273,7 +259,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -281,11 +266,11 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
-    @Excel(name = "企业ID")
+
+    @Excel(name = "入库原因")
     @ApiModelProperty(value = "入库原因")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoReason;
@@ -347,6 +332,7 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
      * 关联属性 + 查询条件
      * @TableField(exist = false)
      */
+    @ApiModelProperty(value = "入库单明细")
     private List<InboundItemResponse> inboundItemList;
 
 
@@ -366,7 +352,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     @ApiModelProperty(value = "客户电话")
     private String cusPhone;
 
-    @Excel(name = "行政区划 (a1：省 a2：市 a3：区)")
     @ApiModelProperty(value = "行政区划 (a1：省 a2：市 a3：区)")
     @TableField(typeHandler = JsonTypeHandler.class)
     private JSONObject addressArea;
@@ -379,7 +364,6 @@ public class InboundResponse extends PageInfo<InboundResponse> implements Serial
     @ApiModelProperty(value = "门牌号")
     private String addressNo;
 
-    @Excel(name = "地址坐标(gcj02) (LAT：纬度的值 LON：经度的值)")
     @ApiModelProperty(value = "地址坐标(gcj02) (LAT：纬度的值 LON：经度的值)")
     @TableField(typeHandler = JsonTypeHandler.class)
     private JSONObject addressGcj02;

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

@@ -25,13 +25,10 @@ import java.time.LocalDateTime;
  *  入库退货明细
  */
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@Accessors(chain = true)
+@AllArgsConstructor
 @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 {
+public class IntoReturnItemResponse  {
 
     /*
      * 数据库字段
@@ -46,11 +43,16 @@ public class IntoReturnItemResponse  implements Serializable {
 
 
 
+    @ApiModelProperty(value = "来源单ID (销售订单、入库退货)")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
 
+
+    @ApiModelProperty(value = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     private String intoType;
 
 
+    @ApiModelProperty(value = "来源单明细ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
 
@@ -58,12 +60,12 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 入库单ID
      */
-    @Excel(name = "入库单ID")
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
 
 
+    @ApiModelProperty(value = "退货单Id")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String returnId;
 
@@ -71,7 +73,6 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 入库单明细ID
      */
-    @Excel(name = "入库单明细ID")
     @ApiModelProperty(value = "入库单明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoItemId;
@@ -80,7 +81,6 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 采购订单ID
      */
-    @Excel(name = "采购订单ID")
     @ApiModelProperty(value = "采购订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
@@ -89,7 +89,6 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 采购明细ID
      */
-    @Excel(name = "采购明细ID")
     @ApiModelProperty(value = "采购明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purItemId;
@@ -106,7 +105,6 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -163,8 +161,7 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 入库状态
      */
-    @Excel(name = "出库状态")
-    @ApiModelProperty(value = "入库状态")
+    @ApiModelProperty(value = "出库状态")
     private String outStatus;
 
 
@@ -212,7 +209,6 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -220,7 +216,6 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
@@ -235,21 +230,25 @@ public class IntoReturnItemResponse  implements Serializable {
     @ApiModelProperty(value = "商品名称")
     private String skuName;
 
-
-
+    @Excel(name = "商品型号")
+    @ApiModelProperty(value = "商品型号")
     private String skuModel;
 
-    @Excel(name = "商品图")
     @ApiModelProperty(value = "商品图")
     @TableField(typeHandler = JsonTypeHandler.class)
     private String skuImages;
 
-    @Excel(name = "入库仓库")
+
     @TableField(typeHandler = UuidTypeHandler.class)
     @ApiModelProperty(value = "入库仓库")
     private String whId;
 
 
+    @Excel(name = "仓库名称")
+    @ApiModelProperty(value = "仓库名称")
+    private String whName;
+
+
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -27,13 +27,10 @@ import java.time.LocalDateTime;
  *  入库退货
  */
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@Accessors(chain = true)
+@AllArgsConstructor
 @ExportTitle("入库退货")
-@TableName(value = "t_psi_into_return", autoResultMap = true,schema = "dkic_b")
-@ApiModel(value="实体类：入库退货", description="表名：t_psi_into_return")
-public class IntoReturnResponse  implements Serializable {
+public class IntoReturnResponse  {
 
     /*
      * 数据库字段
@@ -69,7 +66,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 采购订单
      */
-    @Excel(name = "采购订单")
     @ApiModelProperty(value = "采购订单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
@@ -94,7 +90,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -103,7 +98,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -112,7 +106,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -179,7 +172,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 退货状态 (【系统字典】)
      */
-    @Excel(name = "退货状态 (【系统字典】)")
     @ApiModelProperty(value = "退货状态 (【系统字典】)")
     private String returnStatus;
 
@@ -187,7 +179,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 出库状态 (【系统字典】)
      */
-    @Excel(name = "出库状态 (【系统字典】)")
     @ApiModelProperty(value = "出库状态 (【系统字典】)")
     private String outStatus;
 
@@ -268,7 +259,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -287,7 +277,6 @@ public class IntoReturnResponse  implements Serializable {
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -299,30 +288,39 @@ public class IntoReturnResponse  implements Serializable {
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
+    @Excel(name = "供应商名称")
     @ApiModelProperty(value = "供应商名称")
     private String supName;
 
+    @Excel(name = "供应商编码")
     @ApiModelProperty(value = "供应商编码")
     private String supCode;
 
+    @Excel(name = "员工名称")
     @ApiModelProperty(value = "员工名称")
     private String staffName;
 
+    @Excel(name = "员工编码")
     @ApiModelProperty(value = "员工编码")
     private String staffCode;
 
+    @Excel(name = "部门名称")
     @ApiModelProperty(value = "部门名称")
     private String orgName;
 
+    @Excel(name = "部门编码")
     @ApiModelProperty(value = "部门编码")
     private String orgCode;
 
+    @Excel(name = "供应商地址")
     @ApiModelProperty(value = "供应商地址")
     private String returnAddress;
 
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "出库状态")
     private String outStatusName;
 
+    @Excel(name = "退货状态")
     @ApiModelProperty(value = "退货状态")
     private String returnStatusName;
 

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

@@ -24,14 +24,10 @@ import java.time.LocalDateTime;
  *  出库明细
  */
 @Data
-@AllArgsConstructor
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
+@AllArgsConstructor
 @ExportTitle("出库明细")
-@TableName(value = "t_psi_outbound_item", autoResultMap = true)
-@ApiModel(value="实体类：出库明细", description="表名：t_psi_outbound_item")
-public class OutboundItemResponse extends PageInfo<OutboundItemResponse> implements Serializable {
+public class OutboundItemResponse {
 
     /*
      * 数据库字段
@@ -40,7 +36,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
     /**
      * 明细ID
      */
-//    @TableId(value = "item_id", type = IdType.AUTO)
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
@@ -49,7 +44,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
     /**
      * 出库ID
      */
-    @Excel(name = "出库ID")
     @ApiModelProperty(value = "出库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String outId;
@@ -66,7 +60,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
     /**
      * 来源单ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -75,7 +68,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
     /**
      * 来源单明细ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单明细ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单明细ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
@@ -92,7 +84,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -181,7 +172,6 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
     /**
      * 库存ID
      */
-    @Excel(name = "库存ID")
     @ApiModelProperty(value = "库存ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;
@@ -214,101 +204,46 @@ public class OutboundItemResponse extends PageInfo<OutboundItemResponse> impleme
     /**
      * 企业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;
-
+    @Excel(name = "商品编码")
     @ApiModelProperty(value = "商品编码")
     private String skuCode;
 
+    @Excel(name = "商品型号")
     @ApiModelProperty(value = "商品型号")
     private String skuModel;
 
+    @Excel(name = "商品名称")
     @ApiModelProperty(value = "商品名称")
     private String skuName;
 
+    @Excel(name = "仓库名称")
     @ApiModelProperty(value = "仓库名称")
     private String whName;
 
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "出库状态")
     private String outStatusName;
 
+    @Excel(name = "订单数量")
     @ApiModelProperty(value = "订单数量")
     private BigDecimal orderQty;
 
+    @Excel(name = "可出库数量")
     @ApiModelProperty(value = "可出库数量")
     private BigDecimal canOutingQty;
 
     @ApiModelProperty(value = "仓库ID")
     private String whId;
 
+    @Excel(name = "库存数量")
     @ApiModelProperty(value = "库存数量")
     private BigDecimal invQty;
 
+    @Excel(name = "可用量")
     @ApiModelProperty(value = "可用量")
     private BigDecimal usableQty;
 

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

@@ -261,72 +261,9 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
     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;
-
     @ApiModelProperty(value = "出库单明细")
     private List<OutboundItemResponse> goodsList;
 
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
     @ApiModelProperty(value = "订单单号")
     private String orderNo;
 
@@ -370,6 +307,7 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
     private String outTypeName;
 
     @ApiModelProperty(value = "行政区划 (a1：省 a2：市 a3：区)")
+    @TableField(typeHandler = JsonTypeHandler.class)
     private JSONObject addressArea;
 
     @ApiModelProperty(value = "小区或POI")
@@ -379,6 +317,7 @@ public class OutboundResponse extends PageInfo<OutboundResponse> implements Seri
     private String addressNo;
 
     @ApiModelProperty(value = "地址坐标(gcj02) (LAT：纬度的值 LON：经度的值)")
+    @TableField(typeHandler = JsonTypeHandler.class)
     private JSONObject addressGcj02;
 
     @ApiModelProperty(value = "联系人")

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

@@ -1,37 +1,19 @@
 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
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("入库明细")
-@TableName(value = "t_psi_inbound_item", autoResultMap = true)
-@ApiModel(value="实体类：入库明细", description="表名：t_psi_inbound_item")
-public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializable {
+public class InboundItemVO  {
 
     /*
      * 数据库字段
@@ -48,7 +30,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 入库ID
      */
-    @Excel(name = "入库ID")
     @ApiModelProperty(value = "入库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -57,7 +38,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 入库类型 (【系统字典】采购入库、销退入库、其他入库)
      */
-    @Excel(name = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     @ApiModelProperty(value = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     private String intoType;
 
@@ -65,7 +45,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 来源单ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -74,7 +53,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 来源单明细ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单明细ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单明细ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
@@ -83,7 +61,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 商品顺序
      */
-    @Excel(name = "商品顺序")
     @ApiModelProperty(value = "商品顺序")
     private Integer itemIndex;
 
@@ -91,7 +68,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -100,7 +76,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 入库价
      */
-    @Excel(name = "入库价")
     @ApiModelProperty(value = "入库价")
     private BigDecimal priceInto;
 
@@ -108,7 +83,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 非标号
      */
-    @Excel(name = "非标号")
     @ApiModelProperty(value = "非标号")
     private String nonStdCode;
 
@@ -116,7 +90,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 入库状态 (【系统字典】)
      */
-    @Excel(name = "入库状态 (【系统字典】)")
     @ApiModelProperty(value = "入库状态 (【系统字典】)")
     private String intoStatus;
 
@@ -124,7 +97,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 入库中数量
      */
-    @Excel(name = "入库中数量")
     @ApiModelProperty(value = "入库中数量")
     private BigDecimal intoingQty;
 
@@ -132,7 +104,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 入库中金额
      */
-    @Excel(name = "入库中金额")
     @ApiModelProperty(value = "入库中金额")
     private BigDecimal intoingAmt;
 
@@ -140,7 +111,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 已入库数量
      */
-    @Excel(name = "已入库数量")
     @ApiModelProperty(value = "已入库数量")
     private BigDecimal intoQty;
 
@@ -148,7 +118,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 已入库金额
      */
-    @Excel(name = "已入库金额")
     @ApiModelProperty(value = "已入库金额")
     private BigDecimal intoAmt;
 
@@ -156,7 +125,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 已入库退货数量
      */
-    @Excel(name = "已入库退货数量")
     @ApiModelProperty(value = "已入库退货数量")
     private BigDecimal returnQty;
 
@@ -164,7 +132,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 已入库退货金额
      */
-    @Excel(name = "已入库退货金额")
     @ApiModelProperty(value = "已入库退货金额")
     private BigDecimal returnAmt;
 
@@ -172,7 +139,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -180,7 +146,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 库存ID
      */
-    @Excel(name = "库存ID")
     @ApiModelProperty(value = "库存ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;
@@ -189,7 +154,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 成本单价
      */
-    @Excel(name = "成本单价")
     @ApiModelProperty(value = "成本单价")
     private BigDecimal costPrice;
 
@@ -197,7 +161,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 成本金额
      */
-    @Excel(name = "成本金额")
     @ApiModelProperty(value = "成本金额")
     private BigDecimal costAmt;
 
@@ -205,7 +168,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 出库数量
      */
-    @Excel(name = "出库数量")
     @ApiModelProperty(value = "出库数量")
     private BigDecimal outQty;
 
@@ -213,7 +175,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 库存数量 (库存数量=商品数量-出库数量)
      */
-    @Excel(name = "库存数量 (库存数量=商品数量-出库数量)")
     @ApiModelProperty(value = "库存数量 (库存数量=商品数量-出库数量)")
     private BigDecimal invQty;
 
@@ -221,7 +182,6 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -229,12 +189,10 @@ public class InboundItemVO extends PageInfo<InboundItemVO> implements Serializab
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
 
-    @Excel(name = "入库仓库")
     @TableField(typeHandler = UuidTypeHandler.class)
     @ApiModelProperty(value = "入库仓库")
     private String whId;

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

@@ -31,14 +31,8 @@ import java.util.List;
  *  入库单
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("入库单")
-@TableName(value = "t_psi_inbound", autoResultMap = true)
-@ApiModel(value="实体类：入库单", description="表名：t_psi_inbound")
-public class InboundVO extends PageInfo<InboundVO> implements Serializable {
+public class InboundVO {
 
     /*
      * 数据库字段
@@ -47,7 +41,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 入库单ID
      */
-    @TableId(value = "into_id", type = IdType.AUTO)
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -58,7 +51,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 入库单号
      */
-    @Excel(name = "入库单号")
     @ApiModelProperty(value = "入库单号")
     private String intoNo;
 
@@ -66,7 +58,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 入库类型 (【系统字典】采购入库、销退入库、其他入库)
      */
-    @Excel(name = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     @ApiModelProperty(value = "入库类型 (【系统字典】采购入库、销退入库、其他入库)")
     private String intoType;
 
@@ -74,7 +65,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 来源单ID (采购订单、出库退货)
      */
-    @Excel(name = "来源单ID (采购订单、出库退货)")
     @ApiModelProperty(value = "来源单ID (采购订单、出库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -83,7 +73,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 来源单号
      */
-    @Excel(name = "来源单号")
     @ApiModelProperty(value = "来源单号")
     private String fromNo;
 
@@ -91,7 +80,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -100,7 +88,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -109,7 +96,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 客户
      */
-    @Excel(name = "客户")
     @ApiModelProperty(value = "客户")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String cusId;
@@ -118,7 +104,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -127,7 +112,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 入库状态 (【系统字典】)
      */
-    @Excel(name = "入库状态 (【系统字典】)")
     @ApiModelProperty(value = "入库状态 (【系统字典】)")
     private String intoStatus;
 
@@ -135,7 +119,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 入库中数量
      */
-    @Excel(name = "入库中数量")
     @ApiModelProperty(value = "入库中数量")
     private BigDecimal intoingQty;
 
@@ -143,7 +126,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 入库中金额
      */
-    @Excel(name = "入库中金额")
     @ApiModelProperty(value = "入库中金额")
     private BigDecimal intoingAmt;
 
@@ -151,7 +133,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 已入库数量
      */
-    @Excel(name = "已入库数量")
     @ApiModelProperty(value = "已入库数量")
     private BigDecimal intoQty;
 
@@ -159,7 +140,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 已入库金额
      */
-    @Excel(name = "已入库金额")
     @ApiModelProperty(value = "已入库金额")
     private BigDecimal intoAmt;
 
@@ -167,7 +147,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 已入库退货数量
      */
-    @Excel(name = "已入库退货数量")
     @ApiModelProperty(value = "已入库退货数量")
     private BigDecimal returnQty;
 
@@ -175,7 +154,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 已入库退货金额
      */
-    @Excel(name = "已入库退货金额")
     @ApiModelProperty(value = "已入库退货金额")
     private BigDecimal returnAmt;
 
@@ -183,7 +161,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 入库日期
      */
-    @Excel(name = "入库日期")
     @ApiModelProperty(value = "入库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -193,7 +170,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -201,7 +177,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)
      */
-    @Excel(name = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     @ApiModelProperty(value = "附件 (index（显示顺序）、name（文件名）、path（路径）、type（类型）、time（上传时间）...)")
     private List<AnnexVO> annexPaths;
 
@@ -210,7 +185,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -219,7 +193,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 制单时间
      */
-    @Excel(name = "制单时间")
     @ApiModelProperty(value = "制单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -229,7 +202,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 应收款单
      */
-    @Excel(name = "应收款单")
     @ApiModelProperty(value = "应收款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String receivableId;
@@ -238,7 +210,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 应付款单
      */
-    @Excel(name = "应付款单")
     @ApiModelProperty(value = "应付款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String payableId;
@@ -247,7 +218,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -255,7 +225,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
@@ -263,7 +232,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 创建时间 (触发器自动处理)
      */
-    @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)
@@ -273,7 +241,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 创建用户 (触发器自动处理)
      */
-    @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opCreateUserId;
@@ -282,7 +249,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 修改时间 (触发器自动处理)
      */
-    @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)
@@ -292,7 +258,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 修改用户 (触发器自动处理)
      */
-    @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opUpdateUserId;
@@ -301,7 +266,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 数据操作应用 (触发器自动处理)
      */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
     private String opAppCode;
 
@@ -309,7 +273,6 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 数据时间戳 (触发器自动处理)
      */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
     @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -319,20 +282,16 @@ public class InboundVO extends PageInfo<InboundVO> implements Serializable {
     /**
      * 数据操作数据库用户 (触发器自动处理)
      */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
 
 
-
-    @Excel(name = "入库仓库")
     @TableField(typeHandler = UuidTypeHandler.class)
     @ApiModelProperty(value = "入库仓库")
     private String whId;
 
 
-    @Excel(name = "入库原因")
     @ApiModelProperty(value = "入库原因")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoReason;

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

@@ -22,13 +22,8 @@ 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 {
+public class IntoReturnItemVO  {
 
     /*
      * 数据库字段
@@ -45,7 +40,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 退货单ID
      */
-    @Excel(name = "退货单ID")
     @ApiModelProperty(value = "退货单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String returnId;
@@ -54,7 +48,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 入库单ID
      */
-    @Excel(name = "入库单ID")
     @ApiModelProperty(value = "入库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -63,7 +56,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 入库单明细ID
      */
-    @Excel(name = "入库单明细ID")
     @ApiModelProperty(value = "入库单明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoItemId;
@@ -72,7 +64,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 采购订单ID
      */
-    @Excel(name = "采购订单ID")
     @ApiModelProperty(value = "采购订单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
@@ -81,18 +72,19 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 采购明细ID
      */
-    @Excel(name = "采购明细ID")
     @ApiModelProperty(value = "采购明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purItemId;
 
+
+    @ApiModelProperty(value = "来源单明细ID (采购订单、出库退货)")
+    @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
 
 
     /**
      * 商品顺序
      */
-    @Excel(name = "商品顺序")
     @ApiModelProperty(value = "商品顺序")
     private Integer itemIndex;
 
@@ -100,7 +92,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -109,7 +100,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 商品数量
      */
-    @Excel(name = "商品数量")
     @ApiModelProperty(value = "商品数量")
     private BigDecimal itemQty;
 
@@ -117,7 +107,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 标价
      */
-    @Excel(name = "标价")
     @ApiModelProperty(value = "标价")
     private BigDecimal priceStd;
 
@@ -125,7 +114,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 标价金额 (商品数量*标价)
      */
-    @Excel(name = "标价金额 (商品数量*标价)")
     @ApiModelProperty(value = "标价金额 (商品数量*标价)")
     private BigDecimal amtStd;
 
@@ -133,7 +121,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 退货价
      */
-    @Excel(name = "退货价")
     @ApiModelProperty(value = "退货价")
     private BigDecimal priceReturn;
 
@@ -141,7 +128,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 退货金额 (商品数量*退货价)
      */
-    @Excel(name = "退货金额 (商品数量*退货价)")
     @ApiModelProperty(value = "退货金额 (商品数量*退货价)")
     private BigDecimal itemAmt;
 
@@ -149,7 +135,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 非标号
      */
-    @Excel(name = "非标号")
     @ApiModelProperty(value = "非标号")
     private String nonStdCode;
 
@@ -157,7 +142,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 入库状态
      */
-    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
     private String outStatus;
 
@@ -166,7 +150,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -174,7 +157,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -182,7 +164,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -190,7 +171,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -198,7 +178,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -206,7 +185,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -214,7 +192,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
@@ -222,7 +199,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 创建时间 (触发器自动处理)
      */
-    @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)
@@ -232,7 +208,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 创建用户 (触发器自动处理)
      */
-    @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opCreateUserId;
@@ -241,7 +216,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 修改时间 (触发器自动处理)
      */
-    @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)
@@ -251,7 +225,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 修改用户 (触发器自动处理)
      */
-    @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opUpdateUserId;
@@ -260,7 +233,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 数据操作应用 (触发器自动处理)
      */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
     private String opAppCode;
 
@@ -268,7 +240,6 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 数据时间戳 (触发器自动处理)
      */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
     @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -278,12 +249,10 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 数据操作数据库用户 (触发器自动处理)
      */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
 
-    @Excel(name = "库存ID")
     @ApiModelProperty(value = "库存ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;

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

@@ -28,14 +28,9 @@ import java.util.List;
  * 入库退货
  */
 @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 {
-
+public class IntoReturnVO {
     /*
      * 数据库字段
      */
@@ -51,7 +46,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 退货单号
      */
-    @Excel(name = "退货单号")
     @ApiModelProperty(value = "退货单号")
     private String returnNo;
 
@@ -59,7 +53,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 退货类型 (【系统字典】销售退货)
      */
-    @Excel(name = "退货类型 (【系统字典】销售退货)")
     @ApiModelProperty(value = "退货类型 (【系统字典】销售退货)")
     private String returnType;
 
@@ -67,7 +60,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 入库单
      */
-    @Excel(name = "入库单")
     @ApiModelProperty(value = "入库单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String intoId;
@@ -76,7 +68,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 采购订单
      */
-    @Excel(name = "采购订单")
     @ApiModelProperty(value = "采购订单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String purId;
@@ -85,7 +76,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 入库单号
      */
-    @Excel(name = "入库单号")
     @ApiModelProperty(value = "入库单号")
     private String intoNo;
 
@@ -93,7 +83,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 采购订单号
      */
-    @Excel(name = "采购订单号")
     @ApiModelProperty(value = "采购订单号")
     private String purNo;
 
@@ -101,7 +90,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -110,7 +98,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -119,7 +106,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -128,7 +114,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 联系人
      */
-    @Excel(name = "联系人")
     @ApiModelProperty(value = "联系人")
     private String contactName;
 
@@ -136,7 +121,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 联系电话
      */
-    @Excel(name = "联系电话")
     @ApiModelProperty(value = "联系电话")
     private String contactPhone;
 
@@ -144,7 +128,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 送货日期
      */
-    @Excel(name = "送货日期")
     @ApiModelProperty(value = "送货日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -154,7 +137,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 商品总数量
      */
-    @Excel(name = "商品总数量")
     @ApiModelProperty(value = "商品总数量")
     private BigDecimal sumQuantity;
 
@@ -162,7 +144,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 标价合计
      */
-    @Excel(name = "标价合计")
     @ApiModelProperty(value = "标价合计")
     private BigDecimal sumStandard;
 
@@ -170,7 +151,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 合计金额
      */
-    @Excel(name = "合计金额")
     @ApiModelProperty(value = "合计金额")
     private BigDecimal sumAmount;
 
@@ -178,7 +158,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 销售折扣 (合计金额/标价合计)
      */
-    @Excel(name = "销售折扣 (合计金额/标价合计)")
     @ApiModelProperty(value = "销售折扣 (合计金额/标价合计)")
     private BigDecimal saleDiscount;
 
@@ -186,7 +165,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 退货状态 (【系统字典】)
      */
-    @Excel(name = "退货状态 (【系统字典】)")
     @ApiModelProperty(value = "退货状态 (【系统字典】)")
     private String returnStatus;
 
@@ -194,7 +172,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 出库状态 (【系统字典】)
      */
-    @Excel(name = "出库状态 (【系统字典】)")
     @ApiModelProperty(value = "出库状态 (【系统字典】)")
     private String outStatus;
 
@@ -202,7 +179,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -210,7 +186,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -218,7 +193,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -226,7 +200,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -234,7 +207,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 应付金额
      */
-    @Excel(name = "应付金额")
     @ApiModelProperty(value = "应付金额")
     private BigDecimal amtPayable;
 
@@ -242,7 +214,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 还款金额
      */
-    @Excel(name = "还款金额")
     @ApiModelProperty(value = "还款金额")
     private BigDecimal amtHandle;
 
@@ -250,7 +221,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 剩余应付
      */
-    @Excel(name = "剩余应付")
     @ApiModelProperty(value = "剩余应付")
     private BigDecimal amtResidue;
 
@@ -258,7 +228,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -266,7 +235,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 附件 (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;
@@ -275,7 +243,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -284,7 +251,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 制单时间
      */
-    @Excel(name = "制单时间")
     @ApiModelProperty(value = "制单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -294,7 +260,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -302,7 +267,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
@@ -310,7 +274,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 创建时间 (触发器自动处理)
      */
-    @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)
@@ -320,7 +283,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 创建用户 (触发器自动处理)
      */
-    @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opCreateUserId;
@@ -329,7 +291,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 修改时间 (触发器自动处理)
      */
-    @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)
@@ -339,7 +300,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 修改用户 (触发器自动处理)
      */
-    @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opUpdateUserId;
@@ -348,7 +308,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 数据操作应用 (触发器自动处理)
      */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
     private String opAppCode;
 
@@ -356,7 +315,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 数据时间戳 (触发器自动处理)
      */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
     @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -366,7 +324,6 @@ public class IntoReturnVO implements Serializable {
     /**
      * 数据操作数据库用户 (触发器自动处理)
      */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 

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

@@ -24,14 +24,8 @@ import java.time.LocalDateTime;
  *  出库明细
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("出库明细")
-@TableName(value = "t_psi_outbound_item", autoResultMap = true)
-@ApiModel(value="实体类：出库明细", description="表名：t_psi_outbound_item")
-public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializable {
+public class OutboundItemVO {
 
     /*
      * 数据库字段
@@ -40,7 +34,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 明细ID
      */
-//    @TableId(value = "item_id", type = IdType.AUTO)
     @ApiModelProperty(value = "明细ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String itemId;
@@ -49,7 +42,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 出库ID
      */
-    @Excel(name = "出库ID")
     @ApiModelProperty(value = "出库ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String outId;
@@ -58,7 +50,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 入库类型 (【系统字典】销售出库、采退出库、其他出库)
      */
-    @Excel(name = "入库类型 (【系统字典】销售出库、采退出库、其他出库)")
     @ApiModelProperty(value = "入库类型 (【系统字典】销售出库、采退出库、其他出库)")
     private String outType;
 
@@ -66,7 +57,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 来源单ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -75,7 +65,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 来源单明细ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单明细ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单明细ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromItemId;
@@ -84,7 +73,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 商品顺序
      */
-    @Excel(name = "商品顺序")
     @ApiModelProperty(value = "商品顺序")
     private Integer itemIndex;
 
@@ -92,7 +80,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 商品ID
      */
-    @Excel(name = "商品ID")
     @ApiModelProperty(value = "商品ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String skuId;
@@ -101,7 +88,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 出库价
      */
-    @Excel(name = "出库价")
     @ApiModelProperty(value = "出库价")
     private BigDecimal priceOut;
 
@@ -109,7 +95,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 非标号
      */
-    @Excel(name = "非标号")
     @ApiModelProperty(value = "非标号")
     private String nonStdCode;
 
@@ -117,7 +102,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 出库状态
      */
-    @Excel(name = "出库状态")
     @ApiModelProperty(value = "出库状态")
     private String outStatus;
 
@@ -125,7 +109,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -133,7 +116,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -141,7 +123,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -149,7 +130,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -157,7 +137,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 已出库退货数量
      */
-    @Excel(name = "已出库退货数量")
     @ApiModelProperty(value = "已出库退货数量")
     private BigDecimal returnQty;
 
@@ -165,7 +144,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 已出库退货金额
      */
-    @Excel(name = "已出库退货金额")
     @ApiModelProperty(value = "已出库退货金额")
     private BigDecimal returnAmt;
 
@@ -173,7 +151,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -181,7 +158,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 库存ID
      */
-    @Excel(name = "库存ID")
     @ApiModelProperty(value = "库存ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String invId;
@@ -190,7 +166,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 成本单价
      */
-    @Excel(name = "成本单价")
     @ApiModelProperty(value = "成本单价")
     private BigDecimal costPrice;
 
@@ -198,7 +173,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 成本金额
      */
-    @Excel(name = "成本金额")
     @ApiModelProperty(value = "成本金额")
     private BigDecimal costAmt;
 
@@ -206,7 +180,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -214,7 +187,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
@@ -222,7 +194,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 创建时间 (触发器自动处理)
      */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
     @ApiModelProperty(value = "创建时间 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -232,7 +203,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 创建用户 (触发器自动处理)
      */
-    @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opCreateUserId;
@@ -241,7 +211,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 修改时间 (触发器自动处理)
      */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
     @ApiModelProperty(value = "修改时间 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -251,7 +220,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 修改用户 (触发器自动处理)
      */
-    @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opUpdateUserId;
@@ -260,7 +228,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 数据操作应用 (触发器自动处理)
      */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
     private String opAppCode;
 
@@ -268,7 +235,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 数据时间戳 (触发器自动处理)
      */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
     @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -278,7 +244,6 @@ public class OutboundItemVO extends PageInfo<OutboundItemVO> implements Serializ
     /**
      * 数据操作数据库用户 (触发器自动处理)
      */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 

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

@@ -28,14 +28,8 @@ import java.util.List;
  *  出库单
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@ExportTitle("出库单")
-@TableName(value = "t_psi_outbound", autoResultMap = true)
-@ApiModel(value="实体类：出库单", description="表名：t_psi_outbound")
-public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
+public class OutboundVO{
 
     /*
      * 数据库字段
@@ -44,7 +38,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 出库单ID
      */
-//    @TableId(value = "out_id", type = IdType.AUTO)
     @ApiModelProperty(value = "出库单ID")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String outId;
@@ -53,7 +46,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 出库单号
      */
-    @Excel(name = "出库单号")
     @ApiModelProperty(value = "出库单号")
     private String outNo;
 
@@ -61,7 +53,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 出库类型 (【系统字典】销售出库、采退出库、其他出库)
      */
-    @Excel(name = "出库类型 (【系统字典】销售出库、采退出库、其他出库)")
     @ApiModelProperty(value = "出库类型 (【系统字典】销售出库、采退出库、其他出库)")
     private String outType;
 
@@ -69,7 +60,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 来源单ID (销售订单、入库退货)
      */
-    @Excel(name = "来源单ID (销售订单、入库退货)")
     @ApiModelProperty(value = "来源单ID (销售订单、入库退货)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String fromId;
@@ -78,7 +68,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 来源单号
      */
-    @Excel(name = "来源单号")
     @ApiModelProperty(value = "来源单号")
     private String fromNo;
 
@@ -86,7 +75,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 部门
      */
-    @Excel(name = "部门")
     @ApiModelProperty(value = "部门")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String orgId;
@@ -95,7 +83,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 员工
      */
-    @Excel(name = "员工")
     @ApiModelProperty(value = "员工")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String staffId;
@@ -104,7 +91,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 客户
      */
-    @Excel(name = "客户")
     @ApiModelProperty(value = "客户")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String cusId;
@@ -113,7 +99,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 供应商
      */
-    @Excel(name = "供应商")
     @ApiModelProperty(value = "供应商")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String supId;
@@ -122,7 +107,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 出库状态 (【系统字典】)
      */
-    @Excel(name = "出库状态 (【系统字典】)")
     @ApiModelProperty(value = "出库状态 (【系统字典】)")
     private String outStatus;
 
@@ -130,7 +114,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 出库中数量
      */
-    @Excel(name = "出库中数量")
     @ApiModelProperty(value = "出库中数量")
     private BigDecimal outingQty;
 
@@ -138,7 +121,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 出库中金额
      */
-    @Excel(name = "出库中金额")
     @ApiModelProperty(value = "出库中金额")
     private BigDecimal outingAmt;
 
@@ -146,7 +128,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 已出库数量
      */
-    @Excel(name = "已出库数量")
     @ApiModelProperty(value = "已出库数量")
     private BigDecimal outQty;
 
@@ -154,7 +135,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 已出库金额
      */
-    @Excel(name = "已出库金额")
     @ApiModelProperty(value = "已出库金额")
     private BigDecimal outAmt;
 
@@ -162,7 +142,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 已出库退货数量
      */
-    @Excel(name = "已出库退货数量")
     @ApiModelProperty(value = "已出库退货数量")
     private BigDecimal returnQty;
 
@@ -170,7 +149,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 已出库退货金额
      */
-    @Excel(name = "已出库退货金额")
     @ApiModelProperty(value = "已出库退货金额")
     private BigDecimal returnAmt;
 
@@ -178,7 +156,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 出库日期
      */
-    @Excel(name = "出库日期")
     @ApiModelProperty(value = "出库日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -188,7 +165,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 备注
      */
-    @Excel(name = "备注")
     @ApiModelProperty(value = "备注")
     private String remarks;
 
@@ -196,7 +172,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 附件 (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;
@@ -205,7 +180,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 制单员
      */
-    @Excel(name = "制单员")
     @ApiModelProperty(value = "制单员")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String makeStaff;
@@ -214,7 +188,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 制单时间
      */
-    @Excel(name = "制单时间")
     @ApiModelProperty(value = "制单时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -224,7 +197,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 应收款单
      */
-    @Excel(name = "应收款单")
     @ApiModelProperty(value = "应收款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String receivableId;
@@ -233,7 +205,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 应付款单
      */
-    @Excel(name = "应付款单")
     @ApiModelProperty(value = "应付款单")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String payableId;
@@ -242,7 +213,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 有效标识 (1：正常 0：停用)
      */
-    @Excel(name = "有效标识 (1：正常 0：停用)")
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
@@ -250,7 +220,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 企业ID
      */
-    @Excel(name = "企业ID")
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
@@ -258,7 +227,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 创建时间 (触发器自动处理)
      */
-    @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)
@@ -268,7 +236,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 创建用户 (触发器自动处理)
      */
-    @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opCreateUserId;
@@ -277,7 +244,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 修改时间 (触发器自动处理)
      */
-    @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)
@@ -287,7 +253,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 修改用户 (触发器自动处理)
      */
-    @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
     @TableField(typeHandler = UuidTypeHandler.class)
     private String opUpdateUserId;
@@ -296,7 +261,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 数据操作应用 (触发器自动处理)
      */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
     private String opAppCode;
 
@@ -304,7 +268,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 数据时间戳 (触发器自动处理)
      */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
     @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
@@ -314,7 +277,6 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
     /**
      * 数据操作数据库用户 (触发器自动处理)
      */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
     @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
     private String opDbUser;
 
@@ -334,6 +296,8 @@ public class OutboundVO extends PageInfo<OutboundVO> implements Serializable {
      * @TableField(exist = false)
      */
 
+    @ApiModelProperty(value = "自动入库标识")
+    private Boolean automaticFlg;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/service/ivt/InboundSaleReturnService.java → src/main/java/com/dk/mdm/service/ivt/InboundPurchaseReturnService.java

@@ -15,12 +15,12 @@ import com.dk.mdm.infrastructure.convert.ivt.InboundConvert;
 import com.dk.mdm.infrastructure.convert.ivt.InboundItemConvert;
 import com.dk.mdm.mapper.ivt.InboundItemMapper;
 import com.dk.mdm.mapper.ivt.InboundMapper;
-import com.dk.mdm.mapper.sale.OutReturnItemMapper;
-import com.dk.mdm.mapper.sale.OutReturnMapper;
+import com.dk.mdm.mapper.ivt.IntoReturnItemMapper;
+import com.dk.mdm.mapper.ivt.IntoReturnMapper;
 import com.dk.mdm.model.pojo.ivt.Inbound;
 import com.dk.mdm.model.pojo.ivt.InboundItem;
-import com.dk.mdm.model.pojo.sale.OutReturn;
-import com.dk.mdm.model.pojo.sale.OutReturnItem;
+import com.dk.mdm.model.pojo.ivt.IntoReturn;
+import com.dk.mdm.model.pojo.ivt.IntoReturnItem;
 import com.dk.mdm.model.query.ivt.InboundItemQuery;
 import com.dk.mdm.model.query.ivt.InboundQuery;
 import com.dk.mdm.model.response.ivt.InboundItemResponse;
@@ -41,11 +41,11 @@ import java.util.UUID;
 
 /**
  * @author : 寇珊珊
- * @desc : 销售退货入库业务层
+ * @desc : 采购退货入库业务层
  * @date : 2024/3/7 14:11
  */
 @Service
-public class InboundSaleReturnService extends BaseService<Inbound> {
+public class InboundPurchaseReturnService extends BaseService<Inbound> {
 
     @Override
     public BaseMapper<Inbound> getRepository() {
@@ -65,10 +65,10 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
     private InboundItemConvert inboundItemConvert;
 
     @Autowired
-    private OutReturnMapper outReturnMapper;
+    private IntoReturnMapper intoReturnMapper;
 
     @Autowired
-    private OutReturnItemMapper outReturnItemMapper;
+    private IntoReturnItemMapper intoReturnItemMapper;
 
     @Autowired
     private CommonService commonService;
@@ -91,7 +91,7 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
      * @author : 寇珊珊
      */
     @Pagination
-    public ResponseResultVO<Map<String, Object>> selectOtherInboundItemInfoById(String id) {
+    public ResponseResultVO<Map<String, Object>> selectIntoReturnItemInfoById(String id) {
         Map<String, Object> result = new HashMap<>();
         // 商品明细
         List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(id));
@@ -104,12 +104,12 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
 
 
     /**
-     * @desc : 销售退货入库新建
+     * @desc : 采购退货入库新建
      * @date : 2024/3/7 14:13
      * @author : 寇珊珊
      */
     @Transactional(rollbackFor = {Exception.class})
-    public ResponseResultVO<?> saleReturnInboundInsert(InboundVO inboundVO) {
+    public ResponseResultVO<?> purchaseReturnInboundInsert(InboundVO inboundVO) {
         //region  总单
         //获取 id/单号
         Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.SALERETURN.getName(), false);
@@ -147,24 +147,20 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
         inboundMapper.insert(inbound);
         //endregion
 
-        //region 销售退货
+        //region 采购退货
         if (inboundVO.getFromId() != null) {
-            OutReturn outReturn = new OutReturn();
-//            IntoReturnResponse intoReturnResponse = intoReturnMapper.selectById(inboundVO.getFromId());
-//            intoReturn.setOutingQty(intoReturnResponse.getOutingQty().subtract(inboundVO.getIntoingQty()));
-//            intoReturn.setOutingAmt(intoReturnResponse.getOutingAmt().subtract(inboundVO.getIntoingAmt()));
-//            intoReturn.setOutQty(intoReturnResponse.getOutQty().add(inboundVO.getIntoAmt()));
-//            intoReturn.setOutAmt(intoReturnResponse.getOutAmt().add(inboundVO.getIntoQty()));
-            outReturn.setReturnId(inboundVO.getFromId());
-            outReturn.setIntoingQty(inboundVO.getIntoingQty().negate());
-            outReturn.setIntoingAmt(inboundVO.getIntoingAmt().negate());
-            outReturn.setIntoQty(inboundVO.getIntoAmt());
-            outReturn.setIntoAmt(inboundVO.getIntoQty());
+            //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+            IntoReturn  intoReturn = new IntoReturn();
+            intoReturn.setReturnId(inboundVO.getFromId());
+            intoReturn.setOutingQty(inboundVO.getIntoingQty().negate());
+            intoReturn.setOutingAmt(inboundVO.getIntoingAmt().negate());
+            intoReturn.setOutQty(inboundVO.getIntoQty());
+            intoReturn.setOutAmt(inboundVO.getIntoQty());
             //入库状态
-            String intoStatus = this.setIntoStatus(outReturn.getIntoingQty(), outReturn.getIntoQty());
-            outReturn.setIntoStatus(intoStatus);
+            String outStatus = this.setOutStatus(intoReturn.getOutingQty(), intoReturn.getOutQty());
+            intoReturn.setOutStatus(outStatus);
             //修改
-            int countRow = outReturnMapper.updateById(outReturn);
+            int countRow = intoReturnMapper.updateById(intoReturn);
             //数量超出
             if (countRow == 0) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
@@ -199,59 +195,30 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
             //成本单价
             inboundItemVO.setCostPrice(inboundItemVO.getPriceInto());
             //成本金额
-            inboundItemVO.setCostAmt(inboundItemVO.getIntoingQty().multiply(inboundItemVO.getPriceInto()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            inboundItemVO.setCostAmt((inboundItemVO.getIntoingQty().add(inboundItemVO.getIntoQty())).multiply(inboundItemVO.getPriceInto()).setScale(2, BigDecimal.ROUND_HALF_UP));
             //库存数量  已入库-出库
-            inboundItemVO.setInvQty(inboundItemVO.getIntoQty().subtract(inboundItemVO.getOutQty()));
+            inboundItemVO.setInvQty(inboundItemVO.getIntoQty().abs().subtract(inboundItemVO.getOutQty()));
             //入库状态
             inboundItemVO.setIntoStatus(inboundVO.getIntoStatus());
-            //退货数量
-            inboundItemVO.setReturnQty(inboundItemVO.getIntoingQty());
-            //退货金额
-            inboundItemVO.setReturnAmt(inboundItemVO.getIntoingAmt());
             //实体转换
             InboundItem inboundItem = inboundItemConvert.convertToPo(inboundItemVO);
             inboundItemMapper.insert(inboundItem);
             //endregion
 
-            //region 销售退货明细
+            //region 采购退货明细
             if (inboundItemVO.getFromItemId() != null) {
-                //region todo 可能无用代码
-                //                IntoReturnItemResponse intoReturnItemResponse = intoReturnItemMapper.selectById(inboundItemVO.getFromItemId());
-//           intoReturnItem.setOutQty(intoReturnItemResponse.getOutQty().add(inboundItemVO.getIntoQty()));
-//                intoReturnItem.setOutAmt(intoReturnItemResponse.getOutAmt().add(inboundItemVO.getIntoAmt()));
-//                intoReturnItem.setOutingQty(intoReturnItemResponse.getOutingQty().add(inboundItemVO.getIntoingQty()));
-//                intoReturnItem.setOutingAmt(intoReturnItemResponse.getOutingAmt().add(inboundItemVO.getIntoingAmt()));
-                //endregion
-
-                //region  todo 出库可能用到 用不到记得删掉
-//                IntoReturnItem intoReturnItem = new IntoReturnItem();
-//                intoReturnItem.setItemId(inboundItemVO.getFromItemId());
-//                intoReturnItem.setOutQty(inboundItemVO.getIntoQty());
-//                intoReturnItem.setOutAmt(inboundItemVO.getIntoAmt());
-//                intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty());
-//                intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt());
-//                //出库状态
-//                String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
-//                intoReturnItem.setOutStatus(outStatus);
-//                //修改
-//                int countRow = intoReturnItemMapper.updateById(intoReturnItem);
-//                //数量超出
-//                if (countRow == 0) {
-//                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
-//                }
-                //endregion
-
-                OutReturnItem outReturnItem = new OutReturnItem();
-                outReturnItem.setItemId(inboundItemVO.getFromItemId());
-                outReturnItem.setIntoQty(inboundItemVO.getIntoQty());
-                outReturnItem.setIntoAmt(inboundItemVO.getIntoAmt());
-                outReturnItem.setIntoingQty(inboundItemVO.getIntoingQty());
-                outReturnItem.setIntoingAmt(inboundItemVO.getIntoingAmt());
-                //入库状态
-                String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
-                outReturnItem.setIntoStatus(intoStatus);
+                //赋值 （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                IntoReturnItem intoReturnItem = new IntoReturnItem();
+                intoReturnItem.setItemId(inboundItemVO.getFromItemId());
+                intoReturnItem.setOutQty(inboundItemVO.getIntoQty().abs());
+                intoReturnItem.setOutAmt(inboundItemVO.getIntoAmt().abs());
+                intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty().abs());
+                intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt().abs());
+                //出库状态
+                String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
+                intoReturnItem.setOutStatus(outStatus);
                 //修改
-                int countRow = outReturnItemMapper.updateById(outReturnItem);
+                int countRow = intoReturnItemMapper.updateById(intoReturnItem);
                 //数量超出
                 if (countRow == 0) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
@@ -274,7 +241,7 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
 
 
     /**
-     * @desc : 销售退货入库办理
+     * @desc : 采购退货入库办理
      * @date : 2024/3/7 15:47
      * @author : 寇珊珊
      */
@@ -288,11 +255,15 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
         }
         for (InboundItemVO inboundItemVO : inboundVO.getItemList()) {
             if (inboundItemVO.getIntoId() != null) {
+                //查询原单
+                InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemVO.getItemId());
                 //编辑明细
                 inboundItemVO.setCostPrice(inboundItemVO.getPriceInto())
-                        .setCostAmt(inboundItemVO.getIntoingQty().multiply(inboundItemVO.getPriceInto()).setScale(2, BigDecimal.ROUND_HALF_UP))
-                        .setIntoQty(inboundItemVO.getIntoingQty())
-                        .setIntoAmt(inboundItemVO.getIntoingAmt());
+                        .setCostAmt((inboundItemVO.getIntoingQty().add(inboundItemVO.getIntoQty())).multiply(inboundItemVO.getPriceInto()).setScale(2, BigDecimal.ROUND_HALF_UP))
+                        .setIntoingQty(inboundItemResponse.getIntoingQty().subtract(inboundItemVO.getIntoingQty()))
+                        .setIntoingAmt(inboundItemResponse.getIntoingAmt().subtract(inboundItemVO.getIntoingAmt()))
+                        .setIntoQty(inboundItemResponse.getIntoingQty().add(inboundItemVO.getIntoingQty()))
+                        .setIntoAmt(inboundItemResponse.getIntoAmt().add(inboundItemVO.getIntoingAmt()));
                 //入库状态
                 String intoStatus = this.setIntoStatus(inboundItemVO.getIntoingQty(), inboundItemVO.getIntoQty());
                 inboundItemVO.setIntoStatus(intoStatus);
@@ -324,45 +295,20 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
             }
             //endregion
 
-            //region  销售退货明细
+            //region  采购退货明细
             if (inboundItemVO.getFromItemId() != null) {
-                //endregion todo  可能无用的代码
-//                    IntoReturnItemResponse intoReturnItemResponse = intoReturnItemMapper.selectById(inboundItemVO.getFromItemId());
-//                    intoReturnItem.setOutQty(intoReturnItemResponse.getOutQty().add(inboundItemVO.getIntoQty()));
-//                    intoReturnItem.setOutAmt(intoReturnItemResponse.getOutAmt().add(inboundItemVO.getIntoAmt()));
-//                    intoReturnItem.setOutingQty(intoReturnItemResponse.getOutingQty().add(inboundItemVO.getIntoingQty()));
-//                    intoReturnItem.setOutingAmt(intoReturnItemResponse.getOutingAmt().add(inboundItemVO.getIntoingAmt()));
-                //endregion
-
-                //region todo 出库可能用到的代码  用不到记得删掉
-//                IntoReturnItem intoReturnItem = new IntoReturnItem();
-//                intoReturnItem.setItemId(inboundItemVO.getFromItemId());
-//
-//                intoReturnItem.setOutQty(inboundItemVO.getIntoQty());
-//                intoReturnItem.setOutAmt(inboundItemVO.getIntoAmt());
-//                intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty());
-//                intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt());
-//                //出库状态
-//                String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
-//                intoReturnItem.setOutStatus(outStatus);
-//                //修改
-//                int countRow = intoReturnItemMapper.updateById(intoReturnItem);
-//                //数量超出
-//                if (countRow == 0) {
-//                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
-//                }
-                //endregion
-                OutReturnItem outReturnItem = new OutReturnItem();
-                outReturnItem.setItemId(inboundItemVO.getFromItemId());
-                outReturnItem.setIntoQty(inboundItemVO.getIntoQty());
-                outReturnItem.setIntoAmt(inboundItemVO.getIntoAmt());
-                outReturnItem.setIntoingQty(inboundItemVO.getIntoingQty());
-                outReturnItem.setIntoingAmt(inboundItemVO.getIntoingAmt());
-                //入库状态
-                String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
-                outReturnItem.setIntoStatus(intoStatus);
+                //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                IntoReturnItem intoReturnItem = new IntoReturnItem();
+                intoReturnItem.setItemId(inboundItemVO.getFromItemId());
+                intoReturnItem.setOutQty(inboundItemVO.getIntoQty().abs());
+                intoReturnItem.setOutAmt(inboundItemVO.getIntoAmt().abs());
+                intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty());
+                intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt());
+                //出库状态
+                String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
+                intoReturnItem.setOutStatus(outStatus);
                 //修改
-                int countRow = outReturnItemMapper.updateById(outReturnItem);
+                int countRow = intoReturnItemMapper.updateById(intoReturnItem);
                 //数量超出
                 if (countRow == 0) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
@@ -392,51 +338,26 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
                                     .eq(InboundItem::getItemId, UUID.fromString(inboundItem.getItemId()))
                     );
                 }
-                //region  销售退货明细
+                //region  采购退货明细
                 if (inboundItemVO.getFromItemId() != null) {
-                    //region todo  可能无用的代码
-//                        IntoReturnItemResponse intoReturnItemResponse = intoReturnItemMapper.selectById(inboundItemVO.getFromItemId());
-//                        intoReturnItem.setOutQty(intoReturnItemResponse.getOutQty().subtract(inboundItemVO.getIntoQty()));
-//                        intoReturnItem.setOutAmt(intoReturnItemResponse.getOutAmt().subtract(inboundItemVO.getIntoAmt()));
-//                        intoReturnItem.setOutingQty(intoReturnItemResponse.getOutingQty().subtract(inboundItemVO.getIntoingQty()));
-//                        intoReturnItem.setOutingAmt(intoReturnItemResponse.getOutingAmt().subtract(inboundItemVO.getIntoingAmt()));
-                    //endregion
-
-                    //region todo  出库可能用到的代码  用过后记得删除
-//                    IntoReturnItem intoReturnItem = new IntoReturnItem();
-//                    intoReturnItem.setItemId(inboundItemVO.getFromItemId());
-//                    intoReturnItem.setOutQty(inboundItemVO.getIntoQty().negate());
-//                    intoReturnItem.setOutAmt(inboundItemVO.getIntoAmt().negate());
-//                    intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty().negate());
-//                    intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt().negate());
-//                    //出库状态
-//                    String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
-//                    intoReturnItem.setOutStatus(outStatus);
-//                    //修改
-//                    int countRow = intoReturnItemMapper.updateById(intoReturnItem);
-//                    //数量超出
-//                    if (countRow == 0) {
-//                        throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
-//                    }
-                    //endregion
-
-                    //region 销售退货订单明细
-                    OutReturnItem outReturnItem = new OutReturnItem();
-                    outReturnItem.setItemId(inboundItemVO.getFromItemId());
-                    outReturnItem.setIntoQty(inboundItemVO.getIntoQty().negate());
-                    outReturnItem.setIntoAmt(inboundItemVO.getIntoAmt().negate());
-                    outReturnItem.setIntoingQty(inboundItemVO.getIntoingQty().negate());
-                    outReturnItem.setIntoingAmt(inboundItemVO.getIntoingAmt().negate());
-                    //入库状态
-                    String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
-                    outReturnItem.setIntoStatus(intoStatus);
+                    //采购退货单明细
+                    //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                    IntoReturnItem intoReturnItem = new IntoReturnItem();
+                    intoReturnItem.setItemId(inboundItemVO.getFromItemId());
+                    intoReturnItem.setOutQty(inboundItemVO.getIntoQty());
+                    intoReturnItem.setOutAmt(inboundItemVO.getIntoAmt());
+                    intoReturnItem.setOutingQty(inboundItemVO.getIntoingQty());
+                    intoReturnItem.setOutingAmt(inboundItemVO.getIntoingAmt());
+                    //出库状态
+                    String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
+                    intoReturnItem.setOutStatus(outStatus);
                     //修改
-                    int countRow = outReturnItemMapper.updateById(outReturnItem);
+                    int countRow = intoReturnItemMapper.updateById(intoReturnItem);
                     //数量超出
                     if (countRow == 0) {
                         throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
                     }
-                    //endregion
+
                 }
                 //endregion
 
@@ -466,52 +387,24 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
         );
         //endregion
 
-        //region  修改销售退货订单
+        //region  修改采购退货订单
         if (inboundVO.getFromId() != null) {
-            //region todo  可能无用的代码
-            //查询
-//                IntoReturnResponse intoReturnResponse = intoReturnMapper.selectById(inboundVO.getFromId());
-//                intoReturn.setOutQty(intoReturnResponse.getOutQty().add(sumIntoQty).subtract(sumDelIntoQty));
-//                intoReturn.setOutAmt(intoReturnResponse.getOutAmt().add(sumIntoAmt).subtract(sumDelIntoAmt));
-//                intoReturn.setOutingQty(intoReturnResponse.getOutingQty().subtract(sumIntoQty).subtract(sumDelIntoingQty));
-//                intoReturn.setOutingAmt(intoReturnResponse.getOutingAmt().subtract(sumIntoAmt).subtract(sumDelIntoingAmt));
-            //endregion
-
-            //region todo 出库可能用到的代码 用完记得删除
-//            IntoReturn intoReturn = new IntoReturn();
-//            intoReturn.setReturnId(inboundVO.getFromId());
-//            intoReturn.setOutQty(sumIntoQty.subtract(sumDelIntoQty));
-//            intoReturn.setOutAmt(sumIntoAmt.subtract(sumDelIntoAmt));
-//            intoReturn.setOutingQty((sumIntoQty.add(sumDelIntoingQty)).negate());
-//            intoReturn.setOutingAmt((sumIntoAmt.add(sumDelIntoingAmt)).negate());
-//            //入库状态
-//            String outStatus = this.setOutStatus(intoReturn.getOutingQty(), intoReturn.getOutQty());
-//            intoReturn.setOutStatus(outStatus);
-//            //修改
-//            int countRow = intoReturnMapper.updateById(intoReturn);
-//            //数量超出
-//            if (countRow == 0) {
-//                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
-//            }
-            //endregion
-
-            OutReturn outReturn = new OutReturn();
-            outReturn.setReturnId(inboundVO.getFromId());
-            outReturn.setIntoQty(sumIntoQty.subtract(sumDelIntoQty));
-            outReturn.setIntoAmt(sumIntoAmt.subtract(sumDelIntoAmt));
-            outReturn.setIntoingQty((sumIntoQty.add(sumDelIntoingQty)).negate());
-            outReturn.setIntoingAmt((sumIntoAmt.add(sumDelIntoingAmt)).negate());
+            //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+            IntoReturn intoReturn = new IntoReturn();
+            intoReturn.setReturnId(inboundVO.getFromId());
+            intoReturn.setOutQty((sumIntoQty.subtract(sumDelIntoQty)).abs());
+            intoReturn.setOutAmt((sumIntoAmt.subtract(sumDelIntoAmt)).abs());
+            intoReturn.setOutingQty(sumIntoQty.add(sumDelIntoingQty));
+            intoReturn.setOutingAmt(sumIntoAmt.add(sumDelIntoingAmt));
             //入库状态
-            String outReturnIntoStatus = this.setIntoStatus(outReturn.getIntoingQty(), outReturn.getIntoQty());
-            outReturn.setIntoStatus(outReturnIntoStatus);
+            String outStatus = this.setOutStatus(intoReturn.getOutingQty(), intoReturn.getOutQty());
+            intoReturn.setOutStatus(outStatus);
             //修改
-            int countRow = outReturnMapper.updateById(outReturn);
+            int countRow = intoReturnMapper.updateById(intoReturn);
             //数量超出
             if (countRow == 0) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
             }
-
-
         }
         //endregion
 
@@ -524,7 +417,7 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
 
 
     /**
-     * @desc : 销售退货入库撤销
+     * @desc : 采购退货入库撤销
      * @date : 2024/3/7 17:06
      * @author : 寇珊珊
      */
@@ -536,51 +429,22 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
 
         //region 修改订单数据信息
         if (inboundVO.getFromId() != null) {
-            //region  todo 可能无用的代码
-            //查询
-//            IntoReturnResponse intoReturnResponse = intoReturnMapper.selectById(inboundVO.getFromId());
-//            intoReturn.setOutQty(intoReturnResponse.getOutQty().add(inboundResponse.getIntoQty()));
-//            intoReturn.setOutAmt(intoReturnResponse.getOutAmt().add(inboundResponse.getIntoAmt()));
-//            intoReturn.setOutingQty(intoReturnResponse.getOutingQty().subtract(inboundResponse.getIntoQty()));
-//            intoReturn.setOutingAmt(intoReturnResponse.getOutingAmt().subtract(inboundResponse.getIntoAmt()));
-            //endregion
-
-            //region todo 出库可能用到的代码 用完记得删除
-            //赋值
-//            IntoReturn intoReturn = new IntoReturn();
-//            intoReturn.setReturnId(inboundVO.getFromId());
-//            intoReturn.setOutQty(inboundResponse.getIntoQty());
-//            intoReturn.setOutAmt(inboundResponse.getIntoAmt());
-//            intoReturn.setOutingQty(inboundResponse.getIntoQty().negate());
-//            intoReturn.setOutingAmt(inboundResponse.getIntoAmt().negate());
-//            //入库状态
-//            String outStatus = this.setOutStatus(intoReturn.getOutingQty(), intoReturn.getOutQty());
-//            intoReturn.setOutStatus(outStatus);
-//            //修改
-//            int countRow = intoReturnMapper.updateById(intoReturn);
-//            //数量超出
-//            if (countRow == 0) {
-//                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
-//            }
-            //endregion
-
-            //赋值
-            OutReturn outReturn = new OutReturn();
-            outReturn.setReturnId(inboundVO.getFromId());
-            outReturn.setIntoQty(inboundResponse.getIntoQty());
-            outReturn.setIntoAmt(inboundResponse.getIntoAmt());
-            outReturn.setIntoingQty(inboundResponse.getIntoQty().negate());
-            outReturn.setIntoingAmt(inboundResponse.getIntoAmt().negate());
+            //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+            IntoReturn intoReturn = new IntoReturn();
+            intoReturn.setReturnId(inboundVO.getFromId());
+            intoReturn.setOutQty(inboundResponse.getIntoQty());
+            intoReturn.setOutAmt(inboundResponse.getIntoAmt());
+            intoReturn.setOutingQty(inboundResponse.getIntoQty().abs());
+            intoReturn.setOutingAmt(inboundResponse.getIntoAmt().abs());
             //入库状态
-            String intoStatus = this.setIntoStatus(outReturn.getIntoingQty(), outReturn.getIntoQty());
-            outReturn.setIntoStatus(intoStatus);
+            String outStatus = this.setOutStatus(intoReturn.getOutingQty(), intoReturn.getOutQty());
+            intoReturn.setOutStatus(outStatus);
             //修改
-            int countRow = outReturnMapper.updateById(outReturn);
+            int countRow = intoReturnMapper.updateById(intoReturn);
             //数量超出
             if (countRow == 0) {
                 throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
             }
-
         }
         //endregion
 
@@ -602,53 +466,24 @@ public class InboundSaleReturnService extends BaseService<Inbound> {
         //根据总单id查明细
         List<InboundItemResponse> orderEntryItemResponsesList = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(inbound.getIntoId()));
         for (InboundItemResponse inboundItemResponse : orderEntryItemResponsesList) {
-            //region 修改销售退货明细数据信息
+            //region 修改采购退货明细数据信息
             if (inboundItemResponse.getFromItemId() != null) {
-                //region todo 可能无用的代码
-                //查询
-//                IntoReturnItemResponse intoReturnItemResponse = intoReturnItemMapper.selectById(inboundItemResponse.getFromItemId());
-//                intoReturnItem.setOutQty(intoReturnItemResponse.getOutQty().subtract(inboundItemResponse.getIntoQty()));
-//                intoReturnItem.setOutAmt(intoReturnItemResponse.getOutAmt().subtract(inboundItemResponse.getIntoAmt()));
-//                intoReturnItem.setOutingQty(intoReturnItemResponse.getOutingQty().add(inboundItemResponse.getIntoQty()));
-//                intoReturnItem.setOutingAmt(intoReturnItemResponse.getOutingAmt().add(inboundItemResponse.getIntoAmt()));
-                //endregion
-
-                //region todo 出库可能用到的代码 用完记得删除
-//                IntoReturnItem intoReturnItem = new IntoReturnItem();
-//                intoReturnItem.setItemId(inboundItemResponse.getFromItemId());
-//                intoReturnItem.setOutQty(inboundItemResponse.getIntoQty().negate());
-//                intoReturnItem.setOutAmt(inboundItemResponse.getIntoAmt().negate());
-//                intoReturnItem.setOutingQty(inboundItemResponse.getIntoQty());
-//                intoReturnItem.setOutingAmt(inboundItemResponse.getIntoAmt());
-//                //入库状态
-//                String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
-//                intoReturnItem.setOutStatus(outStatus);
-//                //修改
-//                int countRow = intoReturnItemMapper.updateById(intoReturnItem);
-//                //数量超出
-//                if (countRow == 0) {
-//                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
-//                }
-                //endregion
-
-
-                OutReturnItem outReturnItem = new OutReturnItem();
-                outReturnItem.setItemId(inboundItemResponse.getFromItemId());
-                outReturnItem.setIntoQty(inboundItemResponse.getIntoQty().negate());
-                outReturnItem.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
-                outReturnItem.setIntoingQty(inboundItemResponse.getIntoQty());
-                outReturnItem.setIntoingAmt(inboundItemResponse.getIntoAmt());
+                //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                IntoReturnItem intoReturnItem = new IntoReturnItem();
+                intoReturnItem.setItemId(inboundItemResponse.getFromItemId());
+                intoReturnItem.setOutQty(inboundItemResponse.getIntoQty());
+                intoReturnItem.setOutAmt(inboundItemResponse.getIntoAmt());
+                intoReturnItem.setOutingQty(inboundItemResponse.getIntoQty().abs());
+                intoReturnItem.setOutingAmt(inboundItemResponse.getIntoAmt().abs());
                 //入库状态
-                String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
-                outReturnItem.setIntoStatus(intoStatus);
+                String outStatus = this.setOutStatus(intoReturnItem.getOutingQty(), intoReturnItem.getOutQty());
+                intoReturnItem.setOutStatus(outStatus);
                 //修改
-                int countRow = outReturnItemMapper.updateById(outReturnItem);
+                int countRow = intoReturnItemMapper.updateById(intoReturnItem);
                 //数量超出
                 if (countRow == 0) {
                     throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
                 }
-
-
             }
             //endregion
 

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

@@ -25,8 +25,6 @@ import com.dk.mdm.model.query.ivt.InboundItemQuery;
 import com.dk.mdm.model.query.ivt.InboundQuery;
 import com.dk.mdm.model.response.ivt.InboundItemResponse;
 import com.dk.mdm.model.response.ivt.InboundResponse;
-import com.dk.mdm.model.response.pur.PurchaseItemResponse;
-import com.dk.mdm.model.response.pur.PurchaseResponse;
 import com.dk.mdm.model.vo.ivt.InboundItemVO;
 import com.dk.mdm.model.vo.ivt.InboundVO;
 import com.dk.mdm.service.common.CommonService;
@@ -76,7 +74,6 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 	private CommonService commonService;
 
 
-
 	/**
 	 * @desc   : 条件查询
 	 * @date   : 2024/3/7 14:12
@@ -148,6 +145,7 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 
 		//region 采购总单
 		if(inboundVO.getFromId()!=null){
+			//赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 			Purchase purchaseUpdate = new Purchase();
 			purchaseUpdate.setPurId(inboundVO.getFromId());
 			purchaseUpdate.setIntoingQty(inboundVO.getIntoingQty().negate());
@@ -180,7 +178,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 			inboundItemVO.setIntoType(inboundVO.getIntoType());
 			//入库状态等于已入库 更新合计入库数量/金额 = 入库中数量/入库中金额
 			if (Constant.IntoStatus.YIRUKU.getName().equals(inboundVO.getIntoStatus())) {
-				inboundItemVO.setIntoQty(inboundItemVO.getIntoingQty())
+				inboundItemVO
+						.setIntoQty(inboundItemVO.getIntoingQty())
 						.setIntoAmt(inboundItemVO.getIntoingAmt())
 						.setIntoingQty(BigDecimal.ZERO)
 						.setIntoingAmt(BigDecimal.ZERO)
@@ -205,14 +204,9 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 
 			//region 采购明细
 			if(inboundItemVO.getFromItemId()!=null){
-				//根据id查询
-//				PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(inboundItemVO.getFromItemId());
+				//赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 				PurchaseItem  purchaseItem = new PurchaseItem();
 				purchaseItem.setItemId(inboundItemVO.getFromItemId());
-//				purchaseItem.setIntoingQty(purchaseItemResponse.getIntoingQty().add(inboundItemVO.getIntoingQty()));
-//				purchaseItem.setIntoingAmt(purchaseItemResponse.getIntoingAmt().add(inboundItemVO.getIntoingAmt()));
-//				purchaseItem.setIntoQty(purchaseItemResponse.getIntoQty().add(inboundItemVO.getIntoQty()));
-//				purchaseItem.setIntoAmt(purchaseItemResponse.getIntoAmt().add(inboundItemVO.getIntoAmt()));
 				purchaseItem.setIntoingQty(inboundItemVO.getIntoingQty());
 				purchaseItem.setIntoingAmt(inboundItemVO.getIntoingAmt());
 				purchaseItem.setIntoQty(inboundItemVO.getIntoQty());
@@ -241,7 +235,6 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 	}
 
 
-
 	/**
 	 * @desc   : 采购入库办理
 	 * @date   : 2024/3/7 15:47
@@ -262,6 +255,8 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 				inboundItemVO
 						.setIntoQty(inboundItemResponse.getIntoQty().add(inboundItemVO.getIntoingQty()))
 						.setIntoAmt(inboundItemResponse.getIntoAmt().add(inboundItemVO.getIntoingAmt()))
+						.setIntoQty(inboundItemResponse.getOutQty().add(inboundItemVO.getIntoQty()))
+						.setIntoAmt(inboundItemResponse.getIntoAmt().add(inboundItemVO.getIntoAmt()))
 						.setIntoingQty(inboundItemResponse.getIntoingQty().subtract(inboundItemVO.getIntoingQty()))
 						.setIntoingAmt(inboundItemResponse.getIntoingAmt().subtract(inboundItemVO.getIntoingAmt()))
 				;
@@ -297,13 +292,9 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 			//region  采购
 			//采购明细
 			if (inboundItemVO.getFromItemId() != null) {
-//					PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(inboundItemVO.getFromItemId());
+				//赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 				PurchaseItem purchaseItem = new PurchaseItem();
 				purchaseItem.setItemId(inboundItemVO.getFromItemId());
-//					purchaseItem.setIntoingQty(purchaseItemResponse.getIntoingQty().add(inboundItemVO.getIntoingQty()));
-//					purchaseItem.setIntoingAmt(purchaseItemResponse.getIntoingAmt().add(inboundItemVO.getIntoingAmt()));
-//					purchaseItem.setIntoQty(purchaseItemResponse.getIntoQty().add(inboundItemVO.getIntoQty()));
-//					purchaseItem.setIntoAmt(purchaseItemResponse.getIntoAmt().add(inboundItemVO.getIntoAmt()));
 				purchaseItem.setIntoingQty(inboundItemVO.getIntoingQty());
 				purchaseItem.setIntoingAmt(inboundItemVO.getIntoingAmt());
 				purchaseItem.setIntoQty(inboundItemVO.getIntoQty());
@@ -344,13 +335,9 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 				//region  采购
 				if (inboundItemVO.getFromItemId() != null) {
 					//region 采购订单明细
-//						PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(inboundItemVO.getFromItemId());
+					//赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 					PurchaseItem purchaseItem = new PurchaseItem();
 					purchaseItem.setItemId(inboundItemVO.getFromItemId());
-//							purchaseItem.setIntoingQty(purchaseItemResponse.getIntoingQty().subtract(inboundItemVO.getIntoingQty()));
-//							purchaseItem.setIntoingAmt(purchaseItemResponse.getIntoingAmt().subtract(inboundItemVO.getIntoingAmt()));
-//							purchaseItem.setIntoQty(purchaseItemResponse.getIntoQty().subtract(inboundItemVO.getIntoQty()));
-//							purchaseItem.setIntoAmt(purchaseItemResponse.getIntoAmt().subtract(inboundItemVO.getIntoAmt()));
 					purchaseItem.setIntoingQty(inboundItemVO.getIntoingQty().negate());
 					purchaseItem.setIntoingAmt(inboundItemVO.getIntoingAmt().negate());
 					purchaseItem.setIntoQty(inboundItemVO.getIntoQty().negate());
@@ -381,14 +368,9 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 		inboundVO.setIntoAmt(sumIntoAmt);
 		inboundVO.setIntoingQty(inboundResponse.getIntoingQty().subtract(sumIntoingQty));
 		inboundVO.setIntoingAmt(inboundResponse.getIntoingAmt().subtract(sumIntoingAmt));
-		//已入库数量==入库中数量   入库完成
-		if (inboundVO.getIntoQty().compareTo(inboundVO.getIntoingQty()) == 0) {
-			//已入库
-			inboundVO.setIntoStatus(Constant.IntoStatus.YIRUKU.getName());
-		} else {
-			//入库中
-			inboundVO.setIntoStatus(Constant.IntoStatus.RUKUZHONG.getName());
-		}
+		//入库状态
+		String intoStatus = this.setIntoStatus(inboundVO.getIntoingQty(), inboundVO.getIntoQty());
+		inboundVO.setIntoStatus(intoStatus);
 		//实体转换
 		Inbound inbound = inboundConvert.convertToPo(inboundVO);
 		//修改
@@ -400,20 +382,16 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 
 		//region  修改采购订单
 		if (inboundVO.getFromId() != null) {
-			PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundVO.getFromId());
+			//赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 			Purchase purchase = new Purchase();
-			purchase.setPurId(purchaseResponse.getPurId());
-//				purchase.setIntoQty(purchaseResponse.getIntoQty().add(sumIntoQty).subtract(sumDelIntoQty));
-//				purchase.setIntoAmt(purchaseResponse.getIntoAmt().add(sumIntoAmt).subtract(sumDelIntoAmt));
-//				purchase.setIntoingQty(purchaseResponse.getIntoingQty().subtract(sumIntoingQty).subtract(sumDelIntoingQty));
-//				purchase.setIntoingAmt(purchaseResponse.getIntoingAmt().subtract(sumIntoingAmt).subtract(sumDelIntoingAmt));
+			purchase.setPurId(inboundVO.getFromId());
 			purchase.setIntoQty(sumIntoQty.subtract(sumDelIntoQty));
 			purchase.setIntoAmt(sumIntoAmt.subtract(sumDelIntoAmt));
 			purchase.setIntoingQty((sumIntoingQty.add(sumDelIntoingQty)).negate());
 			purchase.setIntoingAmt((sumIntoingAmt.add(sumDelIntoingAmt)).negate());
 			//入库状态
-			String intoStatus = this.setIntoStatus(purchase.getIntoingQty(), purchase.getIntoQty());
-			purchase.setIntoStatus(intoStatus);
+			String purIntoStatus = this.setIntoStatus(purchase.getIntoingQty(), purchase.getIntoQty());
+			purchase.setIntoStatus(purIntoStatus);
 			//修改
 			int countRow = purchaseMapper.updateById(purchase);
 			//数量超出
@@ -443,14 +421,10 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 		//endregion
 
 		//region 修改订单数据信息
-		if (inboundVO.getFromId() != null) {
-//			PurchaseResponse purchaseResponse = purchaseMapper.selectById(inboundResponse.getFromId());
+		if (inboundResponse.getFromId() != null) {
+			//赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 			Purchase purchase = new Purchase();
 			purchase.setPurId(inboundResponse.getFromId());
-//			purchase.setIntoQty(purchaseResponse.getIntoQty().subtract(inboundResponse.getIntoQty()));
-//			purchase.setIntoAmt(purchaseResponse.getIntoAmt().subtract(inboundResponse.getIntoAmt()));
-//			purchase.setIntoingQty(purchaseResponse.getIntoingQty().add(inboundResponse.getIntoQty()));
-//			purchase.setIntoingAmt(purchaseResponse.getIntoingAmt().add(inboundResponse.getIntoAmt()));
 			purchase.setIntoQty(inboundResponse.getIntoQty().negate());
 			purchase.setIntoAmt(inboundResponse.getIntoAmt().negate());
 			purchase.setIntoingQty(inboundResponse.getIntoQty());
@@ -488,14 +462,9 @@ public class InboundPurchaseService extends BaseService<Inbound> {
 		for (InboundItemResponse inboundItemResponse : orderEntryItemResponsesList) {
 			//region 修改采购明细数据信息
 			if(inboundItemResponse.getFromItemId()!=null){
-				//查询
-				PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(inboundItemResponse.getFromItemId());
+				//赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
 				PurchaseItem  purchaseItem = new PurchaseItem();
 				purchaseItem.setItemId(inboundItemResponse.getFromItemId());
-//				purchaseItem.setIntoQty(purchaseItemResponse.getIntoQty().subtract(inboundItemResponse.getIntoQty()));
-//				purchaseItem.setIntoAmt(purchaseItemResponse.getIntoAmt().subtract(inboundItemResponse.getIntoAmt()));
-//				purchaseItem.setIntoingQty(purchaseItemResponse.getIntoingQty().add(inboundItemResponse.getIntoQty()));
-//				purchaseItem.setIntoingAmt(purchaseItemResponse.getIntoingAmt().add(inboundItemResponse.getIntoAmt()));
 				purchaseItem.setIntoQty(inboundItemResponse.getIntoQty().negate());
 				purchaseItem.setIntoAmt(inboundItemResponse.getIntoAmt().negate());
 				purchaseItem.setIntoingQty(inboundItemResponse.getIntoQty());

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

@@ -0,0 +1,598 @@
+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.annotaiton.Pagination;
+import com.dk.common.infrastructure.constant.Constant;
+import com.dk.common.infrastructure.enums.ErrorCodeEnum;
+import com.dk.common.mapper.BaseMapper;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseCodeEnum;
+import com.dk.common.response.ResponseResultUtil;
+import com.dk.common.response.ResponseResultVO;
+import com.dk.common.service.BaseService;
+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.mapper.ivt.OutboundMapper;
+import com.dk.mdm.mapper.sale.OutReturnItemMapper;
+import com.dk.mdm.mapper.sale.OutReturnMapper;
+import com.dk.mdm.model.pojo.ivt.Outbound;
+import com.dk.mdm.model.pojo.ivt.OutboundItem;
+import com.dk.mdm.model.pojo.sale.OutReturn;
+import com.dk.mdm.model.pojo.sale.OutReturnItem;
+import com.dk.mdm.model.query.ivt.OutboundItemQuery;
+import com.dk.mdm.model.query.ivt.OutboundQuery;
+import com.dk.mdm.model.response.ivt.InboundResponse;
+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.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+
+/**
+ * @desc   : 销售退货出库业务层
+ * @date   : 2024/3/18 15:33
+ * @author : 寇珊珊
+ */
+@Service
+public class OutboundSaleReturnService extends BaseService<Outbound> {
+
+    @Override
+    public BaseMapper<Outbound> getRepository() {
+        return outboundMapper;
+    }
+
+    @Autowired
+    private CommonService commonService;
+
+    @Autowired
+    private OutboundMapper outboundMapper;
+
+    @Autowired
+    private OutboundConvert outboundConvert;
+
+    @Autowired
+    private OutboundItemMapper outboundItemMapper;
+
+    @Autowired
+    private OutboundItemConvert outboundItemConvert;
+
+    @Autowired
+    private OutReturnMapper outReturnMapper;
+
+    @Autowired
+    private OutReturnItemMapper outReturnItemMapper;
+
+
+    /**
+     * @desc : 条件查询
+     * @date : 2024/3/18 11:20
+     * @author : 寇珊珊
+     */
+    @Pagination
+    public ResponseResultVO<PageList<InboundResponse>> selectByCond(OutboundQuery outboundQuery) {
+        return super.mergeListWithCount(outboundQuery, outboundMapper.selectByCond(outboundQuery),
+                outboundMapper.countByCond(outboundQuery));
+    }
+
+    /**
+     * @desc : 查询明细
+     * @date : 2024/3/15 16:43
+     * @author : 寇珊珊
+     */
+    @Pagination
+    public ResponseResultVO<Map<String, Object>> selectOutBoundSaleReturnItemInfoById(String id) {
+        Map<String, Object> result = new HashMap<>();
+        // 商品明细
+        List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(id));
+        result.put("itemList", outboundItemResponseList);
+        // 收款
+
+        // 附件
+        return ResponseResultUtil.success(result);
+    }
+
+
+    /**
+     * @desc : 销售退货出库新建
+     * @date : 2024/3/7 14:13
+     * @author : 寇珊珊
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<?> saleReturnOutboundInsert(OutboundVO outboundVO) {
+        //region  总单
+        //获取 id/单号
+        Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.PURCASERETURNINBOUND.getName(), false);
+        outboundVO.setOutId(codeMap.get("outId").toString()).
+                setOutNo(codeMap.get("outNote").toString());
+        //出库类型
+        outboundVO.setOutType(Constant.OutType.SALE_RETURN.getName());
+        //自动入库标识
+        if (outboundVO.getAutomaticFlg()) {
+            //已出库
+            outboundVO.setOutStatus(Constant.OutStatus.YICHUKU.getName());
+        } else {
+            //出库中
+            outboundVO.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
+        }
+        //出库状态等于已出库 更新合计出库数量/金额 = 出库中数量/出库中金额
+        if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
+            outboundVO
+                    .setOutQty(outboundVO.getOutingQty())
+                    .setOutAmt(outboundVO.getOutingAmt())
+                    .setOutingQty(BigDecimal.ZERO)
+                    .setOutingAmt(BigDecimal.ZERO)
+            ;
+        } else {
+            outboundVO
+                    .setOutQty(BigDecimal.ZERO)
+                    .setOutAmt(BigDecimal.ZERO)
+            ;
+        }
+
+        //实体转换
+        Outbound outbound = outboundConvert.convertToPo(outboundVO);
+        outboundMapper.insert(outbound);
+        //endregion
+
+        //region 销售退货
+        if (outboundVO.getFromId() != null) {
+            //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+            OutReturn outReturn = new OutReturn();
+            outReturn.setReturnId(outboundVO.getFromId());
+            outReturn.setIntoingQty(outboundVO.getOutingQty().abs());
+            outReturn.setIntoingAmt(outboundVO.getOutingAmt().abs());
+            outReturn.setIntoQty(outboundVO.getOutQty().abs());
+            outReturn.setIntoAmt(outboundVO.getOutAmt().abs());
+            //入库状态
+            String intoStatus = this.setIntoStatus(outReturn.getIntoingQty(), outReturn.getIntoQty());
+            outReturn.setIntoStatus(intoStatus);
+            //修改
+            int countRow = outReturnMapper.updateById(outReturn);
+            //数量超出
+            if (countRow == 0) {
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
+            }
+        }
+        //endregion
+
+
+        //region 明细
+        //校验明细
+        if (outboundVO.getItemList().size() == 0) {
+            return ResponseResultUtil.error(ErrorCodeEnum.OUTBOUND_ITEM_NOT_EXIST.getCode(),
+                    ErrorCodeEnum.OUTBOUND_ITEM_NOT_EXIST.getMessage());
+        }
+        for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
+            //总单id
+            outboundItemVO.setOutId(outboundVO.getOutId());
+            //出库类型
+            outboundItemVO.setOutType(outboundVO.getOutType());
+            //出库状态等于已出库  更新合计出库数量/金额 = 出库中数量/出库中金额
+            if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
+                outboundItemVO
+                        .setOutQty(outboundItemVO.getOutingQty())
+                        .setOutAmt(outboundItemVO.getOutingAmt())
+                        .setOutingQty(BigDecimal.ZERO)
+                        .setOutingAmt(BigDecimal.ZERO)
+                ;
+            } else {
+                outboundItemVO
+                        .setOutQty(BigDecimal.ZERO)
+                        .setOutAmt(BigDecimal.ZERO);
+            }
+            //成本单价
+            outboundItemVO.setCostPrice(outboundItemVO.getPriceOut());
+            //成本金额
+            outboundItemVO.setCostAmt((outboundItemVO.getOutingQty().add(outboundItemVO.getOutQty())).multiply(outboundItemVO.getPriceOut()).setScale(2, BigDecimal.ROUND_HALF_UP));
+            //入库状态
+            outboundItemVO.setOutStatus(outboundItemVO.getOutStatus());
+            //实体转换
+            OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
+            outboundItemMapper.insert(outboundItem);
+            //endregion
+
+            //region 销售退货明细
+            if (outboundItemVO.getFromItemId() != null) {
+                //赋值 （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                OutReturnItem outReturnItem = new OutReturnItem();
+                outReturnItem.setItemId(outboundItemVO.getFromItemId());
+                outReturnItem.setIntoQty(outboundItemVO.getOutQty().abs());
+                outReturnItem.setIntoAmt(outboundItemVO.getOutAmt().abs());
+                outReturnItem.setIntoingQty(outboundItemVO.getOutingQty().abs());
+                outReturnItem.setIntoingAmt(outboundItemVO.getOutingAmt().abs());
+                //入库状态
+                String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
+                outReturnItem.setIntoStatus(intoStatus);
+                //修改
+                int countRow = outReturnItemMapper.updateById(outReturnItem);
+                //数量超出
+                if (countRow == 0) {
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
+                }
+            }
+            //endregion
+
+        }
+        //endregion
+
+        //todo 如果是已出库 调用库存  后续写库存这里补上
+        //region 库存
+
+
+        //endregion
+
+
+        return ResponseResultUtil.success(outboundVO);
+    }
+
+
+    /**
+     * @desc : 销售退货出库办理
+     * @date : 2024/3/7 15:47
+     * @author : 寇珊珊
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<?> saleReturnHandleOutbound(OutboundVO outboundVO) {
+        //region 编辑明细
+        //校验明细
+        if (outboundVO.getItemList().size() == 0) {
+            return ResponseResultUtil.error(ErrorCodeEnum.OUTBOUND_ITEM_NOT_EXIST.getCode(),
+                    ErrorCodeEnum.OUTBOUND_ITEM_NOT_EXIST.getMessage());
+        }
+        for (OutboundItemVO outboundItemVO : outboundVO.getItemList()) {
+            if (outboundItemVO.getItemId() != null) {
+                //查询原单
+                OutboundItemResponse outboundItemResponse = outboundItemMapper.selectById(outboundItemVO.getItemId());
+                //编辑明细
+                outboundItemVO
+                        .setCostPrice(outboundItemVO.getPriceOut())
+                        .setCostAmt((outboundItemVO.getOutingQty().add(outboundItemVO.getOutQty())).multiply(outboundItemVO.getPriceOut()).setScale(2, BigDecimal.ROUND_HALF_UP))
+                        .setOutQty(outboundItemResponse.getOutQty().add(outboundItemVO.getOutingQty()))
+                        .setOutAmt(outboundItemResponse.getOutAmt().add(outboundItemVO.getOutingAmt()))
+                        .setOutingQty(outboundItemResponse.getOutingQty().subtract(outboundItemVO.getOutingQty()))
+                        .setOutAmt(outboundItemResponse.getOutingAmt().subtract(outboundItemVO.getOutingAmt()))
+                ;
+                //出库状态
+                String outStatus = this.setOutStatus(outboundItemVO.getOutingQty(), outboundItemVO.getOutQty());
+                outboundItemVO.setOutStatus(outStatus);
+                //实体转换
+                OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
+                //修改
+                outboundItemMapper.update(outboundItem,
+                        new UpdateWrapper<OutboundItem>().lambda()
+                                .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+                );
+            }
+            //endregion
+            //region 新建明细
+            else {
+                outboundItemVO
+                        .setOutId(outboundItemVO.getOutId())
+                        .setOutQty(outboundItemVO.getOutQty().abs())
+                        .setOutAmt(outboundItemVO.getOutAmt().abs())
+                        .setCostPrice(outboundItemVO.getPriceOut())
+                        .setCostAmt((outboundItemVO.getOutingQty().add(outboundItemVO.getOutQty())).multiply(outboundItemVO.getPriceOut()).setScale(2, BigDecimal.ROUND_HALF_UP))
+                        .setOutType(Constant.OutType.SALE_RETURN.getName());
+                //入库状态
+                String outStatus = this.setOutStatus(outboundItemVO.getOutingQty(), outboundItemVO.getOutQty());
+                outboundItemVO.setOutStatus(outStatus);
+                //实体转换
+                OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
+                //新建
+                outboundItemMapper.insert(outboundItem);
+            }
+            //endregion
+
+            //region  销售退货明细
+            if (outboundItemVO.getFromItemId() != null) {
+                //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                OutReturnItem outReturnItem = new OutReturnItem();
+                outReturnItem.setItemId(outboundItemVO.getFromItemId());
+                outReturnItem.setIntoQty(outboundItemVO.getOutQty().abs());
+                outReturnItem.setIntoAmt(outboundItemVO.getOutAmt().abs());
+                outReturnItem.setIntoingQty(outboundItemVO.getOutingQty());
+                outReturnItem.setIntoingAmt(outboundItemVO.getOutingAmt());
+                //入库状态
+                String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
+                outReturnItem.setIntoStatus(intoStatus);
+                //修改
+                int countRow = outReturnItemMapper.updateById(outReturnItem);
+                //数量超出
+                if (countRow == 0) {
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
+                }
+            }
+            //endregion
+        }
+        //endregion
+
+        //region 删除明细
+        BigDecimal sumDelOutQty = BigDecimal.ZERO;
+        BigDecimal sumDelOutAmt = BigDecimal.ZERO;
+        BigDecimal sumDelOutingQty = BigDecimal.ZERO;
+        BigDecimal sumDelOutingAmt = BigDecimal.ZERO;
+        if (outboundVO.getDeleteItemList() != null) {
+            sumDelOutQty = outboundVO.getDeleteItemList().stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+            sumDelOutAmt = outboundVO.getDeleteItemList().stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+            sumDelOutingQty = outboundVO.getDeleteItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+            sumDelOutingAmt = outboundVO.getDeleteItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+            for (OutboundItemVO outboundItemVO : outboundVO.getDeleteItemList()) {
+                if (outboundItemVO.getItemId() != null) {
+                    OutboundItem outboundItem = outboundItemConvert.convertToPo(outboundItemVO);
+                    outboundItem.setFlgValid(false);
+                    //修改
+                    outboundItemMapper.update(outboundItem,
+                            new UpdateWrapper<OutboundItem>().lambda()
+                                    .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+                    );
+                }
+                //region  销售退货明细
+                if (outboundItemVO.getFromItemId() != null) {
+                    //region 销售退货订单明细
+                    //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                    OutReturnItem outReturnItem = new OutReturnItem();
+                    outReturnItem.setItemId(outboundItemVO.getFromItemId());
+                    outReturnItem.setIntoQty(outboundItemVO.getOutQty());
+                    outReturnItem.setIntoAmt(outboundItemVO.getOutAmt());
+                    outReturnItem.setIntoingQty(outboundItemVO.getOutingQty());
+                    outReturnItem.setIntoingAmt(outboundItemVO.getOutingAmt());
+                    //入库状态
+                    String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
+                    outReturnItem.setIntoStatus(intoStatus);
+                    //修改
+                    int countRow = outReturnItemMapper.updateById(outReturnItem);
+                    //数量超出
+                    if (countRow == 0) {
+                        throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
+                    }
+                    //endregion
+                }
+                //endregion
+
+            }
+        }
+        //endregion
+
+        //region 编辑总单
+        OutboundResponse outboundResponse = outboundMapper.selectById(outboundVO.getOutId());
+        BigDecimal sumOutQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+        BigDecimal sumOutAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal sumOutingQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+        BigDecimal sumOutingAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+        outboundVO.setOutQty(sumOutQty);
+        outboundVO.setOutAmt(sumOutAmt);
+        outboundVO.setOutingQty(outboundResponse.getOutingQty().subtract(sumOutingQty));
+        outboundVO.setOutingAmt(outboundResponse.getOutingAmt().subtract(sumOutingAmt));
+        //出库状态
+        String outStatus = this.setOutStatus(outboundVO.getOutingQty(), outboundVO.getOutQty());
+        outboundVO.setOutStatus(outStatus);
+        //实体转换
+        Outbound outbound = outboundConvert.convertToPo(outboundVO);
+        //修改
+        outboundMapper.update(outbound,
+                new UpdateWrapper<Outbound>().lambda()
+                        .eq(Outbound::getOutId, UUID.fromString(outbound.getOutId()))
+        );
+        //endregion
+
+        //region  修改销售退货订单
+        if (outboundVO.getFromId() != null) {
+            //赋值（这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+            OutReturn outReturn = new OutReturn();
+            outReturn.setReturnId(outboundVO.getFromId());
+            outReturn.setIntoQty((sumOutQty.subtract(sumDelOutQty)).abs());
+            outReturn.setIntoAmt((sumOutAmt.subtract(sumDelOutAmt)).abs());
+            outReturn.setIntoingQty(sumOutQty.add(sumDelOutingQty));
+            outReturn.setIntoingAmt(sumOutAmt.add(sumDelOutingAmt));
+            //入库状态
+            String outReturnIntoStatus = this.setIntoStatus(outReturn.getIntoingQty(), outReturn.getIntoQty());
+            outReturn.setIntoStatus(outReturnIntoStatus);
+            //修改
+            int countRow = outReturnMapper.updateById(outReturn);
+            //数量超出
+            if (countRow == 0) {
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
+            }
+
+
+        }
+        //endregion
+
+        //todo 如果是已出库 调用库存  后续写库存这里补上
+        //region 修改库存
+
+        //endregion
+        return ResponseResultUtil.success(outboundVO);
+    }
+
+
+    /**
+     * @desc : 销售退货出库撤销
+     * @date : 2024/3/7 17:06
+     * @author : 寇珊珊
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<?> saleReturnOutboundCancel(OutboundVO outboundVO) {
+        //region 查询出库总单数据信息
+        OutboundResponse outboundResponse = outboundMapper.selectById(outboundVO.getOutId());
+        //endregion
+
+        //region 修改订单数据信息
+        if (outboundResponse.getFromId() != null) {
+            //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+            OutReturn outReturn = new OutReturn();
+            outReturn.setReturnId(outboundResponse.getFromId());
+            outReturn.setIntoQty(outboundResponse.getOutQty());
+            outReturn.setIntoAmt(outboundResponse.getOutAmt());
+            outReturn.setIntoingQty(outboundResponse.getOutQty().abs());
+            outReturn.setIntoingAmt(outboundResponse.getOutAmt().abs());
+            //入库状态
+            String intoStatus = this.setIntoStatus(outReturn.getIntoingQty(), outReturn.getIntoQty());
+            outReturn.setIntoStatus(intoStatus);
+            //修改
+            int countRow = outReturnMapper.updateById(outReturn);
+            //数量超出
+            if (countRow == 0) {
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
+            }
+
+        }
+        //endregion
+
+        //region 修改总单数据信息
+        Outbound outbound = new Outbound();
+        outbound.setOutId(outboundVO.getOutId());
+        outbound.setOutDate(null);
+        outbound.setOutStatus(Constant.OutStatus.CHUKUZHONG.getName());
+        outbound.setOutQty(BigDecimal.ZERO);
+        outbound.setOutAmt(BigDecimal.ZERO);
+        //修改
+        outboundMapper.update(outbound,
+                new UpdateWrapper<Outbound>().lambda()
+                        .eq(Outbound::getOutId, UUID.fromString(outbound.getOutId()))
+        );
+        //endregion
+
+        //region 明细数据
+        //根据总单id查明细
+        List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(outboundVO.getOutId()));
+        for (OutboundItemResponse outboundItemResponse : outboundItemResponseList) {
+            //region 修改销售退货明细数据信息
+            if (outboundItemResponse.getFromItemId() != null) {
+                //赋值  （这里重写了更新方法，数量在更新方法中有数据库院士数量+本次数量）
+                OutReturnItem outReturnItem = new OutReturnItem();
+                outReturnItem.setItemId(outboundItemResponse.getFromItemId());
+                outReturnItem.setIntoQty(outboundItemResponse.getOutQty());
+                outReturnItem.setIntoAmt(outboundItemResponse.getOutAmt());
+                outReturnItem.setIntoingQty(outboundItemResponse.getOutQty().abs());
+                outReturnItem.setIntoingAmt(outboundItemResponse.getOutAmt().abs());
+                //入库状态
+                String intoStatus = this.setIntoStatus(outReturnItem.getIntoingQty(), outReturnItem.getIntoQty());
+                outReturnItem.setIntoStatus(intoStatus);
+                //修改
+                int countRow = outReturnItemMapper.updateById(outReturnItem);
+                //数量超出
+                if (countRow == 0) {
+                    throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.INVENTORY_QUANTITY_EXCEEDED.getMessage());
+                }
+            }
+            //endregion
+
+            //region修改出库明细信息
+            OutboundItem outboundItem = new OutboundItem();
+            outboundItem
+                    .setOutId(outboundResponse.getOutId())
+                    .setOutStatus(Constant.OutStatus.CHUKUZHONG.getName())
+                    .setOutingQty(outboundItemResponse.getOutingQty().add(outboundItemResponse.getOutQty()))
+                    .setOutAmt(outboundItemResponse.getOutingAmt().add(outboundItemResponse.getOutAmt()))
+                    .setOutQty(BigDecimal.ZERO)
+                    .setOutAmt(BigDecimal.ZERO)
+                    .setItemId(outboundItemResponse.getItemId());
+            //修改
+            outboundItemMapper.update(outboundItem,
+                    new UpdateWrapper<OutboundItem>().lambda()
+                            .eq(OutboundItem::getItemId, UUID.fromString(outboundItem.getItemId()))
+            );
+            //endregion
+        }
+        //endregion
+
+
+        //todo 调用库存  后续写库存这里补上
+        //region 修改库存
+
+        //endregion
+
+        return ResponseResultUtil.success();
+    }
+
+
+    /**
+     * @desc : 入库状态通用（目前本页面）
+     * @date : 2024/3/9 8:59
+     * @author : 寇珊珊
+     */
+    public String setIntoStatus(BigDecimal intoingQty, BigDecimal intoQty) {
+        //入库状态
+        String intoStatus = null;
+        //已出库数量>0 出库中数量>0
+        if (intoQty.compareTo(BigDecimal.ZERO) > 0 && intoingQty.compareTo(BigDecimal.ZERO) > 0) {
+            //出库中
+            intoStatus = Constant.IntoStatus.RUKUZHONG.getName();
+        }
+        //已出库数量=0 出库中数量=0
+        else if (intoQty.compareTo(BigDecimal.ZERO) == 0 && intoingQty.compareTo(BigDecimal.ZERO) == 0) {
+            //待入库
+            intoStatus = Constant.IntoStatus.DAIRUKU.getName();
+        }
+        //已出库数量>0 出库中数量=0
+        else if (intoQty.compareTo(BigDecimal.ZERO) > 0 && intoingQty.compareTo(BigDecimal.ZERO) == 0) {
+            //已出库
+            intoStatus = Constant.IntoStatus.YIRUKU.getName();
+        }
+        return intoStatus;
+    }
+
+
+    /**
+     * @desc : 出库状态通用（目前本页面）
+     * @date : 2024/3/9 8:59
+     * @author : 寇珊珊
+     */
+    public String setOutStatus(BigDecimal outingQty, BigDecimal outQty) {
+        //出库状态
+        String outStatus = null;
+        //已出库数量<0 出库中数量<0
+        if (outQty.compareTo(BigDecimal.ZERO) < 0 && outingQty.compareTo(BigDecimal.ZERO) < 0) {
+            //出库中
+            outStatus = Constant.OutStatus.CHUKUZHONG.getName();
+        }
+        //出入库数量=0 出库中数量=0
+        else if (outQty.compareTo(BigDecimal.ZERO) == 0 && outingQty.compareTo(BigDecimal.ZERO) == 0) {
+            //待出库
+            outStatus = Constant.OutStatus.DAICHUKU.getName();
+        }
+        //已出库数量<0 出库中数量=0
+        else if (outQty.compareTo(BigDecimal.ZERO) < 0 && outingQty.compareTo(BigDecimal.ZERO) == 0) {
+            //已出库
+            outStatus = Constant.OutStatus.YICHUKU.getName();
+        }
+        return outStatus;
+    }
+
+
+    /**
+     * @desc : 获取单据信息（编辑用）
+     * @date : 2024/3/16 16:28
+     * @author : 寇珊珊
+     */
+    public ResponseResultVO<?> selectByUpdate(String id) {
+        Map<String, Object> dataInfo = new HashMap<>();
+        //总单
+        OutboundResponse outboundResponse = outboundMapper.selectMessageByOtherQuery(new OutboundQuery().setOutId(id).setOutStatus(Constant.OutStatus.CHUKUZHONG.getName()));
+        //单据不存在
+        if (outboundResponse == null) {
+            return ResponseResultUtil.error(ErrorCodeEnum.THERE_ORDER_IS_NOT_CAN_OUTBOUND_QUANTITY.getCode(),
+                    ErrorCodeEnum.THERE_ORDER_IS_NOT_CAN_OUTBOUND_QUANTITY.getMessage());
+        }
+        dataInfo.put("data", outboundResponse);
+        // 明细
+        List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery().setOutId(outboundResponse.getOutId()));
+        dataInfo.put("dataItem", outboundItemResponseList);
+        return ResponseResultUtil.success(dataInfo);
+    }
+
+
+}