退货待出库回填退货信息

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/purchase/vo/PurchaseBackVo.java

@@ -1,7 +1,7 @@
 package com.fjhx.victoriatourist.entity.purchase.vo;
 
+import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBack;
-import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBackDetails;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,14 +10,19 @@ import java.util.List;
 /**
  * 采购退货列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-05-19
  */
 @Getter
 @Setter
-public class PurchaseBackVo extends PurchaseBack {
+public class PurchaseBackVo extends PurchaseBack implements SetCustomizeAreaName {
 
     List<PurchaseBackDetailsVo> purchaseBackDetailsList;
 
+    private String countryName;
+
+    private String provinceName;
+
+    private String cityName;
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WmsServiceImpl.java

@@ -1,10 +1,14 @@
 package com.fjhx.victoriatourist.service;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBack;
+import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackVo;
 import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
 import com.fjhx.victoriatourist.service.order.OrderInfoService;
-import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
+import com.fjhx.victoriatourist.service.purchase.PurchaseBackService;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.service.WmsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,14 +20,16 @@ public class WmsServiceImpl implements WmsService {
     private OrderInfoService orderInfoService;
     @Autowired
     private AbnormalInfoService abnormalInfoService;
+    @Autowired
+    private PurchaseBackService purchaseBackService;
 
-    /**
-     * 销售订单出库
-     */
-    @Override
-    public void outbound(StockWaitDetailsDto stockWaitDetailsDto) {
-        orderInfoService.outbound(stockWaitDetailsDto);
-    }
+//    /**
+//     * 销售订单出库
+//     */
+//    @Override
+//    public void outbound(StockWaitDetailsDto stockWaitDetailsDto) {
+//        orderInfoService.outbound(stockWaitDetailsDto);
+//    }
 
     @Override
     public void outbounds(StockWaitDto stockWaitDto) {
@@ -41,4 +47,13 @@ public class WmsServiceImpl implements WmsService {
         abnormalInfo.setTitle("待入库被手动结束");
         abnormalInfoService.save(abnormalInfo);
     }
+
+    @Override
+    public Object getPurchaseBackInfo(Long id) {
+        PurchaseBack purchaseBack = purchaseBackService.getById(id);
+        PurchaseBackVo purchaseBackVo = BeanUtil.copyProperties(purchaseBack, PurchaseBackVo.class);
+        // 赋值国省市
+        CustomizeAreaUtil.setAreaName(purchaseBackVo);
+        return purchaseBackVo;
+    }
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWait.java

@@ -1,11 +1,7 @@
 package com.fjhx.wms.entity.stock.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -42,21 +38,6 @@ public class StockWait extends BasePo {
      */
     private String businessCode;
 
-//    /**
-//     * 商品id
-//     */
-//    private Long productId;
-//
-//    /**
-//     * 数量
-//     */
-//    private BigDecimal quantity;
-//
-//    /**
-//     * 已入库数量
-//     */
-//    private BigDecimal receiptQuantity;
-
     /**
      * 入库状态 0待入库 1部分入库 2入库完成
      */

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitVo.java

@@ -72,4 +72,9 @@ public class StockWaitVo extends StockWait {
      */
     private Long stockWaitDetailsId;
 
+    /**
+     * 采购退货信息
+     */
+    private Object purchaseBackInfo;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/WmsService.java

@@ -1,6 +1,5 @@
 package com.fjhx.wms.service;
 
-import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 
 public interface WmsService {
@@ -8,7 +7,7 @@ public interface WmsService {
     /**
      * 销售订单出库
      */
-    void outbound(StockWaitDetailsDto stockWaitDetailsDto);
+//    void outbound(StockWaitDetailsDto stockWaitDetailsDto);
 
     /**
      * 销售订单出库多条
@@ -19,4 +18,9 @@ public interface WmsService {
      * 添加结束入库异常
      */
     void addEndInStockAbnormal(Long linkId, String linkCode);
+
+    /**
+     * 获取采购退货信息
+     */
+    Object getPurchaseBackInfo(Long id);
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -196,6 +196,11 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             }
         }
         result.setStockWaitDetailsList(stockWaitDetailsVos);
+        //如果是采购退货 赋值采购退货信息
+        if (result.getBusinessType() == 4) {
+            Object purchaseBackInfo = wmsService.getPurchaseBackInfo(result.getBusinessId());
+            result.setPurchaseBackInfo(purchaseBackInfo);
+        }
         return result;
     }