From 1a47d9eef4cfe9385ce66b791de84db54a5ba87c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 25 六月 2023 20:30:36 +0800
Subject: [PATCH] 出入库流程优化-入库详单优化

---
 igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml |   67 ++++++++++++++++-----------------
 1 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
index be037e4..29a11fe 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
@@ -56,9 +56,9 @@
       </PropertyDef>
       <PropertyDef name="recordStatus">
         <Property></Property>
-        <Property name="label">鏁版嵁鐘舵��</Property>
+        <Property name="label">鍗曟嵁鐘舵��</Property>
         <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;RECORD_STATUS&quot;)}</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerRecordStatus1&quot;).getResult()}</Property>
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>
@@ -183,11 +183,11 @@
         <Property name="label">鎵ｄ环</Property>
       </PropertyDef>
       <PropertyDef name="result">
-        <Property/>
+        <Property></Property>
         <Property name="label">妫�楠岀粨鏋�</Property>
       </PropertyDef>
       <PropertyDef name="operaSymbolValue">
-        <Property/>
+        <Property></Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -206,6 +206,7 @@
 //榛樿鏌ヨ鏌ヨ鎻愭潯浠�&#xD;
 view.get(&quot;#dsQuery&quot;).insert({&#xD;
 	type:TYPE,&#xD;
+	recordStatus:'NORMAL',&#xD;
 	deptId:deptId&#xD;
 });&#xD;
 &#xD;
@@ -522,15 +523,6 @@
         </Editor>
       </AutoFormElement>
       <AutoFormElement>
-        <Property name="name">userId</Property>
-        <Property name="property">userId</Property>
-        <Editor>
-          <TextEditor>
-            <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
-          </TextEditor>
-        </Editor>
-      </AutoFormElement>
-      <AutoFormElement>
         <Property name="name">depotId</Property>
         <Property name="property">depotId</Property>
         <Property name="trigger">autoMappingDropDown2</Property>
@@ -546,6 +538,11 @@
         <Property name="name">orderTag</Property>
         <Property name="property">orderTag</Property>
         <Property name="trigger">autoMappingDropDown1</Property>
+        <Editor/>
+      </AutoFormElement>
+      <AutoFormElement>
+        <Property name="name">recordStatus</Property>
+        <Property name="property">recordStatus</Property>
         <Editor/>
       </AutoFormElement>
       <Container layout="hbox regionPadding:15">
@@ -712,7 +709,7 @@
         </Button>
         <Button id="btnFlushCheck" layoutConstraint="left">
           <ClientEvent name="onClick">flushCheckList();</ClientEvent>
-          <Property name="caption">鑾峰彇璐ㄦ椤�</Property>
+          <Property name="caption">閲嶆柊鑾峰彇璐ㄦ椤�</Property>
           <Property name="exClassName">btn-default</Property>
           <Property name="iconClass">fa fa-gavel</Property>
           <Property name="visible">false</Property>
@@ -823,7 +820,7 @@
                     <AutoFormElement>
                       <Property name="name">foodLocation</Property>
                       <Property name="property">foodLocation</Property>
-                      <Property name="trigger">ddFoodOrigin</Property>
+                      <Property name="trigger">ddDicArea</Property>
                       <Editor/>
                     </AutoFormElement>
                   </AutoForm>
@@ -1222,53 +1219,53 @@
       <Property name="titleName">鍗曟嵁鍒楄〃</Property>
       <Property name="dataScope">currentPage</Property>
     </Export2ReportAction>
-    <CustomDropDown id="ddFoodOrigin">
+    <CustomDropDown id="ddDicArea">
       <Property name="minHeight">500</Property>
-      <Property name="assignmentMap">foodLocation=name</Property>
       <Property name="minWidth">500</Property>
+      <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
       <Container layout="regionPadding:5">
-        <DataSet id="dsFoodOrigin">
-          <Property name="dataProvider"></Property>
-          <Property name="dataType">[dtFoodOrigin]</Property>
+        <DataSet id="dsDicArea">
+          <Property name="dataProvider">dicAreaPR#pageList</Property>
           <Property name="parameter"></Property>
-          <Property name="pageSize">30</Property>
+          <Property name="dataType">[dtArea]</Property>
+          <Property name="pageSize">1000</Property>
         </DataSet>
         <Container layout="hbox regionPadding:5">
           <TextEditor id="key2">
-            <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+            <Property name="blankText"> -鍚嶇О鎴栫畝鎷硷紝鍖椾含甯�  bjs -</Property>
             <Property name="width">200</Property>
           </TextEditor>
           <Button>
             <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
-view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
+view.get(&quot;#dsDicArea&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
             <Property name="caption">鏌ヨ</Property>
             <Property name="iconClass">fa fa-search</Property>
           </Button>
           <Button>
-            <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
+            <ClientEvent name="onClick">var data = view.get(&quot;#dsDicArea.data:#&quot;);&#xD;
 if(data){&#xD;
-	view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
+	view.get(&quot;#ddDicArea&quot;).close(data.toJSON());&#xD;
 }</ClientEvent>
             <Property name="iconClass">fa fa-check</Property>
             <Property name="caption">纭畾</Property>
           </Button>
         </Container>
         <DataGrid>
-          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
+          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsDicArea.data:#&quot;);&#xD;
 if(data){&#xD;
-	view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
+	view.get(&quot;#ddDicArea&quot;).close(data.toJSON());&#xD;
 }</ClientEvent>
-          <Property name="dataSet">dsFoodOrigin</Property>
+          <Property name="dataSet">dsDicArea</Property>
           <Property name="readOnly">true</Property>
-          <DataColumn name="code">
-            <Property name="property">code</Property>
-            <Property name="readOnly">true</Property>
-            <Property name="align">center</Property>
-          </DataColumn>
           <DataColumn name="name">
             <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
 arg.processDefault = true;</ClientEvent>
             <Property name="property">name</Property>
+            <Property name="readOnly">true</Property>
+            <Property name="align">center</Property>
+          </DataColumn>
+          <DataColumn name="code">
+            <Property name="property">code</Property>
             <Property name="readOnly">true</Property>
             <Property name="align">center</Property>
           </DataColumn>
@@ -1279,13 +1276,13 @@
           </DataColumn>
         </DataGrid>
         <DataPilot layoutConstraint="bottom">
-          <Property name="dataSet">dsFoodOrigin</Property>
+          <Property name="dataSet">dsDicArea</Property>
         </DataPilot>
       </Container>
     </CustomDropDown>
     <CustomDropDown id="ddNotice">
       <Property name="minHeight">400</Property>
-      <Property name="assignmentMap">noticeId=id,customerId=customerId,customerName=customerName</Property>
+      <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
       <Property name="minWidth">500</Property>
       <Property name="autoOpen">true</Property>
       <Container layout="regionPadding:5">

--
Gitblit v1.9.3