Merge remote-tracking branch 'origin/master'

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

@@ -54,6 +54,15 @@ public class InboundController{
     }
 
 
-
+    /**
+     * @desc : 查看来源单据,总单加明细  采购退货用
+     * @author : 于继渤
+     * @date : 2024/3/6 10:36
+     */
+    @ApiOperation(value = "条件查询", notes = "条件查询")
+    @PostMapping({"select_inbound_and_item"})
+    public ResponseResultVO<PageList<InboundResponse>> selectInboundAndItem(@RequestBody InboundQuery inboundQuery) {
+        return inboundService.selectInboundAndItem(inboundQuery);
+    }
 
 }

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

@@ -5,17 +5,22 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, return_id, into_id, into_item_id, pur_id, pur_item_id, item_index, sku_id, item_qty, price_std, amt_std, price_return, item_amt, non_std_code, into_status, intoing_qty, intoing_amt, into_qty, into_amt, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, return_id, into_id, into_item_id, pur_id, pur_item_id, item_index,
+               sku_id, item_qty, price_std, amt_std, price_return, item_amt, non_std_code,
+               out_status, outoing_qty, outoing_amt, out_qty, out_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_Join">
         tpiri.item_id, tpiri.return_id, tpiri.into_id, tpiri.into_item_id, tpiri.pur_id, tpiri.pur_item_id, tpiri.item_index, tpiri.sku_id, tpiri.item_qty,
                      tpiri.price_std,tpiri.amt_std, tpiri.price_return,
-               tpiri.item_amt, tpiri.non_std_code, tpiri.into_status, tpiri.intoing_qty, tpiri.intoing_amt, tpiri.into_qty, tpiri.into_amt,
+               tpiri.item_amt, tpiri.non_std_code, tpiri.out_status, tpiri.outoing_qty, tpiri.outoing_amt, tpiri.out_qty, tpiri.out_amt,
                      tpiri.remarks, tpiri.flg_valid, tpiri.cp_id
     </sql>
 
+
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.ivt.IntoReturnItem">
         <id column="item_id" property="itemId"/>
@@ -32,11 +37,12 @@
                 <result column="price_return" property="priceReturn"/>
                 <result column="item_amt" property="itemAmt"/>
                 <result column="non_std_code" property="nonStdCode"/>
-                <result column="into_status" property="intoStatus"/>
-                <result column="intoing_qty" property="intoingQty"/>
-                <result column="intoing_amt" property="intoingAmt"/>
-                <result column="into_qty" property="intoQty"/>
-                <result column="into_amt" property="intoAmt"/>
+                <result column="out_status" property="outStatus"/>
+                <result column="outoing_qty" property="outingQty"/>
+                <result column="outoing_amt" property="outingAmt"/>
+                <result column="out_qty" property="outQty"/>
+                <result column="out_amt" property="outAmt"/>
+
                 <result column="remarks" property="remarks"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
@@ -64,11 +70,11 @@
         <result column="price_return" property="priceReturn"/>
         <result column="item_amt" property="itemAmt"/>
         <result column="non_std_code" property="nonStdCode"/>
-        <result column="into_status" property="intoStatus"/>
-        <result column="intoing_qty" property="intoingQty"/>
-        <result column="intoing_amt" property="intoingAmt"/>
-        <result column="into_qty" property="intoQty"/>
-        <result column="into_amt" property="intoAmt"/>
+        <result column="out_status" property="outStatus"/>
+        <result column="outoing_qty" property="outingQty"/>
+        <result column="outoing_amt" property="outingAmt"/>
+        <result column="out_qty" property="outQty"/>
+        <result column="out_amt" property="outAmt"/>
         <result column="remarks" property="remarks"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="cp_id" property="cpId"/>
@@ -314,11 +320,12 @@
             price_return,
             item_amt,
             non_std_code,
-            into_status,
-            intoing_qty,
-            intoing_amt,
-            into_qty,
-            into_amt,
+            out_status,
+            outoing_qty,
+            outoing_amt,
+            out_qty,
+            out_amt,
+
             remarks,
             cp_id,
             op_app_code,
@@ -341,11 +348,12 @@
                 #{item.priceReturn},
                 #{item.itemAmt},
                 #{item.nonStdCode},
-                #{item.intoStatus},
-                #{item.intoingQty},
-                #{item.intoingAmt},
-                #{item.intoQty},
-                #{item.intoAmt},
+                #{item.outStatus},
+                #{item.outingQty},
+                #{item.outingAmt},
+                #{item.outQty},
+                #{item.outAmt},
+
                 #{item.remarks},
                 #{item.cpId},
                 #{item.opAppCode},

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

