From cac7ab84d3cb339d6d4e0961f48a104e268dbee4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期六, 17 一月 2026 18:02:35 +0800
Subject: [PATCH] 代码合并修改2

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml |  219 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 143 insertions(+), 76 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 0cf444a..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
@@ -9,6 +9,15 @@
         <Property></Property>
         <Property name="label">妫�娴嬫壒娆�</Property>
       </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property></Property>
+        <Property name="label">鎵�灞炲簱鍖�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">kqmc</Property>
+        </Property>
+      </PropertyDef>
       <PropertyDef name="companyId">
         <Property></Property>
         <Property name="label">缁勭粐缂栫爜</Property>
@@ -17,7 +26,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>
@@ -25,10 +34,12 @@
       <PropertyDef name="weight">
         <Property name="dataType">Double</Property>
         <Property name="label">閲嶉噺</Property>
+        <Property name="displayFormat">#0.0 KG</Property>
       </PropertyDef>
       <PropertyDef name="bulk">
         <Property name="dataType">Double</Property>
         <Property name="label">浣撶Н</Property>
+        <Property name="displayFormat">#0.0 m鲁</Property>
       </PropertyDef>
       <PropertyDef name="receiveDate">
         <Property name="dataType">Date</Property>
@@ -57,11 +68,20 @@
       <PropertyDef name="title">
         <Property name="label"> </Property>
       </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property></Property>
+        <Property name="label">鎵�灞炲簱鍖�</Property>
+        <Property name="mapping">
+          <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="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>
@@ -82,7 +102,7 @@
       </PropertyDef>
     </DataType>
   </Model>
-  <View layout="padding:5;regionPadding:5">
+  <View layout="padding:10">
     <Property name="packages">font-awesome,css-common</Property>
     <Property name="cache">
       <Property name="mode">clientSide</Property>
@@ -97,30 +117,42 @@
       <Property name="dataType">dataTypeC</Property>
       <Property name="dataProvider">quantityDataPR#getQuery</Property>
     </DataSet>
