From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/entity/AdjDetl.java | 198 +++++++++++-------------------------------------
1 files changed, 47 insertions(+), 151 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index bc45c3e..0bf1c5d 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.MatCodeService;
-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 {
@@ -24,7 +25,7 @@
/**
* 搴忓彿
*/
- @ApiModelProperty(value= "搴忓彿")
+ @ApiModelProperty(value = "搴忓彿")
@TableId(value = "adj_id", type = IdType.AUTO)
@TableField("adj_id")
private Long adjId;
@@ -32,98 +33,112 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
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;
/**
* 鍘熺鏁�
*/
- @ApiModelProperty(value= "鍘熺鏁�")
+ @ApiModelProperty(value = "鍘熺鏁�")
@TableField("ori_ctns")
private Double oriCtns;
/**
* 鍘熸暟閲�
*/
- @ApiModelProperty(value= "鍘熸暟閲�")
+ @ApiModelProperty(value = "鍘熸暟閲�")
@TableField("ori_qty")
private Double oriQty;
/**
* 鍘熼噸閲�
*/
- @ApiModelProperty(value= "鍘熼噸閲�")
+ @ApiModelProperty(value = "鍘熼噸閲�")
@TableField("ori_wt")
private Double oriWt;
/**
* 鍙樻洿绠辨暟
*/
- @ApiModelProperty(value= "鍙樻洿绠辨暟")
+ @ApiModelProperty(value = "鍙樻洿绠辨暟")
@TableField("adj_ctns")
private Double adjCtns;
/**
* 鍙樻洿鏁伴噺
*/
- @ApiModelProperty(value= "鍙樻洿鏁伴噺")
+ @ApiModelProperty(value = "鍙樻洿鏁伴噺")
@TableField("adj_qty")
private Double adjQty;
/**
* 鍙樻洿閲嶉噺
*/
- @ApiModelProperty(value= "鍙樻洿閲嶉噺")
+ @ApiModelProperty(value = "鍙樻洿閲嶉噺")
@TableField("adj_wt")
private Double adjWt;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public AdjDetl() {}
+ 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 +152,10 @@
this.appeTime = appeTime;
}
-// AdjDetl adjDetl = new AdjDetl(
+ // AdjDetl adjDetl = new AdjDetl(
// null, // 搴撲綅鍙穂闈炵┖]
// null, // 鐗╂枡缂栧彿[闈炵┖]
+// null, // 搴忓垪鐮�
// null, // 鍘熺鏁�
// null, // 鍘熸暟閲�
// null, // 鍘熼噸閲�
@@ -153,158 +169,38 @@
// null // 娣诲姞鏃堕棿
// );
- public Long getAdjId() {
- return adjId;
- }
- public void setAdjId(Long adjId) {
- this.adjId = adjId;
- }
-
- public String getLocNo() {
- return locNo;
- }
-
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
- public String getMatNo() {
- return matNo;
- }
-
- public String getMatNo$(){
- MatCodeService service = SpringUtils.getBean(MatCodeService.class);
- MatCode matCode = service.selectById(this.matNo);
- if (!Cools.isEmpty(matCode)){
- return String.valueOf(matCode.getMatNo());
- }
- 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$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.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$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
}
--
Gitblit v1.9.1