From aa7bcbc678a671a51a87c7ba6bbfaa107399a96d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 08 四月 2025 14:28:16 +0800
Subject: [PATCH] 添加优化原片出库报表,除去时间相关筛选

---
 north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
index 808ab9f..be8252a 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
+++ b/north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java
@@ -14,6 +14,7 @@
     private Long id;
     private Integer deliveryState;
     private Integer stockState;
+    private String paymentTerms;
     private String deliveryId;
     private String orderId;
     private String project;
@@ -22,8 +23,8 @@
     private LocalDate deliveryDate;
     private String payMethod;
     private LocalDate payDate;
-    private String saleManId;
-    private String saleMan;
+    private String salesmanId;
+    private String salesman;
     private String creatorId;
     private String creator;
     private String contacts;
@@ -32,6 +33,11 @@
     private Double area;
     private Integer quantity;
     private Double money;
+    private Double otherMoney;
+    private Double freight;
+    private Integer freightQuantity;
+    private Double freightPrice;
+    private Integer printingNumber;
     private String remarks;
     private LocalDate createTime;
     private LocalDate updateTime;

--
Gitblit v1.8.0