From 84043dad83ea5193179e82227b191e522496bae5 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 09 一月 2026 15:43:47 +0800
Subject: [PATCH] 料位总览提交2-IOT协议

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml |  116 +++++++++++++++++++++-------------------------------------
 1 files changed, 42 insertions(+), 74 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
index afd6d0e..3e6b570 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/GrainReport.view.xml
@@ -17,7 +17,7 @@
         <Property></Property>
         <Property name="label">浠撳簱</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -538,7 +538,7 @@
         <Property></Property>
         <Property name="label">鏀跺偍鍏徃</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getCompanyByUserType&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">dwmc</Property>
         </Property>
@@ -547,16 +547,16 @@
         <Property></Property>
         <Property name="label">鎵�灞炲簱鍖�</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).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="label">浠撳簱鍚嶇О</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
           <Property name="keyProperty">id</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -635,22 +635,29 @@
       <Property name="dataType">dataTypeC</Property>
       <Property name="dataProvider">grainReportPR#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>
-        <Property name="cols">*,*,*,*,90,90</Property>
+        <Property name="cols">*,*,300,300,90,90</Property>
         <Property name="dataSet">dataSetC</Property>
         <Property name="labelSeparator">锛�</Property>
         <Property name="labelAlign">right</Property>
         <Property name="labelWidth">110</Property>
         <AutoFormElement>
-          <Property name="name">companyId</Property>
-          <Property name="property">companyId</Property>
+          <Property name="name">deptId</Property>
+          <Property name="property">deptId</Property>
           <Editor/>
         </AutoFormElement>
         <AutoFormElement>
-          <Property name="name">deptId</Property>
-          <Property name="property">deptId</Property>
+          <Property name="name">depotId</Property>
+          <Property name="property">depotId</Property>
+          <Property name="trigger">dsDepotDropDown</Property>
           <Editor/>
         </AutoFormElement>
         <AutoFormElement>
@@ -1288,69 +1295,30 @@
     <ListDropDown id="listHour">
       <Property name="items">6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22</Property>
     </ListDropDown>
-    <CustomDropDown id="CDDDept">
-      <Property name="minWidth">400</Property>
-      <Property name="minHeight">600</Property>
-      <Property name="assignmentMap">ids=ids,names=names</Property>
-      <Panel>
-        <Property name="showCaptionBar">false</Property>
-        <Buttons>
-          <Button>
-            <ClientEvent name="onClick">var selection = view.get(&quot;#dgDepotSelect&quot;).get(&quot;selection&quot;);&#xD;
-if(!selection || selection.length == 0){&#xD;
-	$alert(&quot;璇烽�夋嫨浠撳簱&quot;);&#xD;
-	return;&#xD;
-}&#xD;
-&#xD;
-var ids = &quot;&quot;,names=&quot;&quot;;&#xD;
-selection.each(function(item){&#xD;
-	ids += item.get(&quot;id&quot;)+&quot;,&quot;;&#xD;
-	names+=item.get(&quot;name&quot;)+&quot;,&quot;;&#xD;
-});&#xD;
-&#xD;
-view.get(&quot;#CDDDept&quot;).close({ids:ids,names:names});</ClientEvent>
-            <Property name="caption">纭閫夋嫨</Property>
-            <Property name="iconClass">fa fa-check-circle</Property>
-            <Property name="exClassName">btn1</Property>
-            <Property name="width">120</Property>
-          </Button>
-          <Button>
-            <ClientEvent name="onClick">view.get(&quot;#CDDDept&quot;).close({});&#xD;
-view.get(&quot;#dgDepotSelect&quot;).set(&quot;selection&quot;,null);</ClientEvent>
-            <Property name="caption">鍙栨秷鎿嶄綔</Property>
-            <Property name="exClassName">btn3</Property>
-            <Property name="iconClass">fa fa-times-circle</Property>
-            <Property name="width">120</Property>
-          </Button>
-        </Buttons>
-        <Children>
-          <DataSet id="dsDeptSelect">
-            <Property name="dataType">[dtDepot]</Property>
-            <Property name="dataProvider">depotPR#getAllCache</Property>
-          </DataSet>
-          <DataGrid id="dgDepotSelect">
-            <Property name="dataSet">dsDeptSelect</Property>
-            <Property name="selectionMode">multiRows</Property>
-            <RowSelectorColumn>
-              <Property name="caption">閫夋嫨</Property>
-              <Property name="width">50</Property>
-            </RowSelectorColumn>
-            <DataColumn name="name">
-              <Property name="property">name</Property>
-              <Property name="readOnly">true</Property>
-            </DataColumn>
-            <DataColumn name="id">
-              <Property name="property">id</Property>
-              <Property name="readOnly">true</Property>
-            </DataColumn>
-            <DataColumn name="depotType">
-              <Property name="property">depotType</Property>
-              <Property name="readOnly">true</Property>
-            </DataColumn>
-          </DataGrid>
-        </Children>
-        <Tools/>
-      </Panel>
-    </CustomDropDown>
+    <DataSetDropDown id="dsDepotDropDown">
+      <ClientEvent name="onOpen">&#xD;
+        var entity = view.get(&quot;#dataSetC.data:#&quot;);&#xD;
+        if(!entity){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲簱鍖�&quot;);&#xD;
+        }else{&#xD;
+        var deptId = entity.get(&quot;deptId&quot;);&#xD;
+        if(!deptId){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲簱鍖�&quot;);&#xD;
+        }else{&#xD;
+        view.get(&quot;#dsDepotList&quot;).set(&quot;parameter&quot;,entity.get(&quot;deptId&quot;)).flushAsync();&#xD;
+        }
+        }</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>

--
Gitblit v1.9.3