From 5a465d99e842d2d828fe58629d81034d7987e6cc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 07 七月 2023 10:16:35 +0800
Subject: [PATCH] 项目优化
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 11 +++++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 6 +++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 152a385..4df9222 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -7,6 +7,8 @@
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;
import lombok.Data;
@@ -260,4 +262,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 6a18aa7..af82405 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -801,7 +801,7 @@
waitPakinLog.setZpallet(waitPakin.getZpallet());
waitPakinLog.setAnfme(waitPakin.getAnfme());
waitPakinLog.setMatnr(waitPakin.getMatnr());
- waitPakinLog.setLocNo(waitPakin.getLocNo());
+ waitPakinLog.setLocNo(jsonLocNo);
waitPakinLog.setMaktx(waitPakin.getMaktx());
waitPakinLog.setOrderNo(waitPakin.getOrderNo());
waitPakinLog.setWeight(waitPakin.getWeight());
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 54fc129..274d542 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -3,7 +3,10 @@
var cols = [
];
cols.push.apply(cols, detlCols);
- cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+ cols.push(
+ {field: 'createBy$', align: 'center',title: '鎿嶄綔浜�', minWidth: 160, width: 160}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.status === 'Y'){html += " checked ";}
html += ">";
@@ -15,6 +18,7 @@
html += ">";
return html;
}}
+
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
return cols;
--
Gitblit v1.9.1