@@ -71,6 +71,7 @@
         <result column="staffName" property="staffName"/>
         <result column="cusPhone" property="cusPhone"/>
         <result column="addressFull" property="addressFull"/>
+        <result column="follow_count" property="followCount"/>
 
 
 
@@ -245,7 +246,8 @@
         tmc.cus_phone AS "cusPhone",
         tmc.address_full AS "addressFull",
         tmo.org_name  AS  "orgName",
-        tms.staff_name  AS  "staffName"
+        tms.staff_name  AS  "staffName",
+        tmc.follow_count AS follow_count
         FROM dkic_b.t_crm_cus_follow tccf
         LEFT JOIN dkic_b.t_mst_customer tmc ON tmc.cus_id = tccf.cus_id
         LEFT JOIN dkic_b.t_mst_org tmo on tmo.org_id = tccf.follow_org

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

@@ -127,6 +127,6 @@
         SELECT
         <include refid="Base_Column_List"/>
         FROM dkic_b.t_crm_cus_follow_staff
-        where cus_id = #{cusId} and follow_staff = #{followStaff}
+        where cus_id = #{cusId}::uuid and follow_staff = #{followStaff}::uuid
     </select>
 </mapper>

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

@@ -326,7 +326,7 @@
     <select id="selectFollowStaffs" resultType="Object">
         SELECT follow_staffs
         from dkic_b.t_mst_customer
-        WHERE cus_id = #{cusId}
+        WHERE cus_id = #{cusId}::uuid
     </select>
 
 </mapper>

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

@@ -159,41 +159,42 @@ public class IntoReturnItem extends PageInfo<IntoReturnItem> implements Serializ
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

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

@@ -158,41 +158,42 @@ public class IntoReturnItemQuery extends PageInfo<IntoReturnItemQuery> implement
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

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

@@ -163,41 +163,42 @@ public class IntoReturnItemResponse  implements Serializable {
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

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

@@ -12,6 +12,7 @@ import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -221,6 +222,7 @@ public class CusFollowResponse implements Serializable {
     private String orgName;
     private String staffName;
     private String addressFull;
+    private Integer followCount;
 
 
 

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

@@ -157,41 +157,42 @@ public class IntoReturnItemVO  implements Serializable {
     /**
      * 入库状态
      */
-    @Excel(name = "入库状态")
+    @Excel(name = "出库状态")
     @ApiModelProperty(value = "入库状态")
-    private String intoStatus;
+    private String outStatus;
+
 
 
     /**
-     * 入库中数量
+     * 出库中数量
      */
-    @Excel(name = "入库中数量")
-    @ApiModelProperty(value = "入库中数量")
-    private BigDecimal intoingQty;
+    @Excel(name = "出库中数量")
+    @ApiModelProperty(value = "出库中数量")
+    private BigDecimal outingQty;
 
 
     /**
-     * 入库中金额
+     * 出库中金额
      */
-    @Excel(name = "入库中金额")
-    @ApiModelProperty(value = "入库中金额")
-    private BigDecimal intoingAmt;
+    @Excel(name = "出库中金额")
+    @ApiModelProperty(value = "出库中金额")
+    private BigDecimal outingAmt;
 
 
     /**
-     * 已入库数量
+     * 已出库数量
      */
-    @Excel(name = "已入库数量")
-    @ApiModelProperty(value = "已入库数量")
-    private BigDecimal intoQty;
+    @Excel(name = "已出库数量")
+    @ApiModelProperty(value = "已出库数量")
+    private BigDecimal outQty;
 
 
     /**
-     * 已入库金额
+     * 已出库金额
      */
-    @Excel(name = "已入库金额")
-    @ApiModelProperty(value = "已入库金额")
-    private BigDecimal intoAmt;
+    @Excel(name = "已出库金额")
+    @ApiModelProperty(value = "已出库金额")
+    private BigDecimal outAmt;
 
 
     /**

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

@@ -108,96 +108,96 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             rollbackFor = {Exception.class}
     )
     public ResponseResultVO<?> insert(IntoReturnVO intoReturnVO) {
-            //校验明细长度
-            List<IntoReturnItemVO> intoReturnItemVOList = intoReturnVO.getIntoReturnItemVOList();
-            //明细不存在
-            if (intoReturnItemVOList == null || intoReturnItemVOList.size() == 0) {
-                //返回 采购退货明细不可为空，请重新操作
-                return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.PURCHASE_RETURN_DETAIL_NOT_EXIST.getMessage());
-            }
-            //查询采购订单
-            PurchaseResponse purchaseResponse = purchaseMapper.selectById(intoReturnVO.getPurId());
-            //设置总单
-            intoReturnVO = this.insertTotal(intoReturnVO, purchaseResponse);
-            //设置明细
-            intoReturnItemVOList = this.insertDetail(intoReturnVO, intoReturnItemVOList);
-
-
-            //反写采购订单已入库退货数量、金额
-            purchaseMapper.updateAmount(new Purchase().setPurId(intoReturnVO.getPurId())
-                    .setReturnQty(purchaseResponse.getReturnQty().add(intoReturnVO.getSumQuantity()))
-                    .setReturnAmt(purchaseResponse.getReturnAmt().add(intoReturnVO.getSumAmount()))
+        //校验明细长度
+        List<IntoReturnItemVO> intoReturnItemVOList = intoReturnVO.getIntoReturnItemVOList();
+        //明细不存在
+        if (intoReturnItemVOList == null || intoReturnItemVOList.size() == 0) {
+            //返回 采购退货明细不可为空，请重新操作
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.PURCHASE_RETURN_DETAIL_NOT_EXIST.getMessage());
+        }
+        //查询采购订单
+        PurchaseResponse purchaseResponse = purchaseMapper.selectById(intoReturnVO.getPurId());
+        //设置总单
+        intoReturnVO = this.insertTotal(intoReturnVO, purchaseResponse);
+        //设置明细
+        intoReturnItemVOList = this.insertDetail(intoReturnVO, intoReturnItemVOList);
+
+
+        //反写采购订单已入库退货数量、金额
+        purchaseMapper.updateAmount(new Purchase().setPurId(intoReturnVO.getPurId())
+                .setReturnQty(purchaseResponse.getReturnQty().add(intoReturnVO.getSumQuantity()))
+                .setReturnAmt(purchaseResponse.getReturnAmt().add(intoReturnVO.getSumAmount()))
+        );
+        BigDecimal sumReturnQty = BigDecimal.ZERO;
+        BigDecimal sumReturnAmt = BigDecimal.ZERO;
+        //反写入库订单明细、反写订单明细
+        for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
+
+            //根据退货明细中入库明细id查询入库明细数据
+            InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(intoReturnItemVO.getIntoItemId());
+            BigDecimal returnQty = inboundItemResponse.getReturnQty().add(intoReturnItemVO.getItemQty().setScale(6, BigDecimal.ROUND_HALF_UP));
+            BigDecimal returnAmt = inboundItemResponse.getReturnAmt().add(intoReturnItemVO.getItemAmt().setScale(6, BigDecimal.ROUND_HALF_UP));
+            sumReturnQty = sumReturnQty.add(returnQty);
+            sumReturnAmt = sumReturnAmt.add(returnAmt);
+            inboundItemMapper.updateAmount(
+                    new InboundItem()
+                            .setItemId(inboundItemResponse.getItemId())
+                            .setReturnQty(returnQty)
+                            .setReturnAmt(returnAmt)
             );
-            BigDecimal sumReturnQty = BigDecimal.ZERO;
-            BigDecimal sumReturnAmt = BigDecimal.ZERO;
-            //反写入库订单明细、反写订单明细
-            for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
-
-                //根据退货明细中入库明细id查询入库明细数据
-                InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(intoReturnItemVO.getIntoItemId());
-                BigDecimal returnQty = inboundItemResponse.getReturnQty().add(intoReturnItemVO.getItemQty().setScale(6, BigDecimal.ROUND_HALF_UP));
-                BigDecimal returnAmt = inboundItemResponse.getReturnAmt().add(intoReturnItemVO.getItemAmt().setScale(6, BigDecimal.ROUND_HALF_UP));
-                sumReturnQty = sumReturnQty.add(returnQty);
-                sumReturnAmt = sumReturnAmt.add(returnAmt);
-                inboundItemMapper.updateAmount(
-                        new InboundItem()
-                                .setItemId(inboundItemResponse.getItemId())
-                                .setReturnQty(returnQty)
-                                .setReturnAmt(returnAmt)
-                );
-                //TODO 反写订单出库明细 退货数量和退货金额
-                //查询采购订单明细数据
-                PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(intoReturnItemVO.getPurItemId());
-                //反写订单明细退货数量和退货金额
-                purchaseItemMapper.updateAmount(
-                        new PurchaseItem()
-                                .setItemId(intoReturnItemVO.getPurItemId())
-                                .setReturnQty(purchaseItemResponse.getReturnQty().add(intoReturnItemVO.getItemQty().setScale(6, BigDecimal.ROUND_HALF_UP)))
-                                .setReturnAmt(purchaseItemResponse.getReturnAmt().add(intoReturnItemVO.getItemAmt().setScale(6, BigDecimal.ROUND_HALF_UP)))
-
-                );
-            }
-            //反写入库单退货数量金额 todo
-            InboundResponse inboundResponse = inboundMapper.selectById(intoReturnVO.getIntoId());
-            inboundMapper.updateAmount(new Inbound().setIntoId(intoReturnVO.getIntoId())
-                    .setReturnQty(inboundResponse.getReturnQty().add(sumReturnQty))
-                    .setReturnAmt(inboundResponse.getReturnAmt().add(sumReturnAmt)));
-            //新建出库单
-            OutboundVO outboundVO = new OutboundVO();
-            //来源ID
-            outboundVO.setFromId(intoReturnVO.getReturnId());
-            //来源单号
-            outboundVO.setFromNo(intoReturnVO.getReturnNo());
-            //部门
-            outboundVO.setOrgId(intoReturnVO.getOrgId());
-            //员工
-            outboundVO.setStaffId(intoReturnVO.getStaffId());
-            //出库状态 待出库
-            outboundVO.setOutStatus(Constant.OutStatus.DAICHUKU.getName());
-            //供应商
-            outboundVO.setSupId(intoReturnVO.getSupId());
-            outboundVO.setMakeStaff(authUtils.getStaff().getStaffId());
-            outboundVO.setCpId(authUtils.getStaff().getCpId());
-
-            outboundVO.setFromId(intoReturnVO.getReturnId());
-            List<OutboundItemVO> itemList = new ArrayList<>();
-            Integer itemIndex = 0;
-            for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
-                //来源单ID 入库退货
-                OutboundItemVO outboundItemVO = new OutboundItemVO();
-
-                outboundItemVO.setFromId(intoReturnItemVO.getReturnId());
-                outboundItemVO.setFromItemId(intoReturnItemVO.getItemId());
-                outboundItemVO.setSkuId(intoReturnItemVO.getSkuId());
-                outboundItemVO.setItemIndex(itemIndex + 1);
-                outboundItemVO.setPriceOut(intoReturnItemVO.getPriceReturn());
-                outboundItemVO.setInvId(intoReturnItemVO.getInvId());
-                itemList.add(outboundItemVO);
-            }
+            //TODO 反写订单出库明细 退货数量和退货金额
+            //查询采购订单明细数据
+            PurchaseItemResponse purchaseItemResponse = purchaseItemMapper.selectById(intoReturnItemVO.getPurItemId());
+            //反写订单明细退货数量和退货金额
+            purchaseItemMapper.updateAmount(
+                    new PurchaseItem()
+                            .setItemId(intoReturnItemVO.getPurItemId())
+                            .setReturnQty(purchaseItemResponse.getReturnQty().add(intoReturnItemVO.getItemQty().setScale(6, BigDecimal.ROUND_HALF_UP)))
+                            .setReturnAmt(purchaseItemResponse.getReturnAmt().add(intoReturnItemVO.getItemAmt().setScale(6, BigDecimal.ROUND_HALF_UP)))
 
-            outboundVO.setItemList(itemList);
-            //新建出库单
-            outboundService.insertOutBound(outboundVO);
+            );
+        }
+        //反写入库单退货数量金额 todo
+        InboundResponse inboundResponse = inboundMapper.selectById(intoReturnVO.getIntoId());
+        inboundMapper.updateAmount(new Inbound().setIntoId(intoReturnVO.getIntoId())
+                .setReturnQty(inboundResponse.getReturnQty().add(sumReturnQty))
+                .setReturnAmt(inboundResponse.getReturnAmt().add(sumReturnAmt)));
+        //新建出库单
+        OutboundVO outboundVO = new OutboundVO();
+        //来源ID
+        outboundVO.setFromId(intoReturnVO.getReturnId());
+        //来源单号
+        outboundVO.setFromNo(intoReturnVO.getReturnNo());
+        //部门
+        outboundVO.setOrgId(intoReturnVO.getOrgId());
+        //员工
+        outboundVO.setStaffId(intoReturnVO.getStaffId());
+        //出库状态 待出库
+        outboundVO.setOutStatus(Constant.OutStatus.DAICHUKU.getName());
+        //供应商
+        outboundVO.setSupId(intoReturnVO.getSupId());
+        outboundVO.setMakeStaff(authUtils.getStaff().getStaffId());
+        outboundVO.setCpId(authUtils.getStaff().getCpId());
+
+        outboundVO.setFromId(intoReturnVO.getReturnId());
+        List<OutboundItemVO> itemList = new ArrayList<>();
+        Integer itemIndex = 0;
+        for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
+            //来源单ID 入库退货
+            OutboundItemVO outboundItemVO = new OutboundItemVO();
+
+            outboundItemVO.setFromId(intoReturnItemVO.getReturnId());
+            outboundItemVO.setFromItemId(intoReturnItemVO.getItemId());
+            outboundItemVO.setSkuId(intoReturnItemVO.getSkuId());
+            outboundItemVO.setItemIndex(itemIndex + 1);
+            outboundItemVO.setPriceOut(intoReturnItemVO.getPriceReturn());
+            outboundItemVO.setInvId(intoReturnItemVO.getInvId());
+            itemList.add(outboundItemVO);
+        }
+
+        outboundVO.setItemList(itemList);
+        //新建出库单
+        outboundService.insertOutBound(outboundVO);
 
         return ResponseResultUtil.success();
     }
@@ -269,11 +269,12 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             intoReturnItemVO.setItemAmt(intoReturnItemVO.getItemQty().multiply(intoReturnItemVO.getPriceReturn()).setScale(2, BigDecimal.ROUND_HALF_UP));
             //自动]出库赋值  已入库数量、已入库金额
             if (intoReturnVO.getFlgAutoIvt()) {
+                intoReturnItemVO.setOutQty(intoReturnItemVO.getItemQty().abs());
+                intoReturnItemVO.setOutAmt(intoReturnItemVO.getItemAmt().abs());
 
-                intoReturnItemVO.setIntoQty(intoReturnItemVO.getItemQty().abs());
-
-                intoReturnItemVO.setIntoAmt(intoReturnItemVO.getItemAmt().abs());
-
+            }else{
+                intoReturnItemVO.setOutingQty(intoReturnItemVO.getItemQty().abs());
+                intoReturnItemVO.setOutingAmt(intoReturnItemVO.getItemAmt().abs());
             }
             //新建明细
             IntoReturnItem intoReturnItem = intoReturnItemConvert.convertToPo(intoReturnItemVO);

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

@@ -103,12 +103,12 @@ public class CusFollowService extends BaseService<CusFollow> {
             Customer customer = customerMapper.selectById(cusFollowVO.getCusId());
 
             // 查询跟进人是否存在
-            CusFollowStaff followStaff = cusFollowStaffMapper.selectByCusFollowStaffId(cusFollowVO.getCusId(), cusFollowVO.getFollowStaff());
+            CusFollowStaff followStaff = cusFollowStaffMapper.selectByCusFollowStaffId(cusFollowVO.getCusId(), authUtils.getStaff().getStaffId());
             //追加跟进人表
             if (followStaff == null) {
                 cusFollowStaffMapper.insert(new CusFollowStaff()
                         .setCusId(cusFollowVO.getCusId())
-                        .setFollowStaff(cusFollowVO.getFollowStaff())
+                        .setFollowStaff(authUtils.getStaff().getStaffId())
                         .setLastFollowId(authUtils.getStaff().getStaffId())
                         .setLastFollowTime(LocalDateTime.now())
                         .setCpId(authUtils.getStaff().getCpId())
@@ -126,6 +126,8 @@ public class CusFollowService extends BaseService<CusFollow> {
             if (users == null || users.size() == 0 || (users != null && users.stream().allMatch(Objects::isNull))) {
                 users = new ArrayList<>();
             }
+
+
             //公海客户跟进后 变成潜客状态
             if (Constant.saleCustomerStatusConstant.SALE_STATUS_INTE.getName().equals(customer.getSaleStatus())) {
                 customer.setSaleStatus(Constant.saleCustomerStatusConstant.SALE_STATUS_POTE.getName());
@@ -260,11 +262,11 @@ public class CusFollowService extends BaseService<CusFollow> {
     }
 
 
-    /**
-     * @desc : 保存跟进信息到xxl job
-     * @author : 于继渤海
-     * @date : 2022-05-27 09:53
-     */
+/**
+ * @desc : 保存跟进信息到xxl job
+ * @author : 于继渤海
+ * @date : 2022-05-27 09:53
+ */
 //    @Transactional(rollbackFor = {Exception.class})
 //    public void saveToXxlJob(CusFollow cusFollow) {
 //