From e69345c81150863c4a716819984693fd0487b419 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 11:52:25 +0800
Subject: [PATCH] 客户问题优化调整6-出入库详单取消入库重量，监管下出入库报表查询数据一样问题

---
 fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 0b53918..696bc3e 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -417,7 +417,8 @@
 &#xD;
 //榛樿鏌ヨ鏌ヨ鎻愭潯浠�&#xD;
 view.get(&quot;#dsQuery&quot;).insert({&#xD;
-	deptId:deptId&#xD;
+      deptId:deptId,&#xD;
+      type:&quot;OUT&quot;&#xD;
 });&#xD;
 &#xD;
 query = function(){&#xD;
@@ -433,7 +434,7 @@
     	var user = encodeURIComponent(select.get(&quot;userName&quot;));&#xD;
     	var plateNum = encodeURIComponent(select.get(&quot;plateNum&quot;));&#xD;
 	&#xD;
-    	view.get(&quot;#iFrameImg&quot;).set(&quot;path&quot;, &quot;./basic/inout/inout-img?id=&quot; + select.get(&quot;id&quot;)+&quot;&amp;plateNum=&quot;+plateNum+&quot;&amp;user=&quot;+user);&#xD;
+    	view.get(&quot;#iFrameImg&quot;).set(&quot;path&quot;, &quot;/basic/inout/inout-img?id=&quot; + select.get(&quot;id&quot;)+&quot;&amp;plateNum=&quot;+plateNum+&quot;&amp;user=&quot;+user);&#xD;
     	view.get(&quot;#dialogImg&quot;).show();&#xD;
 	}else{&#xD;
     	$notify(&quot;璇烽�夋嫨鏁版嵁鈥︹��&quot;);&#xD;
@@ -442,12 +443,12 @@
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
       <Property name="dataType">[dtMain]</Property>
-      <Property name="dataProvider">reportOutDetailPR#listRecord</Property>
+      <Property name="dataProvider">reportInoutPR#listRecord</Property>
       <Property name="loadMode">manual</Property>
     </DataSet>
     <DataSet id="dsQuery">
       <Property name="dataType">dtQuery</Property>
-      <Property name="dataProvider">reportOutDetailPR#getQuery</Property>
+      <Property name="dataProvider">reportInoutPR#getQueryInout</Property>
       <Property></Property>
       <Property name="loadMode">manual</Property>
     </DataSet>
@@ -509,7 +510,7 @@
     &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
     &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
 }&#xD;
-window.parent.$.table.exportExcelDorado(&quot;./export/inOutReport-excel&quot;, &quot;鍑哄簱鏁版嵁&quot;, param);</ClientEvent>
+window.parent.$.table.exportExcelDorado(&quot;./export/inout-excel&quot;, &quot;鍑哄簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="width">140</Property>
@@ -577,7 +578,7 @@
     &quot;start&quot;:data.get(&quot;start&quot;),&#xD;
     &quot;end&quot;:data.get(&quot;end&quot;)&#xD;
 }&#xD;
-window.parent.$.table.exportExcelDorado(&quot;./export/inOutReport-excel&quot;, &quot;鍑哄簱鏁版嵁&quot;, param);</ClientEvent>
+window.parent.$.table.exportExcelDorado(&quot;./export/inout-excel&quot;, &quot;鍑哄簱鏁版嵁&quot;, param);</ClientEvent>
           <Property name="caption">瀵煎嚭EXCEL</Property>
           <Property name="exClassName">btn-q2</Property>
           <Property name="width">140</Property>
@@ -688,13 +689,6 @@
           <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>
-          <Property name="property">recordWeight</Property>
-          <Property name="align">center</Property>
-          <Property name="name">recordWeight</Property>
-          <Property name="caption">鍑哄簱閲嶉噺</Property>
-          <Property name="width">100</Property>
-        </DataColumn>
-        <DataColumn>
           <Property name="property">completeTime</Property>
           <Property name="align">center</Property>
           <Property name="name">completeTime</Property>
@@ -760,13 +754,6 @@
           <Property name="property">settleWeight</Property>
           <Property name="caption">缁撶畻閲嶉噺</Property>
           <Property name="align">center</Property>
-          <Property name="width">100</Property>
-        </DataColumn>
-        <DataColumn>
-          <Property name="property">recordWeight</Property>
-          <Property name="align">center</Property>
-          <Property name="name">recordWeight</Property>
-          <Property name="caption">鍑哄簱閲嶉噺</Property>
           <Property name="width">100</Property>
         </DataColumn>
         <DataColumn>

--
Gitblit v1.9.3