From a04d735ab3f2e9c52ebf52c35dfa1506d86d416d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 24 七月 2025 17:01:57 +0800
Subject: [PATCH] 修改流程卡打印获取第一个工序不正确问题，在制品汇总报表添加批次
---
north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 391f453..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,15 +14,18 @@
private Long id;
private Integer deliveryState;
private Integer stockState;
+ private String paymentTerms;
private String deliveryId;
+ private String orderId;
private String project;
+ private String customerId;
private String customerName;
private LocalDate deliveryDate;
private String payMethod;
private LocalDate payDate;
- private String salaManId;
- private String salaMan;
- private String createrId;
+ private String salesmanId;
+ private String salesman;
+ private String creatorId;
private String creator;
private String contacts;
private String contactNumber;
@@ -30,10 +33,13 @@
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;
- private Order order;
- private Customer customer;
}
--
Gitblit v1.8.0