java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
ouyangxq
2026-08-18 15:46:52 +08:00
parent 4b0b3e9172
commit b26e64bb8d
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java
+11 -2
View File
@@ -44,12 +44,21 @@ public interface OrderCargoClient {
Integer originalPackageCount, BigDecimal originalGrossWeightKg, Integer originalPackageCount, BigDecimal originalGrossWeightKg,
BigDecimal originalVolumeCbm, String skuNo, String cargoNameEn, BigDecimal originalVolumeCbm, String skuNo, String cargoNameEn,
Integer unitsPerPackage, Integer totalQuantity, BigDecimal netWeightKg, Integer unitsPerPackage, Integer totalQuantity, BigDecimal netWeightKg,
String cargoRemark) { String cargoRemark, String customerRemark, String latestInternalNote) {
public CargoBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName, public CargoBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
Integer originalPackageCount, BigDecimal originalGrossWeightKg, Integer originalPackageCount, BigDecimal originalGrossWeightKg,
BigDecimal originalVolumeCbm) { BigDecimal originalVolumeCbm) {
this(cargoId, orderId, itemNo, cargoName, originalPackageCount, this(cargoId, orderId, itemNo, cargoName, originalPackageCount,
originalGrossWeightKg, originalVolumeCbm, null, null, null, null, null, null); originalGrossWeightKg, originalVolumeCbm, null, null, null, null, null, null, null, null);
}
public CargoBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName,
Integer originalPackageCount, BigDecimal originalGrossWeightKg,
BigDecimal originalVolumeCbm, String skuNo, String cargoNameEn,
Integer unitsPerPackage, Integer totalQuantity, BigDecimal netWeightKg,
String cargoRemark) {
this(cargoId, orderId, itemNo, cargoName, originalPackageCount, originalGrossWeightKg,
originalVolumeCbm, skuNo, cargoNameEn, unitsPerPackage, totalQuantity, netWeightKg,
cargoRemark, null, null);
} }
} }
firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java
+2 -1
View File
@@ -303,7 +303,8 @@ public class SmartLoadingService {
item.setSkuCode(cargo.skuNo()); item.setSkuCode(cargo.skuNo());
item.setProductNameEn(cargo.cargoNameEn()); item.setProductNameEn(cargo.cargoNameEn());
item.setUnitsPerCarton(cargo.unitsPerPackage()); item.setUnitsPerCarton(cargo.unitsPerPackage());
item.setInternalRemark(cargo.cargoRemark()); item.setCustomerRemark(cargo.customerRemark());
item.setInternalRemark(cargo.latestInternalNote());
int original = cargo.originalPackageCount() == null || cargo.originalPackageCount() <= 0 int original = cargo.originalPackageCount() == null || cargo.originalPackageCount() <= 0
? boxes : cargo.originalPackageCount(); ? boxes : cargo.originalPackageCount();
if (cargo.unitsPerPackage() != null) { if (cargo.unitsPerPackage() != null) {