From cfb29c53a447c2168db6ab832978a9d6104de2ff Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 10 十二月 2024 08:54:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wldlzasrs' into wldlzasrs
---
src/main/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/java/com/zy/asrs/entity/LocDetl.java | 12 ++++++------
src/main/java/com/zy/common/service/CommonService.java | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 1a68af5..10586f1 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -249,12 +249,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public long getStoreDate(){
- long timeNow = new Date().getTime();
- long timeCreate = this.appeTime.getTime();
-
- return (timeNow - timeCreate) /24/60/60/1000;
- }
+// public long getStoreDate(){
+// long timeNow = new Date().getTime();
+// long timeCreate = this.appeTime.getTime();
+//
+// return (timeNow - timeCreate) /24/60/60/1000;
+// }
public void sync(Object source) {
Synchro.Copy(source, this);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 311e1bb..9ede5c0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -373,13 +373,13 @@
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "F"));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
} else {
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "D"));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
}
}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 29cdbd9..ea6b089 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
+ // ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
--
Gitblit v1.9.1