diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java index 7de939d18..a887077e4 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java @@ -57,6 +57,9 @@ public class TrunklineBillladingWaybillEntity extends TenantEntity { /** 提货费用 */ @ApiModelProperty(name = "提货费用",notes = "") private BigDecimal billladingFee ; + /** 计划件数 */ + @ApiModelProperty(name = "计划件数",notes = "") + private Integer planNum ; } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index d9f93f9f6..a02f1ba66 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -489,4 +489,7 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "冻结时间 ") private Date freezeTime; + @ApiModelProperty(value = "提货件数 ") + private Integer billladingNum; + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java index abf5bf291..46fa7ded8 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseWaybillVO.java @@ -39,6 +39,8 @@ public class WarehouseWaybillVO extends WarehouseWaybillEntity { private Integer handleNum; + private Integer planNum; + private Long waybillId; } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml index e10f63437..76a3f0a49 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingMapper.xml @@ -94,6 +94,7 @@ lww.customer_train customerTrain, lww.shipper shipper, lww.total_count totalCount, + lww.total_count-lww.billlading_num planNum, lww.total_weight totalWeight, lww.total_volume totalVolume, lww.total_freight totalFreight, @@ -105,7 +106,7 @@ lww.destination_warehouse_name destinationWarehouseName, lww.remark remark from logpm_warehouse_waybill lww - where lww.stock_count != total_count + where lww.billlading_num != lww.total_count and lww.departure_warehouse_id = #{param.warehouseId} and lww.waybill_no not in diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java index ef127277d..b269b6742 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingServiceImpl.java @@ -116,9 +116,14 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl