From 564295458c720206db9b5194b90481b711f4b010 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 11 十月 2023 12:09:22 +0800
Subject: [PATCH] 更改配置及筒仓偏移量
---
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml | 302 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 237 insertions(+), 65 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
index 65db267..5050afa 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
@@ -6,228 +6,384 @@
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
<PropertyDef name="xzbm">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="companyId">
- <Property/>
+ <Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
<Property name="dataType">Date</Property>
<Property name="label">濉姤鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="dwdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍗曚綅浠ｇ爜</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="sqxzrq">
<Property name="dataType">Date</Property>
<Property name="label">鐢宠鐔忚捀鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzr">
- <Property/>
+ <Property></Property>
<Property name="label">璐熻矗浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="fzrdh">
- <Property/>
+ <Property></Property>
<Property name="label">璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="xcfzr">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xcfzrzw">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xcfzrdh">
- <Property/>
+ <Property></Property>
<Property name="label">鐜板満璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="tbr">
- <Property/>
+ <Property></Property>
<Property name="label">濉〃浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="tbrdh">
- <Property/>
+ <Property></Property>
<Property name="label">濉〃浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="sfszjjxd">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxx">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxn">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sfszjjxb">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ssxzzystqybqk">
- <Property/>
+ <Property></Property>
<Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
</PropertyDef>
<PropertyDef name="xzssgcap">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="aqfhjyjcccs">
- <Property/>
+ <Property></Property>
<Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
</PropertyDef>
<PropertyDef name="xzzysx">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
</PropertyDef>
<PropertyDef name="fileStorageId">
- <Property/>
+ <Property></Property>
<Property name="label">鏂囦欢瀛樺偍ID</Property>
</PropertyDef>
<PropertyDef name="drugName">
- <Property/>
+ <Property></Property>
<Property name="label">鑽墏鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="drugType">
- <Property/>
+ <Property></Property>
<Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="yjyxqz">
<Property name="dataType">Date</Property>
<Property name="label">鑽墏鏈夋晥鏈熻嚦</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqsl">
<Property name="dataType">Double</Property>
<Property name="label">棰嗗彇鏁伴噺</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sysbjfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zcdd">
- <Property/>
+ <Property></Property>
<Property name="label">鏆傚瓨鍦扮偣</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqr">
- <Property/>
+ <Property></Property>
<Property name="label">棰嗗彇浜�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lqsj">
<Property name="dataType">Date</Property>
- <Property name="label">棰嗗彇鏃堕棿鏃堕棿</Property>
+ <Property name="label">棰嗗彇鏃堕棿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
- <Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
+ <Property></Property>
+ <Property name="label">浠撴埧/娌圭綈</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodType">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="foodLevel">
- <Property/>
+ <Property></Property>
<Property name="label">绮绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="number">
<Property name="dataType">Double</Property>
<Property name="label">绮鏁伴噺</Property>
+ <Property name="displayFormat">#0.000鍚�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="perWet">
<Property name="dataType">Double</Property>
<Property name="label">姘村垎</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="perImpurity">
<Property name="dataType">Double</Property>
<Property name="label">鏉傝川</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lw">
<Property name="dataType">Double</Property>
<Property name="label">绮俯</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="cw">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撴俯</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cnsd">
<Property name="dataType">Double</Property>
<Property name="label">浠撳唴婀垮害</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="clfs">
- <Property/>
+ <Property></Property>
<Property name="label">瀛樼伯鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1锛氭暎瑁呭偍绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2锛氬寘瑁�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3锛氬洿鍖呮暎瀛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9锛氬叾浠�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rkrq">
<Property name="dataType">Date</Property>
<Property name="label">鍏ュ簱鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="hc">
- <Property/>
+ <Property></Property>
<Property name="label">瀹宠櫕</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
- <Property/>
+ <Property></Property>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">531</Property>
+ <Property name="value">鍩烘湰鏃犺櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">532</Property>
+ <Property name="value">涓�鑸櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">533</Property>
+ <Property name="value">涓ラ噸铏伯</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">534</Property>
+ <Property name="value">涓ラ噸铏伯</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ldtj">
<Property name="dataType">Double</Property>
<Property name="label">绮爢浣撶Н</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="kjtj">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿浣撶Н</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lddwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="kjdwyyl">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zyyl">
<Property name="dataType">Double</Property>
<Property name="label">鎬荤敤鑽噺</Property>
+ <Property name="displayFormat">#0.000g</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="qmx">
- <Property/>
+ <Property></Property>
<Property name="label">姘斿瘑鎬�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1:鈪犵骇锛宼鈮�300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2:鈪＄骇锛�20s鈮<300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3:鈪㈢骇锛�40s鈮<120s (骞虫埧浠�) ; 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxzjsrq">
<Property name="dataType">Date</Property>
<Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xznd">
<Property name="dataType">Double</Property>
<Property name="label">璁惧畾鐔忚捀娴撳害</Property>
+ <Property name="displayFormat">#0.000ml/m鲁</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="mbsj">
<Property name="dataType">Integer</Property>
<Property name="label">瀵嗛棴鏃堕棿</Property>
+ <Property name="displayFormat">#0澶�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xzfs">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀鏂瑰紡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sqfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏁ｆ皵鏂瑰紡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<Reference name="drugLogPeople">
<Property name="dataType">[dtPeople]</Property>
@@ -235,28 +391,34 @@
<Property name="parameter">
<Entity>
<Property name="xzbm">$${this.xzbm}</Property>
- <Property name="deptId">$${this.deptId}</Property>
- <Property name="tbrq">$${this.tbrq}</Property>
</Entity>
</Property>
</Reference>
+ <PropertyDef name="dtlId">
+ <Property/>
+ <Property name="label">dtlId</Property>
+ </PropertyDef>
+ <PropertyDef name="wayId">
+ <Property/>
+ <Property name="label">wayId</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtPeople">
<Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
<PropertyDef name="propleId">
- <Property/>
+ <Property></Property>
<Property name="label">propleId</Property>
</PropertyDef>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -264,27 +426,27 @@
<Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="mx">
- <Property/>
+ <Property></Property>
<Property name="label">濮撳悕</Property>
</PropertyDef>
<PropertyDef name="zw">
- <Property/>
+ <Property></Property>
<Property name="label">鑱屽姟</Property>
</PropertyDef>
<PropertyDef name="zyzg">
- <Property/>
+ <Property></Property>
<Property name="label">鑱屼笟璧勬牸</Property>
</PropertyDef>
<PropertyDef name="stzk">
- <Property/>
+ <Property></Property>
<Property name="label">韬綋鐘跺喌</Property>
</PropertyDef>
<PropertyDef name="xzrwfg">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
</PropertyDef>
<PropertyDef name="sfwb">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁澶栧寘</Property>
</PropertyDef>
</DataType>
@@ -310,15 +472,15 @@
<DataType name="dtDtl">
<Property name="creationType">com.ld.igds.models.DrugLogDtl</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -326,19 +488,19 @@
<Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="depotId">
- <Property/>
+ <Property></Property>
<Property name="label">浠撴埧/娌圭綈浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
- <Property/>
+ <Property></Property>
<Property name="label">绮鍝佺</Property>
</PropertyDef>
<PropertyDef name="foodType">
- <Property/>
+ <Property></Property>
<Property name="label">绮鎬ц川</Property>
</PropertyDef>
<PropertyDef name="foodLevel">
- <Property/>
+ <Property></Property>
<Property name="label">绮绛夌骇</Property>
</PropertyDef>
<PropertyDef name="number">
@@ -366,7 +528,7 @@
<Property name="label">浠撳唴婀垮害</Property>
</PropertyDef>
<PropertyDef name="clfs">
- <Property/>
+ <Property></Property>
<Property name="label">瀛樼伯鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="rkrq">
@@ -374,11 +536,11 @@
<Property name="label">鍏ュ簱鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="hc">
- <Property/>
+ <Property></Property>
<Property name="label">瀹宠櫕</Property>
</PropertyDef>
<PropertyDef name="cldjpd">
- <Property/>
+ <Property></Property>
<Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
</PropertyDef>
<PropertyDef name="ldtj">
@@ -402,7 +564,7 @@
<Property name="label">鎬荤敤鑽噺</Property>
</PropertyDef>
<PropertyDef name="qmx">
- <Property/>
+ <Property></Property>
<Property name="label">姘斿瘑鎬�</Property>
</PropertyDef>
<PropertyDef name="jhxzksrq">
@@ -417,15 +579,15 @@
<DataType name="dtWay">
<Property name="creationType">com.ld.igds.models.DrugLogWay</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">id</Property>
</PropertyDef>
<PropertyDef name="drugLogId">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀澶囨缂栧彿</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
@@ -441,11 +603,11 @@
<Property name="label">瀵嗛棴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xzfs">
- <Property/>
+ <Property></Property>
<Property name="label">鐔忚捀鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="sqfs">
- <Property/>
+ <Property></Property>
<Property name="label">鏁ｆ皵鏂瑰紡</Property>
</PropertyDef>
</DataType>
@@ -763,6 +925,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">lqsj</Property>
+ <Property name="property">lqsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">updateTime</Property>
<Property name="property">updateTime</Property>
<Editor/>
@@ -845,6 +1012,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">cw</Property>
+ <Property name="property">cw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">cnsd</Property>
<Property name="property">cnsd</Property>
<Editor/>
--
Gitblit v1.9.3