From b81562a3357a4ef33bcab2f02ebb4a84330f6511 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 16:27:10 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/AdjDetl.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index 67bccb3..b1042a4 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -40,8 +40,15 @@
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍙樻洿鍟嗗搧缂栧彿")
private String matnr;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @TableField("matnr_old")
+ private String matnrOld;
/**
* 鎵瑰彿
@@ -125,6 +132,21 @@
@TableField("appe_time")
private Date appeTime;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 鎵╁厖
+ * "outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};
+ */
+ @ApiModelProperty(value= "鎵╁厖")
+ @TableField("expand")
+ private String expand;
+
public AdjDetl() {}
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) {
@@ -147,7 +169,7 @@
// AdjDetl adjDetl = new AdjDetl(
// null, // 搴撲綅鍙穂闈炵┖]
// null, // 鐗╂枡缂栧彿[闈炵┖]
-// null, // 鎵瑰彿
+// null, // 搴忓垪鐮�
// null, // 鍘熺鏁�
// null, // 鍘熸暟閲�
// null, // 鍘熼噸閲�
@@ -194,5 +216,40 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ //"outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};
+ public String setExpand(LocDetl locDetl){
+ if (Cools.isEmpty(locDetl.getOutOrderNo())){
+ this.expand = " "+"_";
+ }else {
+ this.expand = locDetl.getOutOrderNo()+"_";
+ }
+ if (Cools.isEmpty(locDetl.getLuHao())){
+ this.expand = this.expand+" "+"_";
+ }else {
+ this.expand = this.expand+locDetl.getLuHao()+"_";
+ }
+ if (Cools.isEmpty(locDetl.getPacking())){
+ this.expand = this.expand+" "+"_";
+ }else {
+ this.expand = this.expand+locDetl.getPacking()+"_";
+ }
+ if (Cools.isEmpty(locDetl.getSPgNO())){
+ this.expand = this.expand+" "+"_";
+ }else {
+ this.expand = this.expand+locDetl.getSPgNO()+"_";
+ }
+ if (Cools.isEmpty(locDetl.getProType())){
+ this.expand = this.expand+" "+"_";
+ }else {
+ this.expand = this.expand+locDetl.getProType()+"_";
+ }
+ if (Cools.isEmpty(locDetl.getColor())){
+ this.expand = this.expand+" "+"_";
+ }else {
+ this.expand = this.expand+locDetl.getColor()+"_";
+ }
+
+ return this.expand;
+ }
}
--
Gitblit v1.9.1