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 |   58 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index b9b0f9b..0bf1c5d 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -25,7 +25,7 @@
     /**
      * 搴忓彿
      */
-    @ApiModelProperty(value= "搴忓彿")
+    @ApiModelProperty(value = "搴忓彿")
     @TableId(value = "adj_id", type = IdType.AUTO)
     @TableField("adj_id")
     private Long adjId;
@@ -33,99 +33,107 @@
     /**
      * 搴撲綅鍙�
      */
-    @ApiModelProperty(value= "搴撲綅鍙�")
+    @ApiModelProperty(value = "搴撲綅鍙�")
     @TableField("loc_no")
     private String locNo;
 
     /**
      * 鍟嗗搧缂栧彿
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+    @ApiModelProperty(value = "鍙樻洿鍟嗗搧缂栧彿")
     private String matnr;
 
     /**
-     * 搴忓垪鐮�
+     * 鍟嗗搧缂栧彿
      */
-    @ApiModelProperty(value= "搴忓垪鐮�")
+    @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 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;
@@ -162,34 +170,34 @@
 //    );
 
 
-    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 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 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 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);

--
Gitblit v1.9.1