From dcce60aa101cb97c5f06bfec5537cd7e86bd4768 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 19 六月 2024 13:19:29 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/rowLastno/rowLastno.js | 24 ++++++++++++++----------
src/main/java/com/zy/asrs/entity/RowLastno.java | 9 +++++++++
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index d4897ed..06d1e23 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -378,6 +379,14 @@
public Integer getTypeId() {
return typeId;
}
+ public String getTypeId$() {
+ RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
+ RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
+ if (!Cools.isEmpty(rowLastnoType)){
+ return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo();
+ }
+ return typeId.toString();
+ }
public void setTypeId(Integer typeId) {
this.typeId = typeId;
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index f26e048..7bd9ec6 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -21,16 +21,20 @@
// {type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// ,
- {field: 'whsType', align: 'center',title: '绫诲埆', width:80}
- ,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�'}
- ,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿'}
- ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿', style: 'color: #AA3130;font-weight: bold'}
- ,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿'}
- ,{field: 'sCrnNo', align: 'center',title: '璧峰鍫嗗灈鏈哄彿'}
- ,{field: 'eCrnNo', align: 'center',title: '缁堟鍫嗗灈鏈哄彿'}
- ,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�'}
- ,{field: 'staNoList', align: 'center',title: '绔欑偣闆嗗悎'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ {field: 'whsType', align: 'center',title: '绫诲埆', width:80, hide:true}
+ ,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�', hide:false}
+ ,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿', hide:true}
+ ,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿', style: 'color: #AA3130;font-weight: bold', hide:false}
+ ,{field: 'eRow', align: 'center',title: '缁堟鎺掑彿', hide:true}
+ ,{field: 'sCrnNo', align: 'center',title: '璧峰鍫嗗灈鏈哄彿', hide:true}
+ ,{field: 'eCrnNo', align: 'center',title: '缁堟鍫嗗灈鏈哄彿', hide:true}
+ ,{field: 'crnQty', align: 'center',title: '鍫嗗灈鏈烘暟閲�', hide:true}
+ ,{field: 'staNoList', align: 'center',title: '绔欑偣闆嗗悎', hide:false}
+ ,{field: 'typeId$', align: 'center',title: '搴撶被鍨�', hide:false}
+ ,{field: 'beSimilar', align: 'center',title: '鐩镐技鐗╂枡寮�鍏�', hide:true}
+ ,{field: 'pointSwitch', align: 'center',title: '鏄惁瀛樺湪鐐逛綅', hide:true}
+ ,{field: 'emptySimilar', align: 'center',title: '绌烘澘闈犺繎鎽嗘斁', hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide:false}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
--
Gitblit v1.9.1