待入库优化

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

@@ -41,7 +41,6 @@ import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.common.utils.wrapper.SqlField;
 import com.ruoyi.system.utils.UserUtil;
 import lombok.Getter;
 import lombok.Setter;
@@ -127,12 +126,13 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
 
         //关键字搜索
-        wrapper.keyword(dto.getKeyword(),
-                new SqlField("sw", StockWait::getBusinessCode),
-                new SqlField("lis.code"),
-                new SqlField("pi.custom_code"),
-                new SqlField("pi.name")
-        );
+        if(ObjectUtil.isNotEmpty(dto.getKeyword())){
+            wrapper.and(q->q
+                    .like("sw", StockWait::getBusinessCode,dto.getKeyword())
+                    .or().like("lis.code",dto.getKeyword())
+                    .or().exists("SELECT swd.stock_wait_id FROM stock_wait_details swd LEFT JOIN bytesailing_item.product_info pi ON swd.product_id = pi.id where ( pi.`name` LIKE CONCAT( '%', {0}, '%' ) OR pi.custom_code LIKE CONCAT( '%', {0}, '%' ))",dto.getKeyword())
+            );
+        }
 
         //过滤掉待出入库 已完成/手动结束 的数据
         wrapper.notIn("sw", StockWait::getStatus, 2, 3);

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

@@ -43,9 +43,9 @@
             lis.arrival_remark
         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
-                LEFT JOIN bytesailing_victoriatourist.logistics_infos lis ON lis.business_id = CAST( json_unquote( sw.victoriatourist_json -> '$.deliverGoodsId' ) AS UNSIGNED )
+--                 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
+                LEFT JOIN bytesailing_victoriatourist.logistics_infos lis ON lis.business_id = sw.deliverGoodsId
                 LEFT JOIN bytesailing_victoriatourist.purchase_back pb ON sw.business_id = pb.id
                 AND pb.del_flag = 0
             ${ew.customSqlSegment}