问题处理

hx-wms/src/main/java/com/fjhx/wms/mapper/stock/StockWaitDetailsMapper.java

@@ -1,12 +1,14 @@
 package com.fjhx.wms.mapper.stock;
 
-import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -22,5 +24,7 @@ public interface StockWaitDetailsMapper extends BaseMapper<StockWaitDetails> {
      * 待出入库明细分页
      */
     Page<StockWaitDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<StockWaitDetails> wrapper);
+    List<StockWaitDetailsVo> getList(@Param("ew") IWrapper<StockWaitDetails> wrapper);
+
 
 }

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

@@ -1,12 +1,15 @@
 package com.fjhx.wms.service.stock;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsSelectDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
-import com.fjhx.wms.entity.stock.dto.StockWaitDetailsSelectDto;
-import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
+import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+
+import java.util.List;
 
 
 /**
@@ -24,6 +27,8 @@ public interface StockWaitDetailsService extends BaseService<StockWaitDetails> {
      */
     Page<StockWaitDetailsVo> getPage(StockWaitDetailsSelectDto dto);
 
+    List<StockWaitDetailsVo> getList(IWrapper<StockWaitDetails> wrapper);
+
     /**
      * 待出入库明细明细
      */

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

@@ -85,6 +85,11 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
     }
 
     @Override
+    public List<StockWaitDetailsVo> getList(IWrapper<StockWaitDetails> wrapper ) {
+       return baseMapper.getList(wrapper);
+    }
+
+        @Override
     public StockWaitDetailsVo detail(Long id) {
         StockWaitDetails StockWaitDetails = this.getById(id);
         StockWaitDetailsVo result = BeanUtil.toBean(StockWaitDetails, StockWaitDetailsVo.class);

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

@@ -214,9 +214,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     public StockWaitVo detailByWdly(Long id) {
         StockWait stockWait = this.getById(id);
         StockWaitVo result = BeanUtil.toBean(stockWait, StockWaitVo.class);
-        List<StockWaitDetails> list = stockWaitDetailsService.list(q -> q.eq(StockWaitDetails::getStockWaitId, id));
-        List<StockWaitDetailsVo> stockWaitDetailsVos = BeanUtil.copyToList(list, StockWaitDetailsVo.class);
-        //根据业务id(到货id)查询采购单明细信息
+        List<StockWaitDetailsVo> stockWaitDetailsVos = stockWaitDetailsService.getList(IWrapper.<StockWaitDetails>getWrapper()
+                .eq(StockWaitDetails::getStockWaitId, id)
+                .orderByAsc("pi.name")
+        );
 
 
         //赋值物品信息和采购信息
@@ -234,9 +235,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
                 stockWaitDetails.setProductCustomCode(productInfo.getCustomCode());
                 stockWaitDetails.setProductSpec(productInfo.getSpec());
             }
-
-            //名称升序
-            Collections.sort(stockWaitDetailsVos, Comparator.comparing(StockWaitDetailsVo::getProductName));
         }
 
         //赋值入库清点信息

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

@@ -22,5 +22,27 @@
                 JOIN stock_wait sw ON swd.stock_wait_id = sw.id
             ${ew.customSqlSegment}
     </select>
+    <select id="getList" resultType="com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo">
+        SELECT
+            swd.id,
+            sw.business_code,
+            sw.business_id,
+            sw.business_type,
+            sw.`status`,
+            swd.stock_wait_id,
+            swd.product_id,
+            swd.quantity,
+            swd.receipt_quantity,
+            swd.create_user,
+            swd.create_time,
+            swd.update_user,
+            swd.update_time,
+            swd.victoriatourist_json
+        FROM
+            stock_wait_details swd
+                JOIN stock_wait sw ON swd.stock_wait_id = sw.id
+                LEFT JOIN bytesailing_item.product_info pi ON swd.product_id = pi.id
+            ${ew.customSqlSegment}
+    </select>
 
 </mapper>