From 843e69ee8430327073725419daa30596c3ca56cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 3 Apr 2026 15:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81bms;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiptOrderAccount/entity/ReceiptOrderAccount.java | 4 ++-- .../service/StockReceiptOrderDomainService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java index ebba803c2..040b9b44e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/receiptOrderAccount/entity/ReceiptOrderAccount.java @@ -101,8 +101,8 @@ public class ReceiptOrderAccount extends BaseVOEntity { @ApiModelProperty(value = "金额") @Excel(name = "金额", width = 15) private BigDecimal amount; - @ApiModelProperty(value = "金额") - @Excel(name = "金额", width = 15) + @ApiModelProperty(value = "计算金额") + @Excel(name = "计算金额", width = 15) private BigDecimal settlementAmount; @ApiModelProperty(value = "数量") diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java index 82e41d5db..68cd5e9dd 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java @@ -463,15 +463,15 @@ public class StockReceiptOrderDomainService { businessDataPushDTO.setBillAmount(account.getAmount());//计费金额 businessDataPushDTO.setEstimatedCost(account.getSettlementAmount());//计算金额 com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject(); - if ("".equals(subjectName)) { + if ("装卸费".equals(subjectName)) { jsonObject.put("loading_unloading_unit_price", account.getPrice());//装卸货单价 jsonObject.put("cargo_quantity",account.getNum());//货物数量 - } else if ("".equals(subjectName)) { + } else if ("贴标费".equals(subjectName)) { jsonObject.put("wooden_case_labeling_unit_price", account.getPrice());//木箱单价 jsonObject.put("carton_labeling_unit_price",account.getPrice());//纸箱单价 jsonObject.put("wooden_case_quantity",account.getNum());//木箱数量 jsonObject.put("carton_quantity",account.getNum());//纸箱数量 - } else if ("".equals(subjectName)) { + } else if ("进出仓操作费".equals(subjectName)) { jsonObject.put("cargo_quantity", account.getNum());//货物数量 jsonObject.put("warehouse_handling_unit_price",account.getPrice());//进出仓操作费单价 }