添加单号搜索

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/logistics/impl/LogisticsInfosServiceImpl.java

@@ -89,6 +89,7 @@ public class LogisticsInfosServiceImpl extends ServiceImpl<LogisticsInfosMapper,
 
             List<String> companyCodes = companyInfoService.listObject(CompanyInfo::getCode, q -> q.like(CompanyInfo::getName, dto.getKeyword()));
             wrapper.and(q -> q.like("li", LogisticsInfos::getCode, dto.getKeyword())
+                    .or().like("li", LogisticsInfos::getSubCode, dto.getKeyword())
                     .or().like("IF( li.business_type IN ( 1, 5 ), p.contractCode, li.business_code ) ", dto.getKeyword())
                     .or().in("li", LogisticsInfos::getLogisticsCompanyCode, companyCodes)
                     .or(flag).like(flag, "pi.custom_code", dto.getKeyword())

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

@@ -126,6 +126,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             wrapper.and(q -> q
                     .like("sw", StockWait::getBusinessCode, dto.getKeyword())
                     .or().like("lis.code", dto.getKeyword())
+                    .or().like("lis.sub_code", dto.getKeyword())
                     .or().inSql("sw.id", "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( '%', '" + dto.getKeyword() + "', '%' ) OR pi.custom_code LIKE CONCAT( '%', '" + dto.getKeyword() + "', '%' ))")
             );
         }