From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java
index 3f9c6d4..af362d2 100644
--- a/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualTechnology.java
@@ -47,17 +47,21 @@
**/
private String deviceGroup;
- /**
- * 鍏宠仈 璁惧id
- **/
- private Integer deviceId;
+ @ApiModelProperty(value = "鐢熶骇瀹氶(涓�/澶�)")
+ private Integer productionQuota;
/**
* 鍏宠仈 鐢熶骇璁㈠崟id
**/
private Integer manufactureOrderId;
+ /**
+ * 鍏宠仈 鏍囧噯BOM宸ヨ壓璺嚎id
+ **/
+ private Integer technologyId;
+
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
+ @TableLogic(value = "1", delval = "0")
private Integer state;
@TableField(fill = FieldFill.INSERT)
@@ -69,24 +73,5 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
-
- /**
- * 寮�濮嬫棩鏈�(璁″垝)
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date startTime;
-
- /**
- * 缁撴潫鏃ユ湡(璁″垝)
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date endTime;
-
- /**
- * 鍛ㄦ湡
- **/
- private Integer period;
}
--
Gitblit v1.9.3