-    <AutoForm>
-      <Property name="cols">*,*,*,*</Property>
-      <Property name="dataSet">dataSetC</Property>
-      <Property name="labelSeparator">锛�</Property>
-      <Property name="labelAlign">right</Property>
-      <Property name="labelWidth">110</Property>
-      <Property name="exClassName">bg-color</Property>
-      <AutoFormElement>
-        <Property name="name">depotId</Property>
-        <Property name="property">depotId</Property>
-        <Property name="trigger">autoMappingDropDown2</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">start</Property>
-        <Property name="property">start</Property>
-        <Editor/>
-      </AutoFormElement>
-      <AutoFormElement>
-        <Property name="name">end</Property>
-        <Property name="property">end</Property>
-        <Editor/>
-      </AutoFormElement>
-      <Container layout="hbox regionPadding:10">
+    <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="dataSet">dataSetC</Property>
+        <Property name="labelSeparator">锛�</Property>
+        <Property name="labelAlign">right</Property>
+        <Property name="labelWidth">110</Property>
+        <Property name="exClassName">bg-color</Property>
+        <AutoFormElement>
+          <Property name="name">deptId</Property>
+          <Property name="property">deptId</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">depotId</Property>
+          <Property name="property">depotId</Property>
+          <Property name="trigger">dsDepotDropDown</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">start</Property>
+          <Property name="property">start</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">end</Property>
+          <Property name="property">end</Property>
+          <Editor/>
+        </AutoFormElement>
         <Button>
           <ClientEvent name="onClick">var param = view.get(&quot;#dataSetC.data&quot;);&#xD;
 view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();&#xD;
@@ -141,61 +173,27 @@
 &#xD;
 //view.get(&quot;#labelBillUser&quot;).set(&quot;text&quot;,&quot;鍒惰〃浜猴細&quot;+user);&#xD;
 //view.get(&quot;#labelBillCheckDate&quot;).set(&quot;text&quot;,text);</ClientEvent>
-          <Property name="caption">鏌ヨ</Property>
+          <Property name="caption">鎼滅储</Property>
           <Property name="iconClass">fa fa-search</Property>
-          <Property name="exClassName">btn1</Property>
+          <Property name="exClassName">btn-q1</Property>
         </Button>
         <Button>
           <ClientEvent name="onClick">view.get(&quot;#dataSetC&quot;).flushAsync();</ClientEvent>
           <Property name="caption">閲嶇疆</Property>
           <Property name="iconClass">fa fa-refresh</Property>
-          <Property name="exClassName">btn2</Property>
+          <Property name="exClassName">btn-q2</Property>
         </Button>
-      </Container>
-    </AutoForm>
-    <Container layoutConstraint="center">
-      <Property name="exClassName">bg-color</Property>
-      <DataGrid id="dataGrid1" layoutConstraint="center ">
-        <Property name="dataSet">dsMain</Property>
-        <Property name="readOnly">true</Property>
-        <Property name="headerRowHeight">30</Property>
-        <RowNumColumn/>
-        <DataColumn name="batchId">
-          <Property name="property">batchId</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="depotId">
-          <Property name="property">depotId</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="weight">
-          <Property name="property">weight</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="bulk">
-          <Property name="property">bulk</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="receiveDate">
-          <Property name="property">receiveDate</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="checkUser">
-          <Property name="property">checkUser</Property>
-          <Property name="align">center</Property>
-          <Property name="visible">false</Property>
-        </DataColumn>
-        <DataColumn name="remark">
-          <Property name="property">remark</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-      </DataGrid>
+      </AutoForm>
+    </Container>
+    <Container>
+      <Property name="className">c-data</Property>
       <AutoForm id="autoForm1" layoutConstraint="top">
         <Property name="cols">*,*,*</Property>
         <Property name="dataSet">dataSetC</Property>
         <Property name="labelAlign">right</Property>
         <Property name="showHint">false</Property>
-        <AutoFormElement layoutConstraint="colSpan:3">
+        <Property name="labelWidth">120</Property>
+        <AutoFormElement layoutConstraint="colSpan:4">
           <Property name="name">title</Property>
           <Property name="property">title</Property>
           <Property name="showLabel">false</Property>
@@ -227,13 +225,82 @@
           <Editor/>
         </AutoFormElement>
       </AutoForm>
-    </Container>
-    <Container layoutConstraint="bottom">
-      <Property name="exClassName">bg-color</Property>
-      <DataPilot layoutConstraint="right">
+      <DataGrid id="dataGrid1" layoutConstraint=" padding:8">
         <Property name="dataSet">dsMain</Property>
-        <Property name="itemCodes">pageSize,pages</Property>
-      </DataPilot>
+        <Property name="readOnly">true</Property>
+        <Property name="headerRowHeight">30</Property>
+        <Property name="rowHeight">50</Property>
+        <RowNumColumn/>
+        <DataColumn name="batchId">
+          <Property name="property">batchId</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn>
+          <Property name="property">deptId</Property>
+          <Property name="align">center</Property>
+          <Property name="name">deptId</Property>
+        </DataColumn>
+        <DataColumn name="depotId">
+          <Property name="property">depotId</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="weight">
+          <Property name="property">weight</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="bulk">
+          <Property name="property">bulk</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="receiveDate">
+          <Property name="property">receiveDate</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="checkUser">
+          <Property name="property">checkUser</Property>
+          <Property name="align">center</Property>
+          <Property name="visible">false</Property>
+        </DataColumn>
+        <DataColumn name="remark">
+          <Property name="property">remark</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+      </DataGrid>
+      <ToolBar layoutConstraint="bottom">
+        <Fill/>
+        <DataPilot layoutConstraint="right">
+          <Property name="itemCodes">pageSize,pages</Property>
+          <Property name="dataSet">dsMain</Property>
+        </DataPilot>
+      </ToolBar>
     </Container>
+    <DataSetDropDown id="dsDepotDropDown">
+      <ClientEvent name="onOpen">&#xD;
+        var entity = view.get(&quot;#dataSetC.data:#&quot;);&#xD;
+		console.log(entity);&#xD;
+        if(!entity){&#xD;
+        $alert(&quot;璇峰厛閫夋嫨鎵�灞炲簱鍖�&quot;);&#xD;
+        }else{&#xD;
+        var deptId = entity.get(&quot;deptId&quot;);&#xD;
+				console.log(deptId);&#xD;
+&#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