From 940cab832331ab054d2a4c74f13aacc6847dd79d Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 08:43:26 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp

---
 src/main/java/com/zy/asrs/entity/AdjDetl.java |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 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..471cbc0 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -38,15 +38,20 @@
     private String locNo;
 
     /**
-     * 鍟嗗搧缂栧彿
+     * 鐗╂枡鍙�
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value= "鐗╂枡鍙�")
     private String matnr;
+    /**
+     * 鐗╂枡鍚嶇О
+     */
+    @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+    private String maktx;
 
     /**
-     * 鎵瑰彿
+     * 搴忓垪鐮�
      */
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
     private String batch;
 
     /**
@@ -125,6 +130,21 @@
     @TableField("appe_time")
     private Date appeTime;
 
+    /*
+    璁㈠崟鍙�
+     */
+    private String orderNo;
+
+    /*
+    閿�鍞鍗曞彿
+     */
+    private String csocode;
+
+    /*
+    閿�鍞鍗曡鍙�
+     */
+    private String isoseq;
+
     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 +167,7 @@
     //    AdjDetl adjDetl = new AdjDetl(
 //            null,    // 搴撲綅鍙穂闈炵┖]
 //            null,    // 鐗╂枡缂栧彿[闈炵┖]
-//            null,    // 鎵瑰彿
+//            null,    // 搴忓垪鐮�
 //            null,    // 鍘熺鏁�
 //            null,    // 鍘熸暟閲�
 //            null,    // 鍘熼噸閲�

--
Gitblit v1.9.1