From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +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..7300d18 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,16 @@
private String locNo;
/**
- * 鐗╂枡缂栧彿
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡缂栧彿")
- @TableField("mat_no")
- private String matNo;
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 搴忓垪鐮�
+ */
+ @ApiModelProperty(value= "搴忓垪鐮�")
+ private String batch;
/**
* 鍘熺鏁�
@@ -119,11 +125,18 @@
@TableField("appe_time")
private Date appeTime;
+ /**
+ * 瀹㈡埛淇℃伅
+ */
+ @ApiModelProperty(value= "瀹㈡埛淇℃伅")
+ private String manu;
+
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, String manu) {
this.locNo = locNo;
- this.matNo = matNo;
+ this.matnr = matnr;
+ this.batch = batch;
this.oriCtns = oriCtns;
this.oriQty = oriQty;
this.oriWt = oriWt;
@@ -135,11 +148,13 @@
this.modiTime = modiTime;
this.appeUser = appeUser;
this.appeTime = appeTime;
+ this.manu = manu;
}
-// 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