From 058770cc7f646ed387757fdde6e45d2f92ea01c4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 31 五月 2023 10:06:37 +0800
Subject: [PATCH] 2023.5.31上架区域版本兼容代码。判断当前库位组是否均为同一种物料,如不是,则认定需要执行兼容代码

---
 src/main/java/com/zy/asrs/entity/AdjDetl.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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..7300d18 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -44,9 +44,9 @@
     private String matnr;
 
     /**
-     * 鎵瑰彿
+     * 搴忓垪鐮�
      */
-    @ApiModelProperty(value= "鎵瑰彿")
+    @ApiModelProperty(value= "搴忓垪鐮�")
     private String batch;
 
     /**
@@ -125,9 +125,15 @@
     @TableField("appe_time")
     private Date appeTime;
 
+    /**
+     * 瀹㈡埛淇℃伅
+     */
+    @ApiModelProperty(value= "瀹㈡埛淇℃伅")
+    private String manu;
+
     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) {
+    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.matnr = matnr;
         this.batch = batch;
@@ -142,12 +148,13 @@
         this.modiTime = modiTime;
         this.appeUser = appeUser;
         this.appeTime = appeTime;
+        this.manu = manu;
     }
 
     //    AdjDetl adjDetl = new AdjDetl(
 //            null,    // 搴撲綅鍙穂闈炵┖]
 //            null,    // 鐗╂枡缂栧彿[闈炵┖]
-//            null,    // 鎵瑰彿
+//            null,    // 搴忓垪鐮�
 //            null,    // 鍘熺鏁�
 //            null,    // 鍘熸暟閲�
 //            null,    // 鍘熼噸閲�

--
Gitblit v1.9.1