|
@@ -21,7 +21,6 @@ import com.fjhx.common.enums.CodingRuleEnum;
|
|
import com.fjhx.common.service.coding.CodingRuleService;
|
|
import com.fjhx.common.service.coding.CodingRuleService;
|
|
import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
|
|
import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
|
|
import com.fjhx.common.utils.Assert;
|
|
import com.fjhx.common.utils.Assert;
|
|
-import com.fjhx.item.entity.product.IssueImportExcelBo;
|
|
|
|
import com.fjhx.item.entity.product.vo.ProductInfoVo;
|
|
import com.fjhx.item.entity.product.vo.ProductInfoVo;
|
|
import com.fjhx.item.service.product.ProductInfoService;
|
|
import com.fjhx.item.service.product.ProductInfoService;
|
|
import com.fjhx.item.util.excel.util.ExcelUtil;
|
|
import com.fjhx.item.util.excel.util.ExcelUtil;
|
|
@@ -211,7 +210,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
|
|
//根据明细 产品名称 产品编号 过滤
|
|
//根据明细 产品名称 产品编号 过滤
|
|
// .or().like("pi.name", dto.getKeyword())
|
|
// .or().like("pi.name", dto.getKeyword())
|
|
// .or().like("pi.custom_code", dto.getKeyword())
|
|
// .or().like("pi.custom_code", dto.getKeyword())
|
|
- .or().exists("SELECT pd.purchase_id FROM purchase_detail pd LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id WHERE ( pi.`name` LIKE CONCAT( '%', {0}, '%' ) OR pi.custom_code LIKE CONCAT( '%', {0}, '%' ))",dto.getKeyword())
|
|
|
|
|
|
+ .or().exists("SELECT pd.purchase_id FROM purchase_detail pd LEFT JOIN bytesailing_item.product_info pi ON pd.bussiness_id = pi.id WHERE ( pi.`name` LIKE CONCAT( '%', {0}, '%' ) OR pi.custom_code LIKE CONCAT( '%', {0}, '%' ) OR pi.spec LIKE CONCAT( '%', {0}, '%' ))",dto.getKeyword())
|
|
);
|
|
);
|
|
}
|
|
}
|
|
//高级检索
|
|
//高级检索
|