待入库明细搜索

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

@@ -113,19 +113,22 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         IWrapper<StockWait> wrapper = getWrapper();
         wrapper.orderByDesc("sw", StockWait::getId);
         //过滤入库/出库
-        wrapper.eq(StockWait::getType, dto.getType());
-        wrapper.eq(StockWait::getStatus, dto.getStatus());
+        wrapper.eq("sw", StockWait::getType, dto.getType());
+        wrapper.eq("sw", StockWait::getStatus, dto.getStatus());
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
 
         //关键字搜索
         wrapper.keyword(dto.getKeyword(),
-                new SqlField(StockWait::getBusinessCode),
-                new SqlField("json_unquote(sw.victoriatourist_json -> '$.code')")
+                new SqlField("sw", StockWait::getBusinessCode),
+                new SqlField("json_unquote(sw.victoriatourist_json -> '$.code')"),
+                new SqlField("pi.custom_code"),
+                new SqlField("pi.name")
         );
 
         //过滤掉待出入库 已完成/手动结束 的数据
         wrapper.notIn("sw", StockWait::getStatus, 2, 3);
 
+        wrapper.groupBy("sw.id");
         Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<StockWaitVo> records = page.getRecords();

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

@@ -39,6 +39,8 @@
             sw.victoriatourist_json
         FROM
             stock_wait sw
+                LEFT JOIN stock_wait_details swd ON swd.stock_wait_id = sw.id
+                LEFT JOIN bytesailing_item.product_info pi ON swd.product_id = pi.id
             ${ew.customSqlSegment}
     </select>
     <select id="getStockWaitList" resultType="com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo">