From e356555905a02466a25206bae8f9bc66f3432d4f Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 07 一月 2026 14:20:09 +0800
Subject: [PATCH] 报表优化修改

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityData.view.xml |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 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 3cf79f5..6bff250 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#getAllData&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>
@@ -100,12 +120,17 @@
     <Container>
       <Property name="className">c-param</Property>
       <AutoForm>
-        <Property name="cols">*,*,*,90,90</Property>
+        <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>
@@ -204,6 +229,11 @@
           <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>

--
Gitblit v1.9.3