From e6793af95c83bbc085636ce61f54c5a21137f0bc Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 15:16:40 +0800
Subject: [PATCH] #客户信息

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java       |   11 +++++
 src/main/java/com/zy/asrs/entity/OrderDetl.java        |   11 +++++
 src/main/webapp/static/js/orderDetl/orderDetl.js       |    1 
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java     |   12 ++++++
 src/main/java/com/zy/asrs/entity/WaitPakin.java        |   12 ++++++
 src/main/webapp/static/js/waitPakin/waitPakin.js       |    1 
 src/main/java/com/zy/asrs/entity/LocDetl.java          |   11 +++++
 src/main/java/com/zy/asrs/entity/WrkDetl.java          |   11 +++++
 src/main/webapp/static/js/orderDetlLog/orderDetlLog.js |    1 
 src/main/java/com/zy/asrs/entity/OrderDetlLog.java     |   11 +++++
 src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js     |    1 
 src/main/webapp/static/js/common.js                    |    1 
 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js |    1 
 src/main/webapp/static/js/wrkDetl/wrkDetl.js           |    1 
 14 files changed, 86 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 8521370..a683bf5 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.asrs.service.MatService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
@@ -172,6 +173,16 @@
         return null;
     }
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getBeBatch$() {
         if (null == this.beBatch) {
             return null;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 313fe0f..f79f0b6 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.asrs.service.OrderDetlService;
 import com.zy.asrs.service.OrderService;
 import com.zy.common.utils.Synchro;
@@ -340,6 +341,16 @@
         this.memo = memo;
     }
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getOrderId$(){
         OrderService service = SpringUtils.getBean(OrderService.class);
         Order order = service.selectById(this.orderId);
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
index 0a3c169..de95acb 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
@@ -3,6 +3,7 @@
 import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.entity.Order;
 import com.baomidou.mybatisplus.annotations.TableField;
@@ -383,6 +384,16 @@
         return null;
     }
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index c540dac..78c37f5 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -177,6 +179,16 @@
         }
     }
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getSource$(){
         if (null == this.source){ return null; }
         switch (this.source){
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 55ef614..856347b 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -161,6 +163,16 @@
     @ApiModelProperty(value= "瀹㈡埛淇℃伅ID")
     private Long owner;
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index fd3390d..c6a5349 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -303,6 +304,16 @@
         }
     }
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getSource$(){
         if (null == this.source){ return null; }
         switch (this.source){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 42e20a7..93f1765 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -285,6 +286,16 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
     }
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
         switch (this.beBatch){
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index a05c91c..4bc6ce0 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -235,6 +235,7 @@
     ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true, hide: false}
     ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
     ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+    ,{field: 'owner', align: 'center',title: '瀹㈡埛淇℃伅ID', hide: true}
 
     ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
     ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index c86b5e2..3408511 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -44,6 +44,7 @@
             ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
             ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
+            ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
diff --git a/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js b/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
index 2bf9c5c..45e8475 100644
--- a/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
+++ b/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
@@ -62,6 +62,7 @@
             ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
             ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
+            ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 35600fd..03714fd 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -14,6 +14,7 @@
                 html += ">";
                 return html;
             }}
+        ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
         ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
         ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
     return cols;
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 018767f..ed21c26 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -15,6 +15,7 @@
                 html += ">";
                 return html;
             }}
+        ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
         ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
         ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
     return cols;
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index cf5dd90..f865d3d 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -6,6 +6,7 @@
     ];
     cols.push.apply(cols, detlCols);
     cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+        ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
         ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
     return cols;
 }
diff --git a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
index c4a776a..009ee55 100644
--- a/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js
@@ -6,6 +6,7 @@
     ];
     cols.push.apply(cols, detlCols);
     cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
+        ,{field: 'owner$', align: 'center',title: '淇℃伅', hide: false}
         ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
     )
     return cols;

--
Gitblit v1.9.1