From 27ab62f7d980e13e3fe5cd3ac5a979c7d5fc92b7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 15 一月 2026 11:04:42 +0800
Subject: [PATCH] 库区，仓库联动查询修改
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml | 32 ++++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml | 38 ++++++++++++++++++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java | 5 ++
fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeIn.view.xml | 32 ++++++++++++++++
fzzy-igdss-view/src/main/java/models/core.model.xml | 7 +++
5 files changed, 110 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
index 6bff250..a69121e 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml
@@ -72,7 +72,7 @@
<Property></Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">kqmc</Property>
</Property>
@@ -117,6 +117,12 @@
<Property name="dataType">dataTypeC</Property>
<Property name="dataProvider">quantityDataPR#getQuery</Property>
</DataSet>
+ <DataSet id="dsDepotList">
+ <Property name="dataProvider">depotPR#getData</Property>
+ <Property name="userData">浠撳簱涓嬫媺鍒楄〃</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDepot]</Property>
+ </DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm>
@@ -134,7 +140,7 @@
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
+ <Property name="trigger">dsDepotDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -268,5 +274,33 @@
</DataPilot>
</ToolBar>
</Container>
+ <DataSetDropDown id="dsDepotDropDown">
+ <ClientEvent name="onOpen">
+ var entity = view.get("#dataSetC.data:#");
+ console.log(entity);
+ if(!entity){
+ $alert("璇峰厛閫夋嫨鎵�灞炲簱鍖�");
+ }else{
+ var deptId = entity.get("deptId");
+ console.log(deptId);
+
+ if(!deptId){
+ $alert("璇峰厛閫夋嫨鎵�灞炲簱鍖�");
+ }else{
+ view.get("#dsDepotList").set("parameter",entity.get("deptId")).flushAsync();
+ }
+ }</ClientEvent>
+ <Property name="dataSet">dsDepotList</Property>
+ <Property name="height">450</Property>
+ <Property name="autoOpen">true</Property>
+ <Property name="assignmentMap">depotId=id</Property>
+ <Property name="width">400</Property>
+ <DataColumn>
+ <Property name="align">center</Property>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </DataColumn>
+ </DataSetDropDown>
</View>
</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
index fbb7711..7d2a164 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityDataPR.java
@@ -2,6 +2,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.data.provider.Page;
+import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.QuantityParam;
import com.fzzy.igds.domain.Quantity;
import com.fzzy.igds.service.QuantityService;
@@ -43,7 +44,9 @@
result.setTitle("鏁伴噺妫�娴嬫暟鎹�");
if (null != subDept) {
result.setTitle(subDept.getDeptName() + "鏁伴噺妫�娴嬫暟鎹�");
- result.setDeptId(String.valueOf(subDept.getDeptId()));
+ if(Constant.DEPT_TYPE_20.equals(subDept.getType())){
+ result.setDeptId(String.valueOf(subDept.getDeptId()));
+ }
}
result.setEnd(new Date());
Date start = DateUtil.getNewByDay(new Date(), -90);
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeIn.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeIn.view.xml
index 2cac696..b5b07c6 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeIn.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeIn.view.xml
@@ -60,6 +60,12 @@
<Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
<Property name="dataType">dtNoticeParam</Property>
</DataSet>
+ <DataSet id="dsDepotList">
+ <Property name="dataProvider">depotPR#getData</Property>
+ <Property name="userData">浠撳簱涓嬫媺鍒楄〃</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDepot]</Property>
+ </DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm>
@@ -75,6 +81,7 @@
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
+ <Property name="trigger">dsDepotDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -358,5 +365,30 @@
<AjaxAction id="recalculate">
<Property name="service">inoutNoticePR#updateSumNoticeIn</Property>
</AjaxAction>
+ <DataSetDropDown id="dsDepotDropDown">
+ <ClientEvent name="onOpen">
+ var entity = view.get("#dsQuery.data:#");
+ if(!entity){
+ $alert("璇峰厛閫夋嫨鎵�灞炲簱鍖�");
+ }else{
+ var deptId = entity.get("deptId");
+ if(!deptId){
+ $alert("璇峰厛閫夋嫨鎵�灞炲簱鍖�");
+ }else{
+ view.get("#dsDepotList").set("parameter",entity.get("deptId")).flushAsync();
+ }
+ }</ClientEvent>
+ <Property name="dataSet">dsDepotList</Property>
+ <Property name="height">450</Property>
+ <Property name="autoOpen">true</Property>
+ <Property name="assignmentMap">depotId=id</Property>
+ <Property name="width">400</Property>
+ <DataColumn>
+ <Property name="align">center</Property>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </DataColumn>
+ </DataSetDropDown>
</View>
</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
index e94c0c7..2710c3c 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
@@ -60,6 +60,12 @@
<Property name="dataType">dtNoticeParam</Property>
<Property name="dataProvider">inoutNoticePR#getYearQuery</Property>
</DataSet>
+ <DataSet id="dsDepotList">
+ <Property name="dataProvider">depotPR#getData</Property>
+ <Property name="userData">浠撳簱涓嬫媺鍒楄〃</Property>
+ <Property name="loadMode">manual</Property>
+ <Property name="dataType">[dtDepot]</Property>
+ </DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm>
@@ -75,6 +81,7 @@
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
+ <Property name="trigger">dsDepotDropDown</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -366,5 +373,30 @@
<AjaxAction id="recalculate">
<Property name="service">inoutNoticePR#updateSumNoticeOut</Property>
</AjaxAction>
+ <DataSetDropDown id="dsDepotDropDown">
+ <ClientEvent name="onOpen">
+ var entity = view.get("#dsQuery.data:#");
+ if(!entity){
+ $alert("璇峰厛閫夋嫨鎵�灞炲簱鍖�");
+ }else{
+ var deptId = entity.get("deptId");
+ if(!deptId){
+ $alert("璇峰厛閫夋嫨鎵�灞炲簱鍖�");
+ }else{
+ view.get("#dsDepotList").set("parameter",entity.get("deptId")).flushAsync();
+ }
+ }</ClientEvent>
+ <Property name="dataSet">dsDepotList</Property>
+ <Property name="height">450</Property>
+ <Property name="autoOpen">true</Property>
+ <Property name="assignmentMap">depotId=id</Property>
+ <Property name="width">400</Property>
+ <DataColumn>
+ <Property name="align">center</Property>
+ <Property name="name">name</Property>
+ <Property name="property">name</Property>
+ <Editor/>
+ </DataColumn>
+ </DataSetDropDown>
</View>
</ViewConfig>
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 e0ac1ed..b5a16e7 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -963,12 +963,17 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</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="mapValues">${dorado.getDataProvider("depotPR#getData").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
--
Gitblit v1.9.3