问题处理

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

@@ -67,4 +67,9 @@ public class StockWaitVo extends StockWait {
      */
     private String operatorName;
 
+    /**
+     * 待出入库明细id
+     */
+    private Long stockWaitDetailsId;
+
 }

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

@@ -2,6 +2,7 @@ package com.fjhx.wms.service.stock.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.emums.StockWaitType;
@@ -83,6 +84,18 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
     public StockWaitDetailsVo detail(Long id) {
         StockWaitDetails StockWaitDetails = this.getById(id);
         StockWaitDetailsVo result = BeanUtil.toBean(StockWaitDetails, StockWaitDetailsVo.class);
+        //查询待入库信息
+        StockWait stockWait = stockWaitService.getById(result.getStockWaitId());
+        if(ObjectUtil.isEmpty(stockWait)){
+            throw new ServiceException("无法查询到待入库信息,待入库id"+result.getStockWaitId());
+        }
+        result.setBusinessType(stockWait.getBusinessType());
+        result.setBusinessCode(stockWait.getBusinessCode());;
+        ProductInfo byId = productInfoService.getById(StockWaitDetails.getProductId());
+        if(ObjectUtil.isEmpty(byId)){
+            throw new ServiceException("无法查询到产品信息,产品id"+StockWaitDetails.getProductId());
+        }
+        result.setProductName(byId.getName());
         return result;
     }
 

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

@@ -138,9 +138,9 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
     @Override
     public StockWaitVo detail(Long id) {
-        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getById(id);
-        StockWait stockWait = this.getById(stockWaitDetails.getStockWaitId());
+        StockWait stockWait = this.getById(id);
         StockWaitVo result = BeanUtil.toBean(stockWait, StockWaitVo.class);
+        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q -> q.eq(StockWaitDetails::getStockWaitId, id));
         ProductInfo byId = productInfoService.getById(stockWaitDetails.getProductId());
         result.setProductName(byId.getName());
         result.setQuantity(stockWaitDetails.getQuantity());

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -4,6 +4,7 @@
     <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockWaitVo">
         SELECT
             sw.id,
+            swd.id stockWaitDetailsId,
             sw.type,
             sw.business_id,
             sw.business_code,