修改采购退货引用入库根据id查询返回体

添加入库总单刚刚多删除的vo中id字段
修改入库明细根据id查询返回体

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

@@ -28,7 +28,7 @@ public interface InboundItemMapper extends BaseMapper<InboundItem>{
      * @date   : 2024/3/9 9:14
      * @author : 寇珊珊
      */
-    InboundResponse selectById(@Param("itemId") String itemId);
+    InboundItemResponse selectById(@Param("itemId") String itemId);
 
     /**
      * @desc   : 修改金额数量

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

@@ -43,6 +43,14 @@ 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;
+
 
 
 

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

@@ -26,6 +26,8 @@ import com.dk.mdm.model.pojo.pur.Purchase;
 import com.dk.mdm.model.pojo.pur.PurchaseItem;
 import com.dk.mdm.model.query.ivt.IntoReturnQuery;
 import com.dk.mdm.model.query.pur.PurchaseQuery;
+import com.dk.mdm.model.response.ivt.InboundItemResponse;
+import com.dk.mdm.model.response.ivt.InboundResponse;
 import com.dk.mdm.model.response.ivt.IntoReturnResponse;
 import com.dk.mdm.model.response.pur.PurchaseItemResponse;
 import com.dk.mdm.model.response.pur.PurchaseResponse;
@@ -132,14 +134,14 @@ public class IntoReturnService extends BaseService<IntoReturn> {
             for (IntoReturnItemVO intoReturnItemVO : intoReturnItemVOList) {
 
                 //根据退货明细中入库明细id查询入库明细数据
-                InboundItem inboundItem = inboundItemMapper.selectById(intoReturnItemVO.getIntoItemId());
-                BigDecimal returnQty = inboundItem.getReturnQty().add(intoReturnItemVO.getItemQty().setScale(6, BigDecimal.ROUND_HALF_UP));
-                BigDecimal returnAmt = inboundItem.getReturnAmt().add(intoReturnItemVO.getItemAmt().setScale(6, BigDecimal.ROUND_HALF_UP));
+                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(inboundItem.getItemId())
+                                .setItemId(inboundItemResponse.getItemId())
                                 .setReturnQty(returnQty)
                                 .setReturnAmt(returnAmt)
                 );
@@ -156,10 +158,10 @@ public class IntoReturnService extends BaseService<IntoReturn> {
                 );
             }
             //反写入库单退货数量金额 todo
-            Inbound inbound = inboundMapper.selectById(intoReturnVO.getIntoId());
+            InboundResponse inboundResponse = inboundMapper.selectById(intoReturnVO.getIntoId());
             inboundMapper.updateAmount(new Inbound().setIntoId(intoReturnVO.getIntoId())
-                    .setReturnQty(inbound.getReturnQty().add(sumReturnQty))
-                    .setReturnAmt(inbound.getReturnAmt().add(sumReturnAmt)));
+                    .setReturnQty(inboundResponse.getReturnQty().add(sumReturnQty))
+                    .setReturnAmt(inboundResponse.getReturnAmt().add(sumReturnAmt)));
             //新建出库单
             OutboundVO outboundVO = new OutboundVO();
             //来源ID