From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/entity/AdjDetl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index e6a3cc0..b1042a4 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -132,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) {
@@ -201,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