From 3e7773504d6bd15e6ed20ecf5c6236b163ba0fe8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 21 十月 2023 15:29:35 +0800
Subject: [PATCH] 优化数量检测页面仓库信息不显示问题
---
igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java | 21 +++++++++------------
igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml | 28 ++++++++++++++++++++++++++++
igds-web/src/main/resources/static/admin/quantity/quantity.js | 2 +-
3 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java b/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
index 1bcc8d0..5fa3cfc 100644
--- a/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
+++ b/igds-quantity/src/main/java/com/ld/igds/io/ServerRunner.java
@@ -1,13 +1,11 @@
package com.ld.igds.io;
-
import com.ld.igds.data.ConfigData;
import com.ld.igds.io.fzzy.server.BhznQuantityServerEngine;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-
/**
* 鍙互鏍规嵁閰嶇疆鏂囦欢鐏垫椿璋冩暣
@@ -27,15 +25,14 @@
@Override
public void run(String... strings) throws Exception {
-// if (configData.getActive().equals("dev")) {
-// serverEngine.start(BhznQuantityServerEngine.PORT);
-// return;
-// }
-//
-// //椋庢鑷磋繙榛樿閮ㄧ讲鏈嶅姟褰撳墠搴旂敤浣跨敤9000绔彛
-// if (configData.getActive().indexOf("pro") >= 0) {
-// serverEngine.start(BhznQuantityServerEngine.PORT);
-// return;
-// }
+ if (configData.getActive().equals("dev")) {
+ serverEngine.start(BhznQuantityServerEngine.PORT);
+ return;
+ }
+
+ if (configData.getActive().indexOf("pro") >= 0) {
+ serverEngine.start(BhznQuantityServerEngine.PORT);
+ return;
+ }
}
}
diff --git a/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml b/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml
index a7fd236..ffb804a 100644
--- a/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml
+++ b/igds-verb/src/main/java/com/ld/igds/verb/view/AreationData.view.xml
@@ -35,6 +35,34 @@
<PropertyDef name="objective">
<Property></Property>
<Property name="label">閫氶鐩殑</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">闄嶆俯閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">闄嶆按閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">澶勭悊鍙戠儹绮�氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">鍧囪 绮俯閫氶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">鍏朵粬鐩殑閫氶</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
diff --git a/igds-web/src/main/resources/static/admin/quantity/quantity.js b/igds-web/src/main/resources/static/admin/quantity/quantity.js
index 69b7218..6d13c42 100644
--- a/igds-web/src/main/resources/static/admin/quantity/quantity.js
+++ b/igds-web/src/main/resources/static/admin/quantity/quantity.js
@@ -205,7 +205,7 @@
// 閰嶇疆浠撳簱鍗＄墖淇℃伅
var depotData = quantityData.depotData;
$("#depotTypeName").text(depotData.depotTypeName);
- $("#storeKeeperName").text(depotData.storeKeeperName == null ? "淇濈鍛�":item.storeKeeperName);
+ $("#storeKeeperName").text(depotData.storeKeeperName == null ? "淇濈鍛�":depotData.storeKeeperName);
$("#storageReal").text(depotData.storageReal);
$("#foodVarietyName").text(depotData.foodVarietyName);
$("#foodLevelName").text(depotData.foodLevelName);
--
Gitblit v1.9.3