From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:44:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/AdjDetl.java | 153 ++++++++-------------------------------------------
1 files changed, 24 insertions(+), 129 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index faca7f8..e6a3cc0 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -7,15 +7,16 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.MatService;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("asr_adj_detl")
public class AdjDetl implements Serializable {
@@ -37,11 +38,23 @@
private String locNo;
/**
- * 鐗╂枡缂栧彿
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡缂栧彿")
- @TableField("mat_no")
- private String matNo;
+ @ApiModelProperty(value= "鍙樻洿鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @TableField("matnr_old")
+ private String matnrOld;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
/**
* 鍘熺鏁�
@@ -121,9 +134,10 @@
public AdjDetl() {}
- public AdjDetl(String locNo,String matNo,Double oriCtns,Double oriQty,Double oriWt,Double adjCtns,Double adjQty,Double adjWt,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public AdjDetl(String locNo, String matnr, String batch, Double oriCtns, Double oriQty, Double oriWt, Double adjCtns, Double adjQty, Double adjWt, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.locNo = locNo;
- this.matNo = matNo;
+ this.matnr = matnr;
+ this.batch = batch;
this.oriCtns = oriCtns;
this.oriQty = oriQty;
this.oriWt = oriWt;
@@ -137,9 +151,10 @@
this.appeTime = appeTime;
}
-// AdjDetl adjDetl = new AdjDetl(
+ // AdjDetl adjDetl = new AdjDetl(
// null, // 搴撲綅鍙穂闈炵┖]
// null, // 鐗╂枡缂栧彿[闈炵┖]
+// null, // 搴忓垪鐮�
// null, // 鍘熺鏁�
// null, // 鍘熸暟閲�
// null, // 鍘熼噸閲�
@@ -153,17 +168,6 @@
// null // 娣诲姞鏃堕棿
// );
- public Long getAdjId() {
- return adjId;
- }
-
- public void setAdjId(Long adjId) {
- this.adjId = adjId;
- }
-
- public String getLocNo() {
- return locNo;
- }
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -174,86 +178,6 @@
return null;
}
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
-
- public String getMatNo() {
- return matNo;
- }
-
- public String getMatNo$(){
- MatService service = SpringUtils.getBean(MatService.class);
- Mat mat = service.selectByMatnr(this.matNo);
- if (!Cools.isEmpty(mat)){
- return String.valueOf(mat.getMatnr());
- }
- return null;
- }
-
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public Double getOriCtns() {
- return oriCtns;
- }
-
- public void setOriCtns(Double oriCtns) {
- this.oriCtns = oriCtns;
- }
-
- public Double getOriQty() {
- return oriQty;
- }
-
- public void setOriQty(Double oriQty) {
- this.oriQty = oriQty;
- }
-
- public Double getOriWt() {
- return oriWt;
- }
-
- public void setOriWt(Double oriWt) {
- this.oriWt = oriWt;
- }
-
- public Double getAdjCtns() {
- return adjCtns;
- }
-
- public void setAdjCtns(Double adjCtns) {
- this.adjCtns = adjCtns;
- }
-
- public Double getAdjQty() {
- return adjQty;
- }
-
- public void setAdjQty(Double adjQty) {
- this.adjQty = adjQty;
- }
-
- public Double getAdjWt() {
- return adjWt;
- }
-
- public void setAdjWt(Double adjWt) {
- this.adjWt = adjWt;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
@@ -264,35 +188,11 @@
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
}
public String getAppeTime$(){
@@ -301,10 +201,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
}
--
Gitblit v1.9.1