From 786b5b76fee42107cef33892cbf7e3e8fab4f0e4 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml | 149 +++++++++++++++++++++++++++++--------------------
1 files changed, 87 insertions(+), 62 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
index 6a4c300..90c5e28 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
@@ -16,17 +16,17 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
<Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="planId">
<Property></Property>
<Property name="label">鎵�灞炶鍒�</Property>
<Property name="required">false</Property>
- <Property name="mapping">
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- <Property name="mapValues">${dorado.getDataProvider("planManagePR#listPlan").getResult()}</Property>
- </Property>
</PropertyDef>
<PropertyDef name="planName">
<Property></Property>
@@ -65,6 +65,15 @@
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
<Property name="keyProperty">name</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <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>
</PropertyDef>
@@ -176,65 +185,69 @@
</PropertyDef>
</DataType>
<DataType name="dtPlan">
- <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
+ <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
<PropertyDef name="id">
<Property></Property>
+ <Property name="label">璁″垝鏄庣粏鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="planId">
<Property name="label">璁″垝缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="referenceNumber">
- <Property name="label">璁″垝鏂囧彿</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
+ <PropertyDef name="foodVariety">
<Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="label">绮鍝佺</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property></Property>
- <Property name="label">璁″垝绫诲瀷</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="name">
+ <PropertyDef name="foodType">
<Property></Property>
- <Property name="label">璁″垝鍚嶇О</Property>
- <Property name="required">true</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>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <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>
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
- <Property name="label">骞翠唤</Property>
- <Property name="required">true</Property>
+ <Property name="label">鏀惰幏骞村害</Property>
</PropertyDef>
- <PropertyDef name="beginTime">
- <Property name="dataType">Date</Property>
- <Property name="label">寮�濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="endTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鎴鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="createUser">
+ <PropertyDef name="depotId">
<Property></Property>
- <Property name="label">鍒涘缓浜�</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>
</PropertyDef>
- <PropertyDef name="createTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍒涘缓鏃堕棿</Property>
+ <PropertyDef name="planNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璁″垝鏁伴噺</Property>
</PropertyDef>
- <PropertyDef name="remark">
+ <PropertyDef name="type">
+ <Property name="label">璁″垝绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
<Property></Property>
- <Property name="label">澶囨敞璇存槑</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtContract">
@@ -586,6 +599,11 @@
<Property name="name">customerName</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
+ </DataColumn>
<DataColumn name="foodVariety">
<Property name="property">foodVariety</Property>
<Property name="align">center</Property>
@@ -720,8 +738,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">planId</Property>
- <Property name="property">planId</Property>
+ <Property name="name">planName</Property>
+ <Property name="property">planName</Property>
<Property name="trigger">ddPlan</Property>
<Editor/>
</AutoFormElement>
@@ -756,6 +774,11 @@
<AutoFormElement>
<Property name="name">completeStatus</Property>
<Property name="property">completeStatus</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -874,19 +897,19 @@
</AjaxAction>
<CustomDropDown id="ddPlan">
<Property name="minHeight">317</Property>
- <Property name="assignmentMap">planId=id,planName=name</Property>
+ <Property name="assignmentMap">planId=id,planName=planId</Property>
<Property name="minWidth">550</Property>
<Property name="autoOpen">false</Property>
<Container layout="regionPadding:5">
<DataSet id="dsPlan">
- <Property name="dataProvider">planManagePR#pagePlan</Property>
+ <Property name="dataProvider">planManagePR#pagePlanDetail</Property>
<Property name="dataType">[dtPlan]</Property>
<Property name="parameter"></Property>
<Property name="pageSize">5</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
<TextEditor id="key2">
- <Property name="blankText"> -- 璁″垝鍚嶇О鎴栬�呰鍒掓枃鍙� --</Property>
+ <Property name="blankText"> -- 骞翠唤 --</Property>
<Property name="width">200</Property>
</TextEditor>
<Button>
@@ -912,33 +935,35 @@
<Property name="dataSet">dsPlan</Property>
<Property name="readOnly">true</Property>
<DataColumn>
- <Property name="property">id</Property>
+ <Property name="property">planId</Property>
<Property name="width">100</Property>
<Property name="align">center</Property>
- <Property name="name">id</Property>
+ <Property name="name">planId</Property>
<Property name="visible">false</Property>
</DataColumn>
- <DataColumn name="name">
+ <DataColumn name="depotId">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
+ <Property name="property">depotId</Property>
<Property name="align">center</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">referenceNumber</Property>
- <Property name="width">200</Property>
- <Property name="align">center</Property>
- <Property name="name">referenceNumber</Property>
</DataColumn>
<DataColumn>
<Property name="property">year</Property>
- <Property name="width">80</Property>
<Property name="align">center</Property>
<Property name="name">year</Property>
</DataColumn>
<DataColumn>
+ <Property name="property">planNum</Property>
+ <Property name="align">center</Property>
+ <Property name="name">planNum</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ <Property name="name">foodVariety</Property>
+ </DataColumn>
+ <DataColumn>
<Property name="property">type</Property>
- <Property name="width">80</Property>
<Property name="align">center</Property>
<Property name="name">type</Property>
</DataColumn>
--
Gitblit v1.9.3