出库不减o库存问题修改;

mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/entity/BusinessDeliveryDetailsLink.java

@@ -64,5 +64,7 @@ public class BusinessDeliveryDetailsLink extends BaseVOEntity {
 
     @ApiModelProperty(value = "删除标志")
     private Integer delFlag;
+    @ApiModelProperty(value = "是否已退货")
+    private Integer isReturn;
 
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/repository/dto/BusinessDeliveryDetailsLinkDTO.java

@@ -69,4 +69,6 @@ public class BusinessDeliveryDetailsLinkDTO extends BaseVOEntity {
     private Integer delFlag;
     @ApiModelProperty("运输单信息")
     private TmsTransportNote tmsTransportNote;
+    @ApiModelProperty(value = "是否已退货")
+    private Integer isReturn;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/repository/po/BusinessDeliveryDetailsLinkPO.java

@@ -68,4 +68,7 @@ public class BusinessDeliveryDetailsLinkPO extends BaseVOEntity {
 
     @ApiModelProperty("删除标志")
     private Integer delFlag;
+
+    @ApiModelProperty(value = "是否已退货")
+    private Integer isReturn;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDeliveryDetailsLink/repository/todo/BusinessDeliveryDetailsLinkDO.java

@@ -73,4 +73,7 @@ public class BusinessDeliveryDetailsLinkDO extends BaseVOEntity {
 
     @ApiModelProperty("删除标志")
     private Integer delFlag;
+
+    @ApiModelProperty(value = "是否已退货")
+    private Integer isReturn;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -79,6 +79,8 @@ public class ReservationStockOutOrderDomainService {
     private WmsServiceFeign wmsServiceFeign;
     @Autowired
     private IReservationDeliveryDetailsLinkService reservationDeliveryDetailsLinkService;
+    @Autowired
+    private IBusinessDeliveryDetailsLinkService businessDeliveryDetailsLinkService;
 
     /**
      * 分页查询出库单列表
@@ -727,6 +729,14 @@ public class ReservationStockOutOrderDomainService {
 
     public void returnGoods(String invoiceNumber) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
+        BusinessDeliveryDetailsLink businessDeliveryDetailsLink = businessDeliveryDetailsLinkService.getOne(new QueryWrapper<BusinessDeliveryDetailsLink>().lambda().eq(BusinessDeliveryDetailsLink::getInvoiceNumber, invoiceNumber), false);
+        if (businessDeliveryDetailsLink != null) {
+            businessDeliveryDetailsLink.setIsReturn(1); // 1表示已退货
+            businessDeliveryDetailsLink.setUpdateBy(loginUser.getUserPo().getUserId());
+            businessDeliveryDetailsLink.setUpdateByName(loginUser.getUserPo().getUserName());
+            businessDeliveryDetailsLink.setUpdateTime(new Date());
+            businessDeliveryDetailsLinkService.updateById(businessDeliveryDetailsLink);
+//            String invoiceNumber1 = businessDeliveryDetailsLink.getInvoiceNumber();
             List<ReservationDeliveryDetailsLink> list = reservationDeliveryDetailsLinkService.list(new QueryWrapper<ReservationDeliveryDetailsLink>().lambda().eq(ReservationDeliveryDetailsLink::getInvoiceNumber, invoiceNumber));
             if (list != null && !list.isEmpty() && list.size()==1) {
                 ReservationDeliveryDetailsLink reservationDeliveryDetailsLink = list.get(0);
@@ -797,5 +807,6 @@ public class ReservationStockOutOrderDomainService {
                 }
             }
         }
+    }
 
 }