From 00620a6917d2c4b0df1f62366a489cfe6aed8be1 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 02 一月 2025 15:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs-auto
---
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index e9d9ab5..14a021d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -125,11 +125,11 @@
@ApiModelProperty(value= "")
@TableField("matnr1")
- private Integer matnr1;
+ private String matnr1;
@ApiModelProperty(value= "")
@TableField("matnr2")
- private Integer matnr2;
+ private String matnr2;
@ApiModelProperty(value= "")
@TableField("type2")
@@ -150,9 +150,22 @@
@ApiModelProperty(value= "")
@TableField("anfme2")
private Integer anfme2;
+
+ @ApiModelProperty(value= "")
+ @TableField("weight")
+ private Double weight;
+
+ @ApiModelProperty(value= "")
+ @TableField("weight2")
+ private Double weight2;
+
+ @ApiModelProperty(value= "")
+ private String memo;
+ @ApiModelProperty(value= "")
+ private String memo2;
public WrkMastSta() {}
- public WrkMastSta(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn) {
+ public WrkMastSta(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn,String memo,String memo2) {
this.wrkNo = wrkNo;
this.wrkStart = wrkStart;
this.wrkEnd = wrkEnd;
@@ -166,6 +179,8 @@
this.wrkType = wrkType;
this.bignTime = bignTime;
this.wrkCrn = wrkCrn;
+ this.memo = memo;
+ this.memo = memo2;
}
// WrkMastSta wrkMastSta = new WrkMastSta(
--
Gitblit v1.9.1