diff --git a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/BatchImportDto.java b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/BatchImportDto.java index 369e44c6..079c5156 100644 --- a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/BatchImportDto.java +++ b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/BatchImportDto.java @@ -4,6 +4,7 @@ import jakarta.persistence.ManyToOne; import lombok.Data; +import java.time.LocalDateTime; import java.util.*; @Data @@ -20,4 +21,9 @@ public class BatchImportDto { private List carNumbers; + + private LocalDateTime startTime; + + private LocalDateTime endTime; + } diff --git a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/CreateOrderCarNumberBindDto.java b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/CreateOrderCarNumberBindDto.java index 7b6be94e..0840b2e7 100644 --- a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/CreateOrderCarNumberBindDto.java +++ b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/CreateOrderCarNumberBindDto.java @@ -6,6 +6,8 @@ import jakarta.persistence.ManyToOne; import lombok.Data; +import java.time.LocalDateTime; + @Data public class CreateOrderCarNumberBindDto extends OrgCommonDto { @@ -16,4 +18,11 @@ public class CreateOrderCarNumberBindDto extends OrgCommonDto { private String saleOrder; @ManyToOne private String purchaseOrder; + + + + private LocalDateTime startTime; + + private LocalDateTime endTime; + } diff --git a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/OrderCarNumberBindDto.java b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/OrderCarNumberBindDto.java index 4cc60e1a..283330b8 100644 --- a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/OrderCarNumberBindDto.java +++ b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/OrderCarNumberBindDto.java @@ -8,6 +8,7 @@ import jakarta.persistence.ManyToOne; import lombok.Data; +import java.time.LocalDateTime; import java.util.List; @Data @@ -21,4 +22,10 @@ public class OrderCarNumberBindDto extends OrgCommonDto { private List weightDataList; + + + + private LocalDateTime startTime; + + private LocalDateTime endTime; } diff --git a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/UpdateOrderCarNumberBindDto.java b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/UpdateOrderCarNumberBindDto.java index 4fbbaf0b..a5f1d477 100644 --- a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/UpdateOrderCarNumberBindDto.java +++ b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/dto/UpdateOrderCarNumberBindDto.java @@ -6,6 +6,8 @@ import jakarta.persistence.ManyToOne; import lombok.Data; +import java.time.LocalDateTime; + @Data public class UpdateOrderCarNumberBindDto extends OrgCommonDto { @@ -18,4 +20,10 @@ public class UpdateOrderCarNumberBindDto extends OrgCommonDto { @ManyToOne private String purchaseOrder; + + + private LocalDateTime startTime; + + private LocalDateTime endTime; + } diff --git a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/entity/OrderCarNumberBindEntity.java b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/entity/OrderCarNumberBindEntity.java index 2bd7b750..67ba8b28 100644 --- a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/entity/OrderCarNumberBindEntity.java +++ b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/entity/OrderCarNumberBindEntity.java @@ -10,6 +10,8 @@ import jakarta.persistence.Table; import lombok.Data; +import java.time.LocalDateTime; + @Data @Entity @Table( @@ -27,10 +29,7 @@ public class OrderCarNumberBindEntity extends OrgCommonEntity { @ManyToOne private PurchaseOrderEntity purchaseOrder; + private LocalDateTime startTime; - - - - - + private LocalDateTime endTime; } diff --git a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/service/OrderCarNumberBindService.java b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/service/OrderCarNumberBindService.java index b274f9c7..033f2fd6 100644 --- a/src/main/java/cn/lihongjie/coal/orderCarNumberBind/service/OrderCarNumberBindService.java +++ b/src/main/java/cn/lihongjie/coal/orderCarNumberBind/service/OrderCarNumberBindService.java @@ -65,23 +65,28 @@ public class OrderCarNumberBindService Predicate carNumberPredicate = criteriaBuilder.equal(root.get("carNumber"), entity.getCarNumber()); - Predicate saleOrderPredicate = - criteriaBuilder.equal( - root.get("saleOrder").get("id"), entity.getSaleOrder()); - Predicate purchaseOrderPredicate = - criteriaBuilder.equal( - root.get("purchaseOrder").get("id"), - entity.getPurchaseOrder()); - if (ObjectUtils.isEmpty(entity.getSaleOrder())) { + + if (ObjectUtils.isEmpty(entity.getPurchaseOrder())) { + + + Predicate purchaseOrderPredicate = + criteriaBuilder.equal( + root.get("purchaseOrder").get("id"), + entity.getPurchaseOrder().getId()); return criteriaBuilder.and(carNumberPredicate, purchaseOrderPredicate); - } else if (ObjectUtils.isEmpty(entity.getPurchaseOrder())) { + } else if (ObjectUtils.isEmpty(entity.getSaleOrder())) { + + + Predicate saleOrderPredicate = + criteriaBuilder.equal( + root.get("saleOrder").get("id"), entity.getSaleOrder()); return criteriaBuilder.and(carNumberPredicate, saleOrderPredicate); } else { - return criteriaBuilder.and( - carNumberPredicate, saleOrderPredicate, purchaseOrderPredicate); + + throw new BizException("销售订单和采购订单不能同时为空"); } } });