diff --git a/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java b/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java index b367abcc9..f3a5683a5 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/client/OrderCargoClient.java @@ -44,12 +44,21 @@ public interface OrderCargoClient { Integer originalPackageCount, BigDecimal originalGrossWeightKg, BigDecimal originalVolumeCbm, String skuNo, String cargoNameEn, Integer unitsPerPackage, Integer totalQuantity, BigDecimal netWeightKg, - String cargoRemark) { + String cargoRemark, String customerRemark, String latestInternalNote) { public CargoBinding(Long cargoId, Long orderId, Integer itemNo, String cargoName, Integer originalPackageCount, BigDecimal originalGrossWeightKg, BigDecimal originalVolumeCbm) { 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); } } diff --git a/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java b/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java index 1ebdccd3e..14dbf17cd 100644 --- a/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java +++ b/firstleg/src/main/java/com/baiyue/firstleg/service/SmartLoadingService.java @@ -303,7 +303,8 @@ public class SmartLoadingService { item.setSkuCode(cargo.skuNo()); item.setProductNameEn(cargo.cargoNameEn()); item.setUnitsPerCarton(cargo.unitsPerPackage()); - item.setInternalRemark(cargo.cargoRemark()); + item.setCustomerRemark(cargo.customerRemark()); + item.setInternalRemark(cargo.latestInternalNote()); int original = cargo.originalPackageCount() == null || cargo.originalPackageCount() <= 0 ? boxes : cargo.originalPackageCount(); if (cargo.unitsPerPackage() != null) {