From a97c0e84c8d1f50aa65935643a580527f30b7ece Mon Sep 17 00:00:00 2001 From: 廖井涛 <2265517004@qq.com> Date: 星期二, 12 三月 2024 08:39:38 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java index 2a3d7f6..f5f9809 100644 --- a/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java +++ b/north-glass-erp/src/main/java/com/example/erp/entity/pp/ProductionScheduling.java @@ -4,6 +4,8 @@ import com.example.erp.entity.sd.OrderDetail; import lombok.Data; +import java.time.LocalDate; + @Data public class ProductionScheduling { //鑷id @@ -14,20 +16,22 @@ private String orderId; //璁㈠崟搴忓彿 private String orderNumber; + //灏忕墖椤哄簭 + private String technologyNumber; //鎺掍骇宸ュ簭 private String processes; //鎺掍骇鏁伴噺 private Integer schedulingQuantity; //璁″垝寮�濮嬫椂闂� - private Integer scheduledStartTime; + private LocalDate scheduledStartTime; //璁″垝缁撴潫鏃堕棿 - private Integer planEndTime; + private LocalDate planEndTime; //瀹℃牳鐘舵�� private String reviewStatus; //澶囨敞 private String notes; //鍒涘缓鏃堕棿 - private String createTime; + private LocalDate createTime; //澶栭敭璁㈠崟琛� private Order order; -- Gitblit v1.8.0