采购退货

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

@@ -338,24 +338,24 @@ public class InboundReturnService extends BaseService<Inbound> {
         System.out.println(purchaseResponse.getReturnQty().subtract(inboundResponse.getReturnQty()));
 
         purchaseMapper.updateAmount(
-                new Purchase().setReturnQty(purchaseResponse.getReturnQty().add(inboundResponse.getReturnQty()))
-                        .setReturnAmt(purchaseResponse.getReturnAmt().add(inboundResponse.getReturnAmt())).setPurId(purchaseResponse.getPurId())
+                new Purchase().setReturnQty(purchaseResponse.getReturnQty().subtract(inboundResponse.getReturnQty().abs()))
+                        .setReturnAmt(purchaseResponse.getReturnAmt().subtract(inboundResponse.getReturnAmt().abs())).setPurId(purchaseResponse.getPurId())
         );
         //查询退货明细
         List<InboundItemResponse> inboundItemResponses = inboundItemMapper.selectByCond(new InboundItemQuery().setIntoId(inboundResponse.getIntoId()));
         for (InboundItemResponse inboundItemRespons : inboundItemResponses) {
 
             //查询源入库单明细
-            InboundItemResponse inboundItemResponse = inboundItemMapper.selectById(inboundItemRespons.getSIntoItemId());
-            if (inboundItemResponse == null) {
+            InboundItemResponse inboundItem = inboundItemMapper.selectById(inboundItemRespons.getSIntoItemId());
+            if (inboundItem == null) {
                 //返回 单据所对应的原始单据不存在，请重新操作
                 return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORIGINAL_DOCUMENT_ABSENT.getMessage());
             }
             //修改入库单明细 已入库退货数量/金额
             inboundItemMapper.updateAmount(new InboundItem()
-                    .setItemId(inboundItemResponse.getSIntoItemId())
-                    .setReturnQty(inboundItemResponse.getReturnQty().add(inboundItemResponse.getReturnQty()))
-                    .setReturnAmt(inboundItemResponse.getReturnAmt().add(inboundItemResponse.getReturnAmt()))
+                    .setItemId(inboundItem.getItemId())
+                    .setReturnQty(inboundItem.getReturnQty().subtract(inboundItemRespons.getReturnQty().abs()))
+                    .setReturnAmt(inboundItem.getReturnAmt().subtract(inboundItemRespons.getReturnAmt().abs()))
             );
 
 
@@ -366,8 +366,8 @@ public class InboundReturnService extends BaseService<Inbound> {
                 return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ORIGINAL_DOCUMENT_ABSENT.getMessage());
             }
             inboundMapper.updateAmount(new Inbound().setIntoId(inboundRes.getIntoId())
-                    .setReturnQty(inboundResponse.getReturnQty().add(inboundItemRespons.getReturnQty()))
-                    .setReturnAmt(inboundResponse.getReturnAmt().add(inboundItemRespons.getReturnAmt())));
+                    .setReturnQty(inboundRes.getReturnQty().subtract(inboundItemRespons.getReturnQty().abs()))
+                    .setReturnAmt(inboundRes.getReturnAmt().subtract(inboundItemRespons.getReturnAmt().abs())));
 
 
             //查询采购单明细
@@ -380,8 +380,8 @@ public class InboundReturnService extends BaseService<Inbound> {
             purchaseItemMapper.updateAmount(
                     new PurchaseItem()
                             .setItemId(purchaseItemResponse.getItemId())
-                            .setReturnQty(purchaseItemResponse.getReturnQty().add(inboundItemRespons.getReturnQty()))
-                            .setReturnAmt(purchaseItemResponse.getReturnAmt().add(inboundItemRespons.getReturnAmt()))
+                            .setReturnQty(purchaseItemResponse.getReturnQty().subtract(inboundItemRespons.getReturnQty().abs()))
+                            .setReturnAmt(purchaseItemResponse.getReturnAmt().subtract(inboundItemRespons.getReturnAmt().abs()))
             );
         }
         //修改 负向入库单 状态为作废