From c9b385127ab65d0c71e0656eba31eb2748e3dbcd Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 24 十二月 2025 10:27:42 +0800
Subject: [PATCH] 调整仓库标字段
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java | 5 ++
fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml | 53 ++++----------------------
fzzy-igdss-view/src/main/java/models/core.model.xml | 11 +++++
3 files changed, 23 insertions(+), 46 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
index 2052502..7ce60e0 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Depot.java
@@ -123,4 +123,9 @@
@TableField("order_num")
private Integer orderNum = 1;
+ //璐ㄦ娂閾惰
+ @Column(name = "pledge_bank", columnDefinition = "varchar(40) COMMENT '璐ㄦ娂閾惰'")
+ @TableField("pledge_bank")
+ private String pledgeBank;
+
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
index 7d42514..bcb92bb 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
@@ -154,7 +154,8 @@
<Dialog id="depotdialog" layout="regionPadding:8">
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">浠撳簱淇℃伅</Property>
- <Property name="width">1200</Property>
+ <Property name="width">80%</Property>
+ <Property name="height">82%</Property>
<Property name="closeable">false</Property>
<Buttons>
<Button id="btnOK">
@@ -225,11 +226,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">depotStatus</Property>
<Property name="property">depotStatus</Property>
<Property name="trigger">autoMappingDropDown2</Property>
@@ -241,11 +237,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">storeKeeperName</Property>
<Property name="property">storeKeeperName</Property>
<Property name="trigger">triggerUserList</Property>
@@ -254,6 +245,11 @@
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">orderNum</Property>
<Property name="property">orderNum</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">pledgeBank</Property>
+ <Property name="property">pledgeBank</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -296,11 +292,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">foodType</Property>
- <Property name="property">foodType</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
<Editor/>
@@ -321,20 +312,6 @@
<Property name="property">storeDate</Property>
<Editor/>
</AutoFormElement>
- <Label>
- <Property name="text"></Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
- <Label layoutConstraint="colSpan:3">
- <Property name="text">璇存槑锛�1銆佸疄闄呭偍閲忚皟鏁磋浣跨敤鈥滃簱瀛樼鐞嗏�濆姛鑳斤紱</Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
</AutoForm>
</Children>
</FieldSet>
@@ -347,7 +324,7 @@
<Property name="readOnly">false</Property>
<Property name="labelSeparator"> : </Property>
<Property name="labelAlign">right</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="cols">*,*,*,*,*,*,*,*</Property>
<Property name="labelWidth">80</Property>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">perWet</Property>
@@ -369,20 +346,6 @@
<Property name="property">checkDate</Property>
<Editor/>
</AutoFormElement>
- <Label>
- <Property name="text"></Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
- <Label layoutConstraint="colSpan:3">
- <Property name="text">璇存槑锛氬偍澶囩伯璐ㄦ淇℃伅浼氭牴鎹川閲忕鐞� 鑷姩鍚屾鏇存柊</Property>
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">50px</Property>
- </Property>
- </Label>
</AutoForm>
</Children>
</FieldSet>
diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 19ae333..69a5b44 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -194,7 +194,7 @@
<Property name="keyProperty">id</Property>
<Property name="valueProperty">kqmc</Property>
</Property>
- <Property name="readOnly">true</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
@@ -229,6 +229,15 @@
<Property name="valueProperty">dictLabel</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="pledgeBank">
+ <Property></Property>
+ <Property name="label">鐩戠閾惰</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("bankPR#listAll").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="storageMax">
<Property name="dataType">Double</Property>
<Property name="label">璁捐鍌ㄩ噺</Property>
--
Gitblit v1.9.3