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

增加收货重

Browse Source
This commit is contained in:
wuweihua
2026-10-13 17:47:22 +08:00
parent 490f5dd213
commit 825663be01
10 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java
+2
View File
@@ -49,6 +49,8 @@ public class PrcOrderBill extends BaseEntity
private List<String> customerCodes;
private Integer pieces;
private BigDecimal actualWeight;
/** Receive weight from upstream TAB_ORDER.WEIGHT */
private BigDecimal receiveWeight;
private BigDecimal volume;
private BigDecimal volumeWeight;
private BigDecimal pkgLength;
bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceBillRequest.java
+2
View File
@@ -38,6 +38,8 @@ public class TmsPriceBillRequest extends TmsPriceQuoteRequest
private String customerName;
private Integer pieces;
private BigDecimal actualWeight;
/** Upstream TAB_ORDER.WEIGHT (receive weight) */
private BigDecimal receiveWeight;
private BigDecimal volume;
private BigDecimal volumeWeight;
private BigDecimal pkgLength;
bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteResult.java
+2
View File
@@ -105,6 +105,8 @@ public class TmsPriceQuoteResult implements Serializable
private String refundStatus;
private Integer pieces;
private BigDecimal actualWeight;
/** Receive weight from upstream TAB_ORDER.WEIGHT */
private BigDecimal receiveWeight;
private BigDecimal volume;
private BigDecimal volumeWeight;
private BigDecimal pkgLength;
bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java
+8 -2
View File
@@ -46,8 +46,14 @@ public class OracleOrderBillMapper
String countryName = firstStr(row, "COUNTRY_NAME", "COUNTRY_EINGTH_NAME", "COUNTRY");
req.setCountryName(countryName);
req.setDestPostcode(firstStr(row, "CONSIGNEE_POSTCODE"));
// Quote / prc_order_bill.weight: use upstream TAB_ORDER.WEIGHT directly.
req.setWeight(firstPositiveDecimal(row, "WEIGHT"));
// TAB_ORDER.DIMENSIONAL_WEIGHT_FACTOR = billing weight -> quote weight / prc_order_bill.weight
BigDecimal chargeWeight = firstPositiveDecimal(row, "DIMENSIONAL_WEIGHT_FACTOR");
BigDecimal weight = chargeWeight != null
? chargeWeight
: firstPositiveDecimal(row, "ACTUAL_WEIGHT", "PUSH_WEIGHT", "WEIGHT", "VOLUME_WEIGHT");
req.setWeight(weight);
// TAB_ORDER.WEIGHT = receive weight (收货重)
req.setReceiveWeight(firstDecimal(row, "WEIGHT"));
req.setActualWeight(firstPositiveDecimal(row, "ACTUAL_WEIGHT", "PUSH_WEIGHT", "WEIGHT"));
req.setPieces(firstInt(row, "ORDER_PIECE", "PACKAGE_NUM", "PRODUCT_SUM"));
req.setVolume(toVolumeM3(firstDecimal(row, "VOLUME")));
bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
+2
View File
@@ -1081,6 +1081,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
bill.setCustomerActiveStatus(customerActiveStatus);
bill.setPieces(request.getPieces());
bill.setActualWeight(request.getActualWeight());
bill.setReceiveWeight(request.getReceiveWeight());
bill.setVolume(request.getVolume());
bill.setVolumeWeight(request.getVolumeWeight());
bill.setPkgLength(request.getPkgLength());
@@ -1699,6 +1700,7 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
r.setRefundStatus(bill.getRefundStatus());
r.setPieces(bill.getPieces());
r.setActualWeight(bill.getActualWeight());
r.setReceiveWeight(bill.getReceiveWeight());
r.setVolume(bill.getVolume());
r.setVolumeWeight(bill.getVolumeWeight());
r.setPkgLength(bill.getPkgLength());