refactor(wms): 用 documentId 替代 referenceNo
- 在 WmsJournalEntry、WmsJournalEntryBo、WmsJournalEntryVo 中将 referenceNo 字段改为 documentId - 更新 WmsFinancialDocumentMapper.xml 中的相关 SQL 语句 - 修改 WmsJournalEntryServiceImpl 中的查询条件
This commit is contained in:
@@ -53,7 +53,7 @@ public class WmsJournalEntry extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 参考单据号
|
* 参考单据号
|
||||||
*/
|
*/
|
||||||
private String referenceNo;
|
private Long documentId;
|
||||||
/**
|
/**
|
||||||
* 关联订单ID
|
* 关联订单ID
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ public class WmsJournalEntryBo extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 参考单据号
|
* 参考单据号
|
||||||
*/
|
*/
|
||||||
private String referenceNo;
|
private Long documentId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 关联订单ID
|
* 关联订单ID
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public class WmsJournalEntryVo {
|
|||||||
* 参考单据号
|
* 参考单据号
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "参考单据号")
|
@ExcelProperty(value = "参考单据号")
|
||||||
private String referenceNo;
|
private Long documentId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 关联订单ID
|
* 关联订单ID
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ public class WmsJournalEntryServiceImpl implements IWmsJournalEntryService {
|
|||||||
lqw.eq(bo.getAccountId() != null, WmsJournalEntry::getAccountId, bo.getAccountId());
|
lqw.eq(bo.getAccountId() != null, WmsJournalEntry::getAccountId, bo.getAccountId());
|
||||||
lqw.eq(bo.getDebitAmount() != null, WmsJournalEntry::getDebitAmount, bo.getDebitAmount());
|
lqw.eq(bo.getDebitAmount() != null, WmsJournalEntry::getDebitAmount, bo.getDebitAmount());
|
||||||
lqw.eq(bo.getCreditAmount() != null, WmsJournalEntry::getCreditAmount, bo.getCreditAmount());
|
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(bo.getRelatedOrderId() != null, WmsJournalEntry::getRelatedOrderId, bo.getRelatedOrderId());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WmsJournalEntry::getStatus, bo.getStatus());
|
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WmsJournalEntry::getStatus, bo.getStatus());
|
||||||
return lqw;
|
return lqw;
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
<result property="accountId" column="account_id"/>
|
<result property="accountId" column="account_id"/>
|
||||||
<result property="debitAmount" column="debit_amount"/>
|
<result property="debitAmount" column="debit_amount"/>
|
||||||
<result property="creditAmount" column="credit_amount"/>
|
<result property="creditAmount" column="credit_amount"/>
|
||||||
<result property="referenceNo" column="reference_no"/>
|
<result property="documentId" column="document_id"/>
|
||||||
<result property="relatedOrderId" column="je_related_order_id"/>
|
<result property="relatedOrderId" column="je_related_order_id"/>
|
||||||
<result property="status" column="je_status"/>
|
<result property="status" column="je_status"/>
|
||||||
<result property="remark" column="je_remark"/>
|
<result property="remark" column="je_remark"/>
|
||||||
@@ -63,13 +63,13 @@
|
|||||||
wje.account_id as account_id,
|
wje.account_id as account_id,
|
||||||
wje.debit_amount as debit_amount,
|
wje.debit_amount as debit_amount,
|
||||||
wje.credit_amount as credit_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.related_order_id as je_related_order_id,
|
||||||
wje.status as je_status,
|
wje.status as je_status,
|
||||||
wje.remark as je_remark
|
wje.remark as je_remark
|
||||||
FROM wms_financial_document wfd
|
FROM wms_financial_document wfd
|
||||||
LEFT JOIN wms_journal_entry wje ON wfd.document_id = wje.document_id
|
LEFT JOIN wms_journal_entry wje ON wfd.document_id = wje.document_id
|
||||||
${ew.customSqlSegment()}
|
${ew.customSqlSegment}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user