diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxBrand.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxBrand.java index 6ed5119..7000270 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxBrand.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxBrand.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.biz.domain.entity; import com.alibaba.cola.domain.Entity; import com.alibaba.cola.dto.DTO; +import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; @@ -32,6 +33,11 @@ public class BoxBrand extends DTO { */ private String image; + /** + * 品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱 + */ + private BoxBrandTypeEnum type; + /** * 备注 */ @@ -57,4 +63,4 @@ public class BoxBrand extends DTO { */ private LocalDateTime createdAt; -} \ No newline at end of file +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ShipOrder.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ShipOrder.java index e36f57b..f2147fc 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ShipOrder.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ShipOrder.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.biz.domain.entity; import com.alibaba.cola.domain.Entity; import com.alibaba.cola.dto.DTO; +import com.xunhong.erp.turbo.api.biz.dto.common.OrderCost; import com.xunhong.erp.turbo.api.biz.dto.common.ShipOrderItem; import com.xunhong.erp.turbo.api.biz.dto.common.ShipOrderPackage; import com.xunhong.erp.turbo.api.biz.dto.enums.ShipOrderStateEnum; @@ -205,4 +206,9 @@ public class ShipOrder extends DTO { * 发货单子项表 */ private List shipOrderPackageList; -} \ No newline at end of file + + /** + * 订单费用表 + */ + private List orderCostList; +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ShipOrderConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ShipOrderConvert.java index 45c8a83..900fabc 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ShipOrderConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ShipOrderConvert.java @@ -16,10 +16,12 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ShipOrderConvert { + @Mapping(target = "orderCostList", source = "orderCostDOList") @Mapping(target = "shipOrderPackageList", source = "shipOrderPackageDOList") @Mapping(target = "shipOrderItemList", source = "shipOrderItemDOList") ShipOrder toShipOrder(ShipOrderDO shipOrderDO); + @Mapping(target = "orderCostDOList", ignore = true) @Mapping(target = "warehouseName", ignore = true) @Mapping(target = "warehouseId", ignore = true) @Mapping(target = "vehicleNo", ignore = true) @@ -37,6 +39,7 @@ public interface ShipOrderConvert { @Mapping(target = "createdAt", ignore = true) ShipOrderDO toShipOrderDO(ShipOrderCreateCmd shipOrderCreateCmd); + @Mapping(target = "orderCostDOList", ignore = true) @Mapping(target = "warehouseName", ignore = true) @Mapping(target = "warehouseId", ignore = true) @Mapping(target = "vehicleNo", ignore = true) @@ -67,6 +70,9 @@ public interface ShipOrderConvert { @Mapping(target = "createdAt", ignore = true) void toShipOrderDO(@MappingTarget ShipOrderDO shipOrderDO, ShipOrderUpdateCmd shipOrderUpdateCmd); + @Mapping(target = "orderCostDOList", ignore = true) + @Mapping(target = "companyName", ignore = true) + @Mapping(target = "companyId", ignore = true) @Mapping(target = "warehouseName", ignore = true) @Mapping(target = "warehouseId", ignore = true) @Mapping(target = "version", ignore = true) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderPackageDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderPackageDO.java index 89fd55c..b0cfb06 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderPackageDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderPackageDO.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.OrderPackageBoxTypeEnum; import com.xunhong.erp.turbo.datasource.domain.entity.BaseDO; import lombok.Data; @@ -49,6 +50,12 @@ public class OrderPackageDO extends BaseDO { @TableField(value = "box_brand_image") private String boxBrandImage; + /** + * 箱子品牌类型:1_我方纸箱；2_瓜农纸箱；3_第三方纸箱 + */ + @TableField(value = "box_brand_type") + private BoxBrandTypeEnum boxBrandType; + /** * 箱子分类ID */ @@ -97,4 +104,4 @@ public class OrderPackageDO extends BaseDO { @TableField(value = "box_type") private OrderPackageBoxTypeEnum boxType; -} \ No newline at end of file +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderDO.java index d3eab04..02b52ee 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderDO.java @@ -238,4 +238,10 @@ public class ShipOrderDO extends BaseDO { @TableField(exist = false) private List shipOrderItemDOList; -} \ No newline at end of file + /** + * 订单成本 + */ + @TableField(exist = false) + private List orderCostDOList; + +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderItemDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderItemDO.java index 3f3c0e1..e204d59 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderItemDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ShipOrderItemDO.java @@ -42,6 +42,12 @@ public class ShipOrderItemDO extends BaseDO { @TableField(value = "box_weight") private BigDecimal boxWeight; + /** + * 箱数 + */ + @TableField(value = "box_count") + private Integer boxCount; + /** * 净重(斤) */ diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxProductGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxProductGatewayImpl.java index e7f4566..ed67739 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxProductGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxProductGatewayImpl.java @@ -50,6 +50,7 @@ public class BoxProductGatewayImpl implements BoxProductGateway { queryWrapper.eq(Objects.nonNull(boxProductPageQry.getSpecType()), BoxProductDO::getSpecType, boxProductPageQry.getSpecType()); queryWrapper.eq(Objects.nonNull(boxProductPageQry.getBrandId()), BoxProductDO::getBrandId, boxProductPageQry.getBrandId()); queryWrapper.eq(Objects.nonNull(boxProductPageQry.getStatus()), BoxProductDO::getStatus, boxProductPageQry.getStatus()); + queryWrapper.eq(Objects.nonNull(boxProductPageQry.getType()), BoxProductDO::getType, boxProductPageQry.getType()); queryWrapper.orderByAsc(BoxProductDO::getSort); queryWrapper.orderByDesc(BoxProductDO::getCreatedAt); @@ -67,6 +68,7 @@ public class BoxProductGatewayImpl implements BoxProductGateway { queryWrapper.eq(Objects.nonNull(boxProductListQry.getSpecType()), BoxProductDO::getSpecType, boxProductListQry.getSpecType()); queryWrapper.eq(Objects.nonNull(boxProductListQry.getBrandId()), BoxProductDO::getBrandId, boxProductListQry.getBrandId()); queryWrapper.eq(Objects.nonNull(boxProductListQry.getStatus()), BoxProductDO::getStatus, boxProductListQry.getStatus()); + queryWrapper.eq(Objects.nonNull(boxProductListQry.getType()), BoxProductDO::getType, boxProductListQry.getType()); queryWrapper.orderByAsc(BoxProductDO::getSort); queryWrapper.orderByDesc(BoxProductDO::getCreatedAt); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java index d22f0b7..57f1a27 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CostItemGatewayImpl.java @@ -66,6 +66,8 @@ public class CostItemGatewayImpl implements CostItemGateway { queryWrapper.eq(Objects.nonNull(costItemListQry.getShowInEntry()), CostItemDO::getShowInEntry, costItemListQry.getShowInEntry()); queryWrapper.eq(Objects.nonNull(costItemListQry.getStatus()), CostItemDO::getStatus, costItemListQry.getStatus()); queryWrapper.eq(Objects.nonNull(costItemListQry.getCostType()), CostItemDO::getCostType, costItemListQry.getCostType()); + + queryWrapper.orderByAsc(CostItemDO::getCostType); queryWrapper.orderByAsc(CostItemDO::getSort); queryWrapper.orderByDesc(CostItemDO::getCreatedAt); List costItemDOList = costItemMapper.selectList(queryWrapper); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java index 22bab62..6eb0812 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PurchaseOrderGatewayImpl.java @@ -22,10 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -418,6 +415,7 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { shipOrderDO.setDriverPhone(orderVehicleDO.getPhone()); shipOrderDO.setShippingDate(orderVehicleDO.getDeliveryTime()); shipOrderDO.setShippingAddress(orderVehicleDO.getOrigin()); + shipOrderDO.setReceivingAddress(orderVehicleDO.getDestination()); shipOrderDO.setFreightDebt(orderVehicleDO.getPrice()); if (orderVehicleDO.getOpenStrawCurtain()) { shipOrderDO.setStrawMatDebt(orderVehicleDO.getStrawCurtainPrice()); @@ -592,10 +590,6 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { .reduce(BigDecimal.ZERO, BigDecimal::add); shipOrderItemDO.setGrossWeight(totalGrossWeight); - // 计算总箱重（这里假设箱重需要另外计算） - BigDecimal totalBoxWeight = BigDecimal.ZERO; - shipOrderItemDO.setBoxWeight(totalBoxWeight); - // 计算总净重 BigDecimal totalNetWeight = suppliers.stream() .map(OrderSupplierDO::getNetWeight) @@ -603,6 +597,17 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { .reduce(BigDecimal.ZERO, BigDecimal::add); shipOrderItemDO.setNetWeight(totalNetWeight); + shipOrderItemDO.setBoxWeight(totalGrossWeight.subtract(totalNetWeight)); + + // 计算总箱数 + Integer totalBoxCount = suppliers.stream() + .map(OrderSupplierDO::getOrderPackageDOList) + .flatMap(Collection::stream) + .map(OrderPackageDO::getBoxCount) + .reduce(0, Integer::sum); + + shipOrderItemDO.setBoxCount(totalBoxCount); + // 设置单价 BigDecimal salePrice = entry.getKey(); shipOrderItemDO.setUnitPrice(salePrice); @@ -613,11 +618,6 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { shipOrderItemDO.setTotalAmount(totalAmount); } - // 设置西瓜品级（这里使用第一个供应商的品级） - if (!suppliers.isEmpty()) { - shipOrderItemDO.setWatermelonGrade(suppliers.get(0).getName()); - } - shipOrderItemMapper.insert(shipOrderItemDO); } @@ -719,6 +719,48 @@ public class PurchaseOrderGatewayImpl implements PurchaseOrderGateway { } } + // 更新费用信息（精细化处理） + // 获取现有的费用列表 + LambdaQueryWrapper costQueryWrapper = Wrappers.lambdaQuery(OrderCostDO.class); + costQueryWrapper.eq(OrderCostDO::getOrderId, purchaseOrderDO.getOrderId()); + List existingCosts = orderCostMapper.selectList(costQueryWrapper); + + // 获取更新的费用列表 + List updatedCosts = purchaseOrderStep1Cmd.getOrderCostList().stream().toList(); + + // 将现有费用映射到ID字典中便于查找 + Map existingCostMap = existingCosts.stream() + .collect(Collectors.toMap(OrderCostDO::getOrderCostId, Function.identity())); + + // 收集需要更新和新增的费用 + List costsToInsert = new ArrayList<>(); + List costsToUpdate = new ArrayList<>(); + + for (OrderCost updatedCost : updatedCosts) { + updatedCost.setOrderId(purchaseOrderDO.getOrderId()); + OrderCostDO costDO = orderCostConvert.toOrderCostDO(updatedCost); + + if (updatedCost.getOrderCostId() != null && existingCostMap.containsKey(updatedCost.getOrderCostId())) { + // 更新已存在的费用 + costDO.setOrderCostId(updatedCost.getOrderCostId()); + costsToUpdate.add(costDO); + // 从现有映射中移除，剩下的就是需要删除的 + existingCostMap.remove(updatedCost.getOrderCostId()); + } else { + // 新增费用 + costsToInsert.add(costDO); + } + } + + // 删除不再需要的费用 + existingCostMap.values().forEach(cost -> cost.deleteById()); + + // 执行更新操作 + costsToUpdate.forEach(orderCostMapper::updateById); + + // 执行插入操作 + costsToInsert.forEach(orderCostMapper::insert); + return purchaseOrderConvert.toPurchaseOrder(purchaseOrderDO); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java index 8a7d29b..9b95b68 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ShipOrderGatewayImpl.java @@ -17,9 +17,11 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.ShipOrderShowQry; import com.xunhong.erp.turbo.biz.domain.entity.ShipOrder; import com.xunhong.erp.turbo.biz.domain.gateway.ShipOrderGateway; import com.xunhong.erp.turbo.biz.infrastructure.convert.ShipOrderConvert; +import com.xunhong.erp.turbo.biz.infrastructure.entity.OrderCostDO; import com.xunhong.erp.turbo.biz.infrastructure.entity.ShipOrderDO; import com.xunhong.erp.turbo.biz.infrastructure.entity.ShipOrderItemDO; import com.xunhong.erp.turbo.biz.infrastructure.entity.ShipOrderPackageDO; +import com.xunhong.erp.turbo.biz.infrastructure.mapper.OrderCostMapper; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ShipOrderItemMapper; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ShipOrderMapper; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ShipOrderPackageMapper; @@ -41,6 +43,8 @@ public class ShipOrderGatewayImpl implements ShipOrderGateway { private final ShipOrderItemMapper shipOrderItemMapper; private final ShipOrderPackageMapper shipOrderPackageMapper; + private final OrderCostMapper orderCostMapper; + @Override public ShipOrder save(ShipOrderCreateCmd shipOrderCreateCmd) { ShipOrderDO shipOrderDO = shipOrderConvert.toShipOrderDO(shipOrderCreateCmd); @@ -100,6 +104,7 @@ public class ShipOrderGatewayImpl implements ShipOrderGateway { if (Objects.nonNull(shipOrderDO)) { shipOrderDO.setShipOrderItemDOList(shipOrderItemMapper.selectList(Wrappers.lambdaQuery(ShipOrderItemDO.class).eq(ShipOrderItemDO::getShipOrderId, shipOrderDO.getShipOrderId()))); shipOrderDO.setShipOrderPackageDOList(shipOrderPackageMapper.selectList(Wrappers.lambdaQuery(ShipOrderPackageDO.class).eq(ShipOrderPackageDO::getShipOrderId, shipOrderDO.getShipOrderId()))); + shipOrderDO.setOrderCostDOList(orderCostMapper.selectList(Wrappers.lambdaQuery(OrderCostDO.class).eq(OrderCostDO::getOrderId, shipOrderDO.getPurchaseOrderId()))); } return shipOrderConvert.toShipOrder(shipOrderDO); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ShipOrderItemMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ShipOrderItemMapper.xml index d1039b1..feb3858 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ShipOrderItemMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ShipOrderItemMapper.xml @@ -9,6 +9,7 @@ + diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java index 69e9de0..7e9851a 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/PurchaseOrderStep1Cmd.java @@ -1,5 +1,6 @@ package com.xunhong.erp.turbo.api.biz.dto.cmd; +import com.xunhong.erp.turbo.api.biz.dto.common.OrderCost; import com.xunhong.erp.turbo.api.biz.dto.common.OrderDealer; import com.xunhong.erp.turbo.api.biz.dto.common.OrderVehicle; import com.xunhong.erp.turbo.base.dto.Command; @@ -7,6 +8,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * @author shenyifei */ @@ -38,4 +41,9 @@ public class PurchaseOrderStep1Cmd extends Command { */ @Schema(title = "经销商信息", requiredMode = Schema.RequiredMode.REQUIRED) private OrderDealer orderDealer; + /** + * 费用信息 + */ + @Schema(title = "采购订单费用信息", requiredMode = Schema.RequiredMode.REQUIRED) + private List orderCostList; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderPackage.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderPackage.java index 54cf660..2561e89 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderPackage.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderPackage.java @@ -1,5 +1,6 @@ package com.xunhong.erp.turbo.api.biz.dto.common; +import com.xunhong.erp.turbo.api.biz.dto.enums.BoxBrandTypeEnum; import com.xunhong.erp.turbo.api.biz.dto.enums.OrderPackageBoxTypeEnum; import com.xunhong.erp.turbo.base.dto.Command; import io.swagger.v3.oas.annotations.media.Schema; @@ -46,6 +47,12 @@ public class OrderPackage extends Command { @Schema(title = "箱子品牌图片") private String boxBrandImage; + /** + * 箱子品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱 + */ + @Schema(title = "箱子品牌类型：1_我方纸箱；2_瓜农纸箱；3_第三方纸箱", requiredMode = Schema.RequiredMode.REQUIRED) + private BoxBrandTypeEnum boxBrandType; + /** * 箱子分类ID */ @@ -94,4 +101,4 @@ public class OrderPackage extends Command { @Schema(title = "箱子类型:1_本次使用；2_额外运输；3_已使用额外运输；4_车上剩余；", requiredMode = Schema.RequiredMode.REQUIRED) private OrderPackageBoxTypeEnum boxType; -} \ No newline at end of file +} diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/ShipOrderItem.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/ShipOrderItem.java index 09d48aa..2ac787e 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/ShipOrderItem.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/ShipOrderItem.java @@ -40,6 +40,12 @@ public class ShipOrderItem extends DTO { @Schema(title = "箱重(斤)") private BigDecimal boxWeight; + /** + * 箱数 + */ + @Schema(title = "箱数") + private Integer boxCount; + /** * 净重(斤) */ diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ShipOrderVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ShipOrderVO.java index 19a2ec7..133330e 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ShipOrderVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ShipOrderVO.java @@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.api.biz.dto.vo; import com.alibaba.cola.dto.DTO; import com.fasterxml.jackson.annotation.JsonFormat; +import com.xunhong.erp.turbo.api.biz.dto.common.OrderCost; import com.xunhong.erp.turbo.api.biz.dto.common.ShipOrderItem; import com.xunhong.erp.turbo.api.biz.dto.common.ShipOrderPackage; import com.xunhong.erp.turbo.api.biz.dto.enums.ShipOrderStateEnum; @@ -250,5 +251,10 @@ public class ShipOrderVO extends DTO { @Schema(title = "发货单子项表") private List shipOrderPackageList; + /** + * 发货单成本项目信息 + */ + @Schema(title = "发货单成本项目信息") + private List orderCostList; -} \ No newline at end of file +}