From e5f601f1fadf108d5f57bb76da828939beea0aee Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期日, 29 一月 2023 13:55:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 2 ++
src/main/resources/mapper/ManLocDetlMapper.xml | 2 +-
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 3 ++-
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 9 +++++----
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 61e94e1..eccde44 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -55,7 +55,8 @@
param.remove("update_time");
}
}
- return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
+ Page<ManLocDetl> page = manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class));
+ return R.ok(page);
}
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index 62ab257..6557768 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -323,4 +323,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
+
+
}
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index 940e46c..ac19331 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -28,7 +28,7 @@
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
- <result column="update_time" property="modiTime" />
+ <result column="modi_time" property="modiTime" />
<result column="memo" property="memo" />
</resultMap>
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index ff281b0..86d2dfa 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -4,11 +4,13 @@
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false}
+
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true, hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
//,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -22,7 +24,6 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
--
Gitblit v1.9.1