From b667644b1a9f93583b4bb2d508c570c65aa3497b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 27 五月 2023 19:01:47 +0800
Subject: [PATCH] 调整模块货位和库存
---
igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml | 115 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 35 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
index e5fab96..a32b34c 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotStore.view.xml
@@ -13,12 +13,8 @@
<DataSet id="dsMain">
<Property name="pageSize">20</Property>
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">depotStorePR#pageListDepotStore</Property>
+ <Property name="dataProvider">depotStorePR#pageList</Property>
<Property name="loadMode">lazy</Property>
- </DataSet>
- <DataSet id="dsDepot">
- <Property name="dataType">[dtDepot]</Property>
- <Property name="dataProvider">depotPR#getAllCache</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -78,11 +74,6 @@
<Property name="align">center</Property>
<Property name="name">depotId</Property>
</DataColumn>
- <DataColumn>
- <Property name="property">storeType</Property>
- <Property name="align">center</Property>
- <Property name="name">storeType</Property>
- </DataColumn>
<DataColumn name="depotStatus">
<Property name="property">depotStatus</Property>
<Property name="align">center</Property>
@@ -107,26 +98,25 @@
<Property name="property">foodYear</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="storeDate">
- <Property name="property">storeDate</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="storageReal">
<Property name="property">storageReal</Property>
<Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="storageSettle">
+ <Property name="property">storageSettle</Property>
</DataColumn>
<DataColumn name="updateDate">
<Property name="property">updateDate</Property>
<Property name="align">center</Property>
</DataColumn>
</DataGrid>
- </Container>
- <Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </ToolBar>
</Container>
<Dialog id="dialogMain">
<Property name="caption">搴撳瓨淇℃伅</Property>
@@ -165,7 +155,7 @@
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
- <Property name="trigger">dsddDepot</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -177,6 +167,7 @@
<AutoFormElement>
<Property name="name">storeType</Property>
<Property name="property">storeType</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -192,27 +183,74 @@
<AutoFormElement>
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
+ <Property name="trigger">autoMappingDropDown1</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="name">manageType</Property>
+ <Property name="property">manageType</Property>
<Editor/>
</AutoFormElement>
+ <Label>
+ <Property name="style">
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
+ </Property>
+ </Label>
<AutoFormElement>
<Property name="name">foodYear</Property>
<Property name="property">foodYear</Property>
<Property name="trigger">yearDropDown1</Property>
<Editor/>
</AutoFormElement>
+ <Label>
+ <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+ <Property name="style">
+ <Property name="color">red</Property>
+ <Property name="font-size">12px</Property>
+ </Property>
+ </Label>
+ <AutoFormElement>
+ <Property name="name">country</Property>
+ <Property name="property">country</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
+ <AutoFormElement>
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
<AutoFormElement>
<Property name="name">storageReal</Property>
<Property name="property">storageReal</Property>
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璇存槑锛氫粨搴撶姸鎬�=婊′粨锛岀┖浠� 鍒囪褰曞叆搴撳瓨璁板綍</Property>
+ <Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱鏁伴噺涔嬪拰</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
+ <AutoFormElement>
+ <Property name="name">storageSettle</Property>
+ <Property name="property">storageSettle</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="text">蹇呭～锛岀┖浠�=0锛屽叆搴�/鍑哄簱缁撶畻鏁伴噺涔嬪拰</Property>
<Property name="style">
<Property name="color">blue</Property>
</Property>
@@ -223,7 +261,7 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璇存槑锛氫粨搴撶姸鎬�=婊′粨锛屽繀濉�</Property>
+ <Property name="text">璐т綅鐘舵��=绌轰粨/鍑哄簱涓紝蹇呭～</Property>
<Property name="style">
<Property name="color">blue</Property>
</Property>
@@ -234,7 +272,7 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璇存槑锛氱涓�杞﹀叆搴撴椂闂达紝浠撳簱鐘舵��=鍏ュ簱涓紝蹇呭～</Property>
+ <Property name="text">璐т綅鐘舵��=绌轰粨/鍏ュ簱涓�/鍑哄簱涓紝蹇呭～銆傜涓�杞﹀叆浠撴椂闂�</Property>
<Property name="style">
<Property name="color">blue</Property>
</Property>
@@ -245,7 +283,7 @@
<Editor/>
</AutoFormElement>
<Label>
- <Property name="text">璇存槑锛氱涓�杞﹀嚭搴撴椂闂达紝浠撳簱鐘舵��=鍑哄簱涓紝蹇呭～</Property>
+ <Property name="text">璐т綅鐘舵��=绌轰粨锛屽繀濉�傛渶鍚庝竴杞︾伯椋熷嚭浠撴椂闂�</Property>
<Property name="style">
<Property name="color">blue</Property>
</Property>
@@ -255,11 +293,23 @@
<Property name="property">grainHeight</Property>
<Editor/>
</AutoFormElement>
+ <Label>
+ <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
<AutoFormElement>
<Property name="name">grainVolume</Property>
<Property name="property">grainVolume</Property>
<Editor/>
</AutoFormElement>
+ <Label>
+ <Property name="text">璐т綅鐘舵��=婊′粨锛屽彲濉�</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
@@ -285,7 +335,7 @@
<YearDropDown id="yearDropDown1"/>
<CustomDropDown id="ddFoodOrigin">
<Property name="minHeight">500</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
+ <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
<Property name="minWidth">500</Property>
<Container layout="regionPadding:5">
<DataSet id="dsFoodOrigin">
@@ -355,10 +405,5 @@
<Property name="titleName">{"unit":"KG","title":"浠撳簱淇℃伅鍒楄〃","timeDesc":"now()"}</Property>
<Property name="showTitle">true</Property>
</Export2ReportAction>
- <DataSetDropDown id="dsddDepot">
- <Property name="dataSet">dsDepot</Property>
- <Property name="assignmentMap">depotId=id,depotStatus=depotStatus,storeType=storeType,foodType=foodType,foodVariety=foodVariety,foodLevel=foodLevel,foodLocation=foodLocation,depotStatus=depotStatus,foodYear=foodYear,storeDate=storeDate</Property>
- <Property name="property">name</Property>
- </DataSetDropDown>
</View>
</ViewConfig>
--
Gitblit v1.9.3