From 40d710de7ef349e9f2e034c362633c641eef6157 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 08 四月 2022 09:53:12 +0800
Subject: [PATCH] .
---
src/main/webapp/static/js/itemManager/itemManager.js | 2 +-
src/main/java/zy/cloud/wms/manager/entity/Item.java | 19 ++++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/Item.java b/src/main/java/zy/cloud/wms/manager/entity/Item.java
index a448111..38a2ed1 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/Item.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/Item.java
@@ -400,16 +400,17 @@
// null // 澶囨敞
// );
- public String getProgressRate$(){
- ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
- ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
- .eq("id", this.progressRate));
- if (!Cools.isEmpty(id)) {
- return id.getStatusName();
- }
+// public String getProgressRate$(){
+// ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
+// ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>()
+// .eq("id", this.progressRate));
+// if (!Cools.isEmpty(id)) {
+// return id.getStatusName();
+// }
+//
+// return "";
+// }
- return "";
- }
public String getProjectStatus$(){
ProjectStatusService bean = SpringUtils.getBean(ProjectStatusService.class);
ProjectStatus id = bean.selectOne(new EntityWrapper<ProjectStatus>().eq("id", this.projectStatus));
diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js
index dcb41b3..e033165 100644
--- a/src/main/webapp/static/js/itemManager/itemManager.js
+++ b/src/main/webapp/static/js/itemManager/itemManager.js
@@ -28,7 +28,7 @@
,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О', width: 130}
,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'progressRate$', align: 'center',title: '杩涘害'}
+ ,{field: 'projectStatus$', align: 'center',title: '杩涘害'}
,{field: 'planCarInfo', align: 'center', title: '棰勮杞﹁締澶у皬', width: 115}
,{field: 'planCarnumber', align: 'center', title: '棰勮杞﹁締鏁伴噺', width: 115}
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
--
Gitblit v1.9.1