From 1aeb972a3a0331a816e88153573db562d2d25897 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 19:32:55 +0800
Subject: [PATCH] *
---
src/main/webapp/static/js/locDetl/locDetl.js | 13 +++++++------
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 1 +
src/main/webapp/static/js/saas/locDetl.js | 1 +
src/main/webapp/static/js/common.js | 3 ++-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 95f3b9b..282662d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1121,7 +1121,7 @@
locDetl.setDanger(param.getDanger());
if (param.getDanger()==2){
String memo = Cools.isEmpty(locDetl.getMemo())? "" : locDetl.getMemo()+"锛�";
- locDetl.setMemo(memo+"璐ㄦ缁撴灉涓嶅悎鏍硷細"+param.getMemo());//涓嶅悎鏍间細缁欏娉紝闇�瑕佹妸澶囨敞缁欏埌鍖呰鍋氬睍绀�
+ locDetl.setMemo(memo + DateUtils.convert(new Date(), DateUtils.yyyyMMdd_C)+"璐ㄦ缁撴灉涓嶅悎鏍硷細" + param.getMemo());//涓嶅悎鏍间細缁欏娉紝闇�瑕佹妸澶囨敞缁欏埌鍖呰鍋氬睍绀�
}
locDetlService.update(locDetl,new EntityWrapper<LocDetl>()
.eq("loc_no", locDetl.getLocNo())
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 571eac8..c2f93d8 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -219,7 +219,7 @@
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
- ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
]
var detlCols = [
@@ -258,5 +258,6 @@
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
,{field: 'rollUp', align: 'center',title: '鍗蜂俊鎭�', hide: true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
]
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index d0ab093..a5c21d6 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -28,13 +28,14 @@
,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
- ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
- ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ // ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ // ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ // ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ // ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ // ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ // ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
];
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 6012422..5cfaef9 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -35,6 +35,7 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
];
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index e88414f..a3889f4 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -36,6 +36,7 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '寰呭垽', hide: false}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
];
--
Gitblit v1.9.1