From bdc3fdfe30373edbb29c778b856794d2c0fead45 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 02 八月 2023 16:02:16 +0800
Subject: [PATCH] 问题修改
---
igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml | 30 ++++++++++-----
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml | 27 ++++++-------
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml | 11 ++++-
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java | 2
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml | 8 +---
5 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
index fa84e4b..ceb8ba6 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/LossOver.view.xml
@@ -73,18 +73,23 @@
<PropertyDef name="rkjz">
<Property name="dataType">double</Property>
<Property name="label">鍏ュ簱鍑�閲�</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000KG</Property>
</PropertyDef>
<PropertyDef name="rksj">
<Property name="dataType">Date</Property>
<Property name="label">鍏ュ簱鏃堕棿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rksf">
<Property name="dataType">double</Property>
- <Property name="label">鍏ュ簱姘村垎(%)</Property>
+ <Property name="label">鍏ュ簱姘村垎</Property>
+ <Property name="displayFormat">#0.000%</Property>
</PropertyDef>
<PropertyDef name="rkzz">
<Property name="dataType">double</Property>
- <Property name="label">鍏ュ簱鏉傝川(%)</Property>
+ <Property name="label">鍏ュ簱鏉傝川</Property>
+ <Property name="displayFormat">#0.000%</Property>
</PropertyDef>
<PropertyDef name="cksj">
<Property name="dataType">Date</Property>
@@ -93,14 +98,17 @@
<PropertyDef name="ckjz">
<Property name="dataType">double</Property>
<Property name="label">鍑哄簱鍑�閲�</Property>
+ <Property name="displayFormat">#0.000KG</Property>
</PropertyDef>
<PropertyDef name="cksf">
<Property name="dataType">double</Property>
- <Property name="label">鍑哄簱姘村垎(%)</Property>
+ <Property name="label">鍑哄簱姘村垎</Property>
+ <Property name="displayFormat">#0.000%</Property>
</PropertyDef>
<PropertyDef name="ckzz">
<Property name="dataType">double</Property>
- <Property name="label">鍑哄簱鏉傝川(%)</Property>
+ <Property name="label">鍑哄簱鏉傝川</Property>
+ <Property name="displayFormat">#0.000%</Property>
</PropertyDef>
<PropertyDef name="sysfzc">
<Property></Property>
@@ -110,10 +118,12 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="syyy">
<Property></Property>
<Property name="label">鎹熸孩鍘熷洜</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ccshr">
<Property></Property>
@@ -507,7 +517,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">ccshr</Property>
<Property name="property">ccshr</Property>
@@ -535,7 +545,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">zjshr</Property>
<Property name="property">zjshr</Property>
@@ -561,7 +571,7 @@
<AutoForm>
<Property name="cols">*,*</Property>
<Property name="dataSet">dsMain</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">right</Property>
<AutoFormElement>
@@ -591,7 +601,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">kjshr</Property>
<Property name="property">kjshr</Property>
@@ -619,7 +629,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">140</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">ldshr</Property>
<Property name="property">ldshr</Property>
@@ -649,7 +659,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index 2f486da..d01cc51 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -49,6 +49,7 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="depotIdIn">
<Property></Property>
@@ -79,6 +80,7 @@
<Property name="dataType">Double</Property>
<Property name="label">鍊掍粨鏁伴噺</Property>
<Property name="displayFormat">#,##0.00 KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
@@ -363,12 +365,6 @@
<AutoFormElement>
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
index da8e0ab..55e88e2 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -41,8 +41,8 @@
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
- <Property name="label">鍙樻洿鍓嶅搧绉�</Property>
- <Property name="required">false</Property>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
<Property name="keyProperty">code</Property>
@@ -52,7 +52,7 @@
<PropertyDef name="foodType">
<Property></Property>
<Property name="label">鍙樻洿鍓嶆�ц川</Property>
- <Property name="required">false</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
<Property name="keyProperty">code</Property>
@@ -62,7 +62,7 @@
<PropertyDef name="newFoodType">
<Property></Property>
<Property name="label">鍙樻洿鍚庢�ц川</Property>
- <Property name="required">false</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
<Property name="keyProperty">code</Property>
@@ -74,12 +74,14 @@
<Property name="label">绮鏁伴噺</Property>
<Property name="dataType">Double</Property>
<Property name="displayFormat">#,##0.00 KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="changeNumber">
<Property></Property>
<Property name="label">鍒掕浆鏁伴噺</Property>
<Property name="dataType">Double</Property>
<Property name="displayFormat">#,##0.00 KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="changeTime">
<Property name="dataType">Date</Property>
@@ -440,11 +442,6 @@
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
@@ -461,7 +458,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">ccshr</Property>
<Property name="property">ccshr</Property>
@@ -489,7 +486,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">zjshr</Property>
<Property name="property">zjshr</Property>
@@ -515,7 +512,7 @@
<AutoForm>
<Property name="cols">*,*</Property>
<Property name="dataSet">dsMain</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<Property name="labelSeparator">:</Property>
<Property name="labelAlign">right</Property>
<AutoFormElement>
@@ -545,7 +542,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">kjshr</Property>
<Property name="property">kjshr</Property>
@@ -573,7 +570,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">140</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">ldshr</Property>
<Property name="property">ldshr</Property>
@@ -603,7 +600,7 @@
<Property name="dataSet">dsMain</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">:</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">100</Property>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
index e61c1c3..8c8e321 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
@@ -133,7 +133,7 @@
<Property name="label">绮爢浣跨敤鍓傞噺</Property>
<Property name="displayFormat">##0.000g/m鲁</Property>
</PropertyDef>
- <PropertyDef name="SpaceDose">
+ <PropertyDef name="spaceDose">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿浣跨敤鍓傞噺</Property>
<Property name="displayFormat">##0.000g/m鲁</Property>
@@ -530,6 +530,11 @@
<Property name="property">end</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn>
+ <Property name="property">drugName</Property>
+ <Property name="align">center</Property>
+ <Property name="name">drugName</Property>
+ </DataColumn>
<DataColumn name="user">
<Property name="property">user</Property>
<Property name="align">center</Property>
@@ -693,8 +698,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">SpaceDose</Property>
- <Property name="property">SpaceDose</Property>
+ <Property name="name">spaceDose</Property>
+ <Property name="property">spaceDose</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
index 8935bb3..63f37bf 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
@@ -113,7 +113,7 @@
@Column(name = "SPACE_DOSE_")
@PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�", description = "g/m鲁")
- private Double SpaceDose = 0.0;
+ private Double spaceDose = 0.0;
@Column(name = "DOSE_")
@PropertyDef(label = "鎬荤敤鑽噺", description = "kg")
--
Gitblit v1.9.3