zhangyuewww 2 years ago
parent
commit
bab6ae8525

+ 2 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -250,7 +250,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                         .eq("warehouse_name", warehousingOrder1.getWarehouseName())
                         .like("issuing_time", dateFormat.format(warehousingOrder1.getIssuingTime()));
                 if (!StringUtils.isEmpty(warehousingOrder.getSearchKeyWord())) {
-                    warehousingOrderWrapper.like("goods_source", "%" + warehousingOrder.getSearchKeyWord() + "%");
+                    warehousingOrderWrapper.andNew().like("goods_source", "%" + warehousingOrder.getSearchKeyWord() + "%").or()
+                            .like("contract_no", "%" + warehousingOrder.getSearchKeyWord() + "%");
                 }
                 if (!StringUtils.isEmpty(warehousingOrder.getSearchType())) {
                     warehousingOrderWrapper.gt("amount_not_payable", 0);