diff --git a/klp-wms/src/main/java/com/klp/domain/WmsJournalEntry.java b/klp-wms/src/main/java/com/klp/domain/WmsJournalEntry.java
index 58f113cd..1254e5b1 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsJournalEntry.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsJournalEntry.java
@@ -53,7 +53,7 @@ public class WmsJournalEntry extends BaseEntity {
/**
* 参考单据号
*/
- private String referenceNo;
+ private Long documentId;
/**
* 关联订单ID
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsJournalEntryBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsJournalEntryBo.java
index 783283e6..a33b338c 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsJournalEntryBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsJournalEntryBo.java
@@ -61,7 +61,7 @@ public class WmsJournalEntryBo extends BaseEntity {
/**
* 参考单据号
*/
- private String referenceNo;
+ private Long documentId;
/**
* 关联订单ID
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsJournalEntryVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsJournalEntryVo.java
index e1c75542..6a897963 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsJournalEntryVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsJournalEntryVo.java
@@ -73,7 +73,7 @@ public class WmsJournalEntryVo {
* 参考单据号
*/
@ExcelProperty(value = "参考单据号")
- private String referenceNo;
+ private Long documentId;
/**
* 关联订单ID
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsJournalEntryServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsJournalEntryServiceImpl.java
index ec8c9bb8..7a627359 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsJournalEntryServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsJournalEntryServiceImpl.java
@@ -67,7 +67,7 @@ public class WmsJournalEntryServiceImpl implements IWmsJournalEntryService {
lqw.eq(bo.getAccountId() != null, WmsJournalEntry::getAccountId, bo.getAccountId());
lqw.eq(bo.getDebitAmount() != null, WmsJournalEntry::getDebitAmount, bo.getDebitAmount());
lqw.eq(bo.getCreditAmount() != null, WmsJournalEntry::getCreditAmount, bo.getCreditAmount());
- lqw.eq(StringUtils.isNotBlank(bo.getReferenceNo()), WmsJournalEntry::getReferenceNo, bo.getReferenceNo());
+ lqw.eq(bo.getDocumentId() !=null, WmsJournalEntry::getDocumentId, bo.getDocumentId());
lqw.eq(bo.getRelatedOrderId() != null, WmsJournalEntry::getRelatedOrderId, bo.getRelatedOrderId());
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WmsJournalEntry::getStatus, bo.getStatus());
return lqw;
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml
index f06ef294..d812d476 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml
@@ -38,7 +38,7 @@
-
+
@@ -63,13 +63,13 @@
wje.account_id as account_id,
wje.debit_amount as debit_amount,
wje.credit_amount as credit_amount,
- wje.reference_no as reference_no,
+ wje.document_id as document_id,
wje.related_order_id as je_related_order_id,
wje.status as je_status,
wje.remark as je_remark
FROM wms_financial_document wfd
LEFT JOIN wms_journal_entry wje ON wfd.document_id = wje.document_id
- ${ew.customSqlSegment()}
+ ${ew.customSqlSegment}