From 088ceb9faf6f1d0d9f57bb9cd65f542337d40b7f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:30:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureOrder.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureOrder.java b/production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureOrder.java
index 3d6d2c8..47dc066 100644
--- a/production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureOrder.java
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureOrder.java
@@ -72,6 +72,8 @@
**/
private Integer number;
+ @ApiModelProperty(value = "宸叉帓浜ф暟閲�")
+ private Integer scheduledProduction;
/**
* 涓嬪崟鏃ユ湡
**/
@@ -87,16 +89,12 @@
private Date deltime;
/**
- * 鐘舵��0:寰呮帓浜�;1:宸叉帓浜�
- **/
- private Integer type;
-
- /**
* 璐ㄩ噺杩芥函鍙�
**/
private String qualityTraceability;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
@@ -108,5 +106,15 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
+
+ /**
+ * 涓嬭揪鐘舵��0:寰呬笅杈�;1:宸蹭笅杈�
+ **/
+ private Integer goState;
+
+ /**
+ * 涓嬪崟浜�
+ **/
+ private String downman;
}
--
Gitblit v1.9.3