diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java b/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java
index bdb1d01..ff8e4ae 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/GearPayable.java
@@ -68,4 +68,7 @@ public class GearPayable extends BaseEntity {
*/
private String remark;
+ //采购详情id
+ private Long detailId;
+
}
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
index 80c30a2..a567737 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearPayableBo.java
@@ -72,5 +72,8 @@ public class GearPayableBo extends BaseEntity {
*/
private String remark;
+ //采购详情id
+ private Long detailId;
+
}
diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java
index 356a1f9..fd254b8 100644
--- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java
+++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearPayableVo.java
@@ -88,4 +88,7 @@ public class GearPayableVo {
//供应商名称
private String supplierName;
+ //采购详情编码
+ private String detailCode;
+
}
diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
index c533cbd..6516fc9 100644
--- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
+++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPayableServiceImpl.java
@@ -67,6 +67,7 @@ public class GearPayableServiceImpl implements IGearPayableService {
lqw.eq("p.del_flag", 0);
lqw.eq(bo.getSupplierId() != null, "p.supplier_id", bo.getSupplierId());
lqw.eq(bo.getOrderId() != null, "p.order_id", bo.getOrderId());
+ lqw.eq(bo.getDetailId()!= null, "p.detail_id", bo.getDetailId());
lqw.eq(bo.getDueDate() != null, "p.due_date", bo.getDueDate());
lqw.eq(bo.getAmount() != null, "p.amount", bo.getAmount());
lqw.eq(bo.getPaidAmount() != null, "p.paid_amount", bo.getPaidAmount());
diff --git a/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml
index 246e6ca..d007dd3 100644
--- a/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml
+++ b/gear-oa/src/main/resources/mapper/oa/GearPayableMapper.xml
@@ -8,6 +8,7 @@
+
@@ -35,9 +36,11 @@
p.create_time,
p.create_by,
p.update_time,
- p.update_by
+ p.update_by,
+ d.detail_code as detailCode
from gear_payable p
left join gear_supplier s on p.supplier_id = s.supplier_id and s.del_flag = 0
+ left join gear_purchase_plan_detail d on p.detail_id = d.detail_id and d.del_flag = 0
${ew.customSqlSegment}
diff --git a/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml
index 0222acb..76449f8 100644
--- a/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml
+++ b/gear-oa/src/main/resources/mapper/oa/GearRequirementsMapper.xml
@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+