wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整字段prc_order_bill_id → prc_order_bill.bill_id

Browse Source 
prc_income_bill_fee_id → prc_income_bill_fee.fee_id
This commit is contained in:
caojia
2026-09-16 15:38:17 +08:00
parent 2e39440540
commit d660bfc69f
7 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetail.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class ArBillDetail implements Serializable
private Long detailId;
private Long arBillId;
private String prcBillId;
private String prcOrderBillId;
private Integer detailNo;
private String orderNo;
private String trackingNo;
bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/domain/ArBillDetailFee.java
+1 -1
View File
@@ -14,7 +14,7 @@ public class ArBillDetailFee implements Serializable
private Long detailFeeId;
private Long detailId;
private String prcFeeId;
private String prcIncomeBillFeeId;
private Integer feeNo;
private String feeType;
private String feeName;
bms-back/ruoyi-system/src/main/java/com/ruoyi/ar/service/impl/ArBillServiceImpl.java
+5 -5
View File
@@ -226,7 +226,7 @@ public class ArBillServiceImpl implements IArBillService
Map<String, ArBillDetail> detailsBySourceBill = new HashMap<>();
for (ArBillDetail detail : detailMapper.selectByBillId(bill.getArBillId()))
{
detailsBySourceBill.put(detail.getPrcBillId(), detail);
detailsBySourceBill.put(detail.getPrcOrderBillId(), detail);
}
List<ArBillDetailFee> detailFees = new ArrayList<>();
List<PrcIncomeBillFee> sourceFees = sourceBillIds.isEmpty()
@@ -308,9 +308,9 @@ public class ArBillServiceImpl implements IArBillService
List<String> sourceBillIds = new ArrayList<>();
for (ArBillDetail detail : detailMapper.selectByBillId(arBillId))
{
if (!StringUtils.isEmpty(detail.getPrcBillId()))
if (!StringUtils.isEmpty(detail.getPrcOrderBillId()))
{
sourceBillIds.add(detail.getPrcBillId());
sourceBillIds.add(detail.getPrcOrderBillId());
}
}
if (billMapper.updateArBillStatus(arBillId, ArBillStatus.VOID.getCode(), remark, operator, currentStatus.getCode()) != 1)
@@ -470,7 +470,7 @@ public class ArBillServiceImpl implements IArBillService
{
ArBillDetail detail = new ArBillDetail();
detail.setArBillId(bill.getArBillId());
detail.setPrcBillId(source.getBillId());
detail.setPrcOrderBillId(source.getBillId());
detail.setDetailNo(detailNo);
detail.setOrderNo(source.getOrderNo());
detail.setTrackingNo(source.getTrackingNo());
@@ -498,7 +498,7 @@ public class ArBillServiceImpl implements IArBillService
{
ArBillDetailFee fee = new ArBillDetailFee();
fee.setDetailId(detail.getDetailId());
fee.setPrcFeeId(source.getFeeId());
fee.setPrcIncomeBillFeeId(source.getFeeId());
fee.setFeeNo(feeNo);
fee.setFeeType(source.getFeeType());
fee.setFeeName(source.getFeeName());