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

---
 igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml |  410 ++++++++++++++++++++++++++--------------------------------
 1 files changed, 183 insertions(+), 227 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index 0292986..41b1093 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -4,11 +4,7 @@
   <Context/>
   <Model>
     <DataType name="dtMain" parent="dtInoutRecord">
-      <ClientEvent name="onDataChange">if(arg.property ==&quot;depotId&quot;){&#xD;
-	autoByDepot(arg.newValue);&#xD;
-}&#xD;
-&#xD;
-if(arg.property ==&quot;foodVariety&quot;){&#xD;
+      <ClientEvent name="onDataChange">if(arg.property ==&quot;foodVariety&quot;){&#xD;
 	var entity = arg.entity;&#xD;
 	entity.reset(&quot;checkItems&quot;);&#xD;
 }</ClientEvent>
@@ -32,10 +28,9 @@
           <Entity>
             <Property name="checkId">$${this.checkId}</Property>
             <Property name="foodVariety">$${this.foodVariety}</Property>
-            <Property name="deptId">$${this.deptId}</Property>
           </Entity>
         </Property>
-        <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
+        <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
         <Property name="dataType">[dtCheckItems]</Property>
       </Reference>
     </DataType>
@@ -117,19 +112,6 @@
   <View layout="padding:5;regionPadding:5">
     <ClientEvent name="onReady">var TYPE = &quot;${request.getParameter('type')}&quot;;&#xD;
 &#xD;
-//绫诲瀷鍒囨崲&#xD;
-if(&quot;OUT&quot; == TYPE){&#xD;
-	view.get(&quot;#columnDeSum&quot;).set(&quot;visible&quot;,false);&#xD;
-	//view.get(&quot;#label1&quot;).set(&quot;text&quot;,&quot;娉細鍑哄簱姘村垎澧為噸璁板叆缁撶畻閲嶉噺&quot;);&#xD;
-	&#xD;
-	view.get(&quot;#dataGridCheckItem&quot;).set(&quot;visible&quot;,false);&#xD;
-	&#xD;
-	view.get(&quot;#deWet&quot;).set(&quot;label&quot;,&quot;姘村垎澧為噸&quot;);&#xD;
-}else{&#xD;
-	view.get(&quot;#deWet&quot;).set(&quot;label&quot;,&quot;姘村垎鎵i噸&quot;);&#xD;
-	view.get(&quot;#dataGridCheckItem&quot;).set(&quot;visible&quot;,true);&#xD;
-}&#xD;
-&#xD;
 /**&#xD;
  * 鍒锋柊椤甸潰&#xD;
  */&#xD;
@@ -137,11 +119,8 @@
 	view.get(&quot;#btnSave&quot;).set(&quot;disabled&quot;,false);&#xD;
 	view.get(&quot;#btnPrintWeigh&quot;).set(&quot;disabled&quot;,true);&#xD;
 	view.get(&quot;#btnPrintCheck&quot;).set(&quot;disabled&quot;,true);&#xD;
-	&#xD;
 	view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,TYPE).flushAsync();&#xD;
 };&#xD;
-&#xD;
-&#xD;
 flush();&#xD;
 &#xD;
 /**&#xD;
@@ -158,7 +137,6 @@
 		$alert(&quot;鏁版嵁楠岃瘉澶辫触锛屻�愬熀纭�淇℃伅銆�-缁撶畻閲嶉噺蹇呴』澶т簬0锛�&quot;);&#xD;
 		return;&#xD;
 	}&#xD;
-	&#xD;
 	view.get(&quot;#uaSave&quot;).execute(function(result){&#xD;
 		if(result){&#xD;
 			$alert(&quot;淇濆瓨澶辫触锛�&quot;+result);&#xD;
@@ -169,61 +147,7 @@
 			$alert(&quot;淇濆瓨鎴愬姛锛屽彲浠ヨ繘琛屾墦鍗板拰閲嶆柊鎻愭柊琛ㄥ崟锛�&quot;);&#xD;
 		}&#xD;
 	});&#xD;
-}&#xD;
-&#xD;
-/**&#xD;
- * 鎵撳嵃鍑哄簱杩囩鍗�&#xD;
- */&#xD;
-printBill = function(htmlStr) {&#xD;
-	var LODOP = CLODOP;&#xD;
-	LODOP.PRINT_INIT(&quot;绉伴噸鍗�&quot;);&#xD;
-	LODOP.SET_PRINT_PAGESIZE(1,2100,1400, &quot;A4&quot;);&#xD;
-	//LODOP.SET_PRINT_PAGESIZE(1, 0, '90mm', &quot;A4&quot;);&#xD;
-	LODOP.ADD_PRINT_HTM(0, 0, &quot;100%&quot;, &quot;100%&quot;, htmlStr);&#xD;
-	LODOP.PREVIEW();&#xD;
-};&#xD;
-&#xD;
-print5016Bill = function(htmlStr) {&#xD;
-	var LODOP = CLODOP;&#xD;
-	LODOP.PRINT_INIT(&quot;绉伴噸鍗�&quot;);&#xD;
-	LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, &quot;&quot;);&#xD;
-	LODOP.ADD_PRINT_HTM(0, 0, &quot;100%&quot;, &quot;100%&quot;, htmlStr);&#xD;
-	LODOP.PREVIEW();&#xD;
-};&#xD;
-&#xD;
-//鎵撳嵃鎵︽牱鍗�&#xD;
-printCheck = function(){&#xD;
-	$alert(&quot;鎵撳嵃妯$増鏈畾涔夆�︹��&quot;);&#xD;
-};&#xD;
-&#xD;
-//鎵撳嵃绉伴噸鍗�&#xD;
-printWeight = function(){&#xD;
-	var data = view.get(&quot;#dsMain.data&quot;);&#xD;
-	if(!data) return;&#xD;
-	var companyId = data.get(&quot;companyId&quot;);&#xD;
-	console.log(companyId);&#xD;
-	view.get(&quot;#ajaxPrint&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
-		if(companyId &amp;&amp; companyId == &quot;5016&quot;){&#xD;
-			print5016Bill(result);&#xD;
-		}else {&#xD;
-			printBill(result);&#xD;
-		}&#xD;
-	});&#xD;
-};&#xD;
-&#xD;
-//鏍规嵁浠撳簱鑷姩鍥炲~绮鍝佺锛岀櫥璁帮紝浜у湴鏂�&#xD;
-autoByDepot = function(depotId){&#xD;
-	view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
-		if(result){&#xD;
-			//console.log(result);&#xD;
-			var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-			data.set(&quot;foodLocation&quot;,result.foodLocation);&#xD;
-			data.set(&quot;foodLevel&quot;,result.foodLevel);&#xD;
-			data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
-			data.set(&quot;foodYear&quot;,result.foodYear);&#xD;
-		}&#xD;
-	});&#xD;
-};</ClientEvent>
+}</ClientEvent>
     <ClientEvent name="onCreate">&#xD;
 /**&#xD;
  * 鑷姩璁$畻锛屽綋鍓嶉〉闈笉鑷姩鍏宠仈鎵︽牱璁板綍锛屽叏閮ㄧ敱鎵嬪姩涓哄噯&#xD;
@@ -372,12 +296,12 @@
       <Button id="btnSave" layoutConstraint="left">
         <ClientEvent name="onClick">save();</ClientEvent>
         <Property name="caption">鏁版嵁鎻愪氦</Property>
-        <Property name="exClassName">btn-default</Property>
+        <Property name="exClassName">btn-normal</Property>
         <Property name="iconClass">fa fa-plus</Property>
       </Button>
       <Button id="btnPrintCheck" layoutConstraint="left">
         <ClientEvent name="onClick">printCheck();</ClientEvent>
-        <Property name="caption">鎵撳嵃鎶芥牱鍗�</Property>
+        <Property name="caption">鎵撳嵃璐ㄦ鍗�</Property>
         <Property name="exClassName">btn-default</Property>
         <Property name="iconClass">fa fa-print</Property>
         <Property name="tip">淇濆瓨鏁版嵁鍚庡彲鐢�</Property>
@@ -405,7 +329,7 @@
         <Property name="width">150</Property>
         <Property name="name">tabCommon</Property>
         <Container>
-          <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
+          <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
             <Property name="caption">鍩烘湰淇℃伅</Property>
             <Buttons/>
             <Children>
@@ -434,6 +358,13 @@
                   <Property name="name">userContact</Property>
                   <Property name="property">userContact</Property>
                   <Property name="label">鑱旂郴鐢佃瘽</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement>
+                  <Property name="label">瀹㈡埛鍚嶇О</Property>
+                  <Property name="property">customerName</Property>
+                  <Property name="editable">false</Property>
+                  <Property name="trigger">ddNotice</Property>
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement>
@@ -472,12 +403,6 @@
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement>
-                  <Property name="name">foodLocation</Property>
-                  <Property name="property">foodLocation</Property>
-                  <Property name="trigger">ddFoodOrigin</Property>
-                  <Editor/>
-                </AutoFormElement>
-                <AutoFormElement>
                   <Property name="name">foodLevel</Property>
                   <Property name="property">foodLevel</Property>
                   <Editor/>
@@ -489,28 +414,26 @@
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement>
-                  <Property name="name">noticeName</Property>
-                  <Property name="property">noticeName</Property>
-                  <Property name="trigger">ddNotice</Property>
-                  <Property name="editable">false</Property>
-                  <Property name="label">鍏ュ簱閫氱煡鍗�</Property>
+                  <Property name="name">registerTime</Property>
+                  <Property name="property">registerTime</Property>
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement>
-                  <Property name="name">registerTime</Property>
-                  <Property name="property">registerTime</Property>
+                  <Property name="name">foodLocation</Property>
+                  <Property name="property">foodLocation</Property>
+                  <Property name="trigger">ddDicArea</Property>
                   <Editor/>
                 </AutoFormElement>
               </AutoForm>
             </Children>
           </FieldSet>
-          <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
+          <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
             <Property name="caption">绉伴噸淇℃伅锛堝崟浣嶏細KG锛�</Property>
             <Buttons/>
             <Children>
               <AutoForm>
                 <Property name="dataSet">dsMain</Property>
-                <Property name="cols">*,*,*,*,*,*</Property>
+                <Property name="cols">*,50,*,50,*,50</Property>
                 <Property name="labelAlign">right</Property>
                 <Property name="labelWidth">100</Property>
                 <Property name="labelSeparator">锛�</Property>
@@ -524,6 +447,17 @@
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement layoutConstraint="colSpan:2">
+                  <Property name="name">emptyWeightTime</Property>
+                  <Property name="property">emptyWeightTime</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement layoutConstraint="colSpan:2">
+                  <Property name="name">fullWeightUser</Property>
+                  <Property name="property">fullWeightUser</Property>
+                  <Property name="label">绉伴噸浜�</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement layoutConstraint="colSpan:2">
                   <ClientEvent name="onBlur">//id 瑙勫垯 d_prop&#xD;
 var id = self.getDom().id;&#xD;
 var prop = id.substring(2,id.length);&#xD;
@@ -534,50 +468,14 @@
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement layoutConstraint="colSpan:2">
-                  <Property name="name">netWeight</Property>
-                  <Property name="property">netWeight</Property>
-                  <Property name="readOnly">true</Property>
+                  <Property name="name">fullWeightTime</Property>
+                  <Property name="property">fullWeightTime</Property>
                   <Editor/>
                 </AutoFormElement>
-                <AutoFormElement>
-                  <ClientEvent name="onBlur">//id 瑙勫垯 d_prop&#xD;
-var id = self.getDom().id;&#xD;
-var prop = id.substring(2,id.length);&#xD;
-deAutoByWeight(prop);</ClientEvent>
-                  <Property name="name">deImpurity</Property>
-                  <Property name="property">deImpurity</Property>
-                  <Property name="showHint">false</Property>
+                <AutoFormElement layoutConstraint="colSpan:2">
+                  <Property name="name">completeTime</Property>
+                  <Property name="property">completeTime</Property>
                   <Editor/>
-                </AutoFormElement>
-                <AutoFormElement>
-                  <Property name="name">impurity</Property>
-                  <Property name="property">impurity</Property>
-                  <Property name="showLabel">false</Property>
-                  <Editor>
-                    <TextEditor>
-                      <Property name="blankText"> -- % --</Property>
-                    </TextEditor>
-                  </Editor>
-                </AutoFormElement>
-                <AutoFormElement id="deWet">
-                  <ClientEvent name="onBlur">//id 瑙勫垯 d_prop&#xD;
-var id = self.getDom().id;&#xD;
-var prop = id.substring(2,id.length);&#xD;
-deAutoByWeight(prop);</ClientEvent>
-                  <Property name="name">deWet</Property>
-                  <Property name="property">deWet</Property>
-                  <Property name="showHint">false</Property>
-                  <Editor/>
-                </AutoFormElement>
-                <AutoFormElement>
-                  <Property name="name">wet</Property>
-                  <Property name="property">wet</Property>
-                  <Property name="showLabel">false</Property>
-                  <Editor>
-                    <TextEditor>
-                      <Property name="blankText"> -- % --</Property>
-                    </TextEditor>
-                  </Editor>
                 </AutoFormElement>
                 <AutoFormElement layoutConstraint="colSpan:2">
                   <ClientEvent name="onBlur">//id 瑙勫垯 d_prop&#xD;
@@ -586,6 +484,7 @@
 deAutoByWeight(prop);</ClientEvent>
                   <Property name="name">deHandle</Property>
                   <Property name="property">deHandle</Property>
+                  <Property name="label">鐜板満鎵i噸</Property>
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement layoutConstraint="colSpan:2">
@@ -598,8 +497,39 @@
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement layoutConstraint="colSpan:2">
-                  <Property name="name">deSum</Property>
-                  <Property name="property">deSum</Property>
+                  <Property name="name">deOtherInfo</Property>
+                  <Property name="property">deOtherInfo</Property>
+                  <Property name="label">鍏朵粬鍘熷洜</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement layoutConstraint="colSpan:2">
+                  <ClientEvent name="onBlur">//id 瑙勫垯 d_prop&#xD;
+var id = self.getDom().id;&#xD;
+var prop = id.substring(2,id.length);&#xD;
+deAutoByWeight(prop);</ClientEvent>
+                  <Property name="name">deCheck</Property>
+                  <Property name="property">deCheck</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement layoutConstraint="colSpan:2">
+                  <ClientEvent name="onBlur">//id 瑙勫垯 d_prop&#xD;
+var id = self.getDom().id;&#xD;
+var prop = id.substring(2,id.length);&#xD;
+deAutoByWeight(prop);</ClientEvent>
+                  <Property name="name">addCheck</Property>
+                  <Property name="property">addCheck</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <Label layoutConstraint="colSpan:2">
+                  <Property name="style">
+                    <Property name="color">blue</Property>
+                    <Property name="padding-left">80px</Property>
+                  </Property>
+                  <Property name="text">璇存槑锛氳川妫�澧炴墸閲嶈鏌ョ湅璐ㄦ淇℃伅鏍忎綅璇︾粏</Property>
+                </Label>
+                <AutoFormElement layoutConstraint="colSpan:2">
+                  <Property name="name">netWeight</Property>
+                  <Property name="property">netWeight</Property>
                   <Property name="readOnly">true</Property>
                   <Editor/>
                 </AutoFormElement>
@@ -610,45 +540,88 @@
                   <Editor/>
                 </AutoFormElement>
                 <AutoFormElement layoutConstraint="colSpan:2">
-                  <Property name="name">completeTime</Property>
-                  <Property name="property">completeTime</Property>
+                  <Property name="name">recordWeight</Property>
+                  <Property name="property">recordWeight</Property>
+                  <Property name="readOnly">true</Property>
                   <Editor/>
                 </AutoFormElement>
-                <AutoFormElement layoutConstraint="colSpan:2">
-                  <Property name="name">fullWeightTime</Property>
-                  <Property name="property">fullWeightTime</Property>
-                  <Editor/>
-                </AutoFormElement>
-                <AutoFormElement layoutConstraint="colSpan:2">
-                  <Property name="name">emptyWeightTime</Property>
-                  <Property name="property">emptyWeightTime</Property>
-                  <Editor/>
-                </AutoFormElement>
-                <Label layoutConstraint="colSpan:6">
-                  <Property name="style">
-                    <Property name="color">blue</Property>
-                    <Property name="padding-left">80px</Property>
-                  </Property>
-                  <Property name="text">璇存槑锛氱粨绠楅噸閲� = 鍑�閲� - 鎵i噸 + 澧為噸锛涙墸姘存潅锛氭鏁�=鎵i噸锛岃礋鏁�=澧為噸</Property>
-                </Label>
               </AutoForm>
             </Children>
           </FieldSet>
-          <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
-            <Property name="caption">澶囨敞璇存槑</Property>
+          <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
+            <Property name="caption">鍏朵粬闇�瑕佽ˉ鍏呬俊鎭�</Property>
             <Buttons/>
             <Children>
               <AutoForm>
                 <Property name="dataSet">dsMain</Property>
-                <Property name="cols">*,*</Property>
+                <Property name="cols">*,*,*</Property>
                 <Property name="labelAlign">right</Property>
                 <Property name="labelSeparator">锛�</Property>
                 <Property name="labelWidth">100</Property>
-                <AutoFormElement layoutConstraint="colSpan:2">
+                <AutoFormElement>
+                  <Property name="name">jjlx</Property>
+                  <Property name="property">jjlx</Property>
+                  <Editor>
+                    <RadioGroup>
+                      <RadioButton>
+                        <Property name="text">绉伴噸鍏ュ簱</Property>
+                        <Property name="value">0</Property>
+                      </RadioButton>
+                      <RadioButton>
+                        <Property name="value">1</Property>
+                        <Property name="text">鏍囧噯鍖呭叆搴�</Property>
+                      </RadioButton>
+                    </RadioGroup>
+                  </Editor>
+                </AutoFormElement>
+                <AutoFormElement>
+                  <Property name="name">bzw</Property>
+                  <Property name="property">bzw</Property>
+                  <Editor>
+                    <RadioGroup>
+                      <RadioButton>
+                        <Property name="text">楹昏</Property>
+                        <Property name="value">1</Property>
+                      </RadioButton>
+                      <RadioButton>
+                        <Property name="text">缂栫粐琚�</Property>
+                        <Property name="value">2</Property>
+                      </RadioButton>
+                      <RadioButton>
+                        <Property name="text">鏁h</Property>
+                        <Property name="value">3</Property>
+                      </RadioButton>
+                      <RadioButton>
+                        <Property name="value">9</Property>
+                        <Property name="text">鍏朵粬</Property>
+                      </RadioButton>
+                    </RadioGroup>
+                  </Editor>
+                </AutoFormElement>
+                <AutoFormElement>
+                  <Property name="name">dbz</Property>
+                  <Property name="property">dbz</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement>
+                  <Property name="name">bzbjs</Property>
+                  <Property name="property">bzbjs</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement>
+                  <Property name="name">dePackage</Property>
+                  <Property name="property">dePackage</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement>
+                  <Property name="name">price</Property>
+                  <Property name="property">price</Property>
+                  <Editor/>
+                </AutoFormElement>
+                <AutoFormElement layoutConstraint="colSpan:3">
                   <Property name="name">remarks</Property>
                   <Property name="property">remarks</Property>
                   <Property name="editorType">TextArea</Property>
-                  <Property name="showLabel">false</Property>
                   <Editor/>
                 </AutoFormElement>
               </AutoForm>
@@ -664,7 +637,7 @@
         <Container layout="padding:10">
           <AutoForm>
             <Property name="dataSet">dsMain</Property>
-            <Property name="cols">*,*,*,*</Property>
+            <Property name="cols">*,*,*</Property>
             <Property name="labelAlign">right</Property>
             <Property name="labelWidth">100</Property>
             <Property name="labelSeparator">锛�</Property>
@@ -705,19 +678,14 @@
               <Property name="label">鍖栭獙缁撴灉</Property>
               <Editor/>
             </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">checkTime</Property>
+              <Property name="property">checkTime</Property>
+              <Property name="label">璐ㄦ鏃堕棿</Property>
+              <Editor/>
+            </AutoFormElement>
           </AutoForm>
           <DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
-            <ClientEvent name="onCellValueEdit">//瀹炵幇鍖栭獙椤圭洰璋冩暣锛屾洿鏂颁富琛ㄤ腑鍊�&#xD;
-var entity = arg.entity;&#xD;
-var inoutData = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-&#xD;
-if(entity.get(&quot;standardId&quot;) ==&quot;C01&quot;){//姘村垎&#xD;
-	inoutData.set(&quot;wet&quot;,entity.get(&quot;value&quot;));&#xD;
-}&#xD;
-&#xD;
-if(entity.get(&quot;standardId&quot;) ==&quot;C02&quot;){//闆滃織&#xD;
-	inoutData.set(&quot;impurity&quot;,entity.get(&quot;value&quot;));&#xD;
-}</ClientEvent>
             <Property name="dataSet">dsMain</Property>
             <Property name="dataPath">#.checkItems</Property>
             <Property name="highlightCurrentRow">false</Property>
@@ -752,53 +720,68 @@
         </Container>
       </ControlTab>
     </TabControl>
-    <CustomDropDown id="ddFoodOrigin">
+    <YearDropDown id="yearDropDown"/>
+    <UpdateAction id="uaSave">
+      <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
+      <Property name="confirmMessage">纭畾瑕佹彁浜や箞锛�</Property>
+      <UpdateItem>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="dataPath">[#current]</Property>
+        <Property name="validateData">false</Property>
+      </UpdateItem>
+    </UpdateAction>
+    <AjaxAction id="ajaxPrint">
+      <Property name="service">inoutDataPR#printWeightBill</Property>
+      <Property name="executingMessage">姝e湪鎵ц鎵撳嵃鈥︹��</Property>
+      <Property name="async">false</Property>
+    </AjaxAction>
+    <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">dicTriggerPR#pagFoodLocationData</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>
@@ -809,13 +792,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,noticeName=name,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">
@@ -836,18 +819,14 @@
           <Button>
             <ClientEvent name="onClick">var key = view.get(&quot;#key3.value&quot;);&#xD;
 var type = &quot;${request.getParameter('type')}&quot;;&#xD;
-//var customerId = view.get(&quot;#dataGridMain.currentEntity&quot;).get(&quot;customerId&quot;);&#xD;
-//var depotId = view.get(&quot;#dataGridMain.currentEntity&quot;).get(&quot;depotId&quot;);&#xD;
-//var foodVariety = view.get(&quot;#dataGridMain.currentEntity&quot;).get(&quot;foodVariety&quot;);&#xD;
-//view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{key:key,type:type,customerId:customerId,depotId:depotId,foodVariety:foodVariety}).flushAsync();&#xD;
 view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{key: key,type: type}).flushAsync();</ClientEvent>
             <Property name="caption">鏌ヨ</Property>
             <Property name="iconClass">fa fa-search</Property>
           </Button>
           <Button>
-            <ClientEvent name="onClick">var data = view.get(&quot;#dsCustomer.data:#&quot;);&#xD;
+            <ClientEvent name="onClick">var data = view.get(&quot;#dsNotice.data:#&quot;);&#xD;
 if(data){&#xD;
-	view.get(&quot;#ddCustomer&quot;).close(data.toJSON());&#xD;
+	view.get(&quot;#ddNotice&quot;).close(data.toJSON());&#xD;
 }</ClientEvent>
             <Property name="iconClass">fa fa-check</Property>
             <Property name="caption">纭畾</Property>
@@ -860,39 +839,16 @@
 }</ClientEvent>
           <Property name="dataSet">dsNotice</Property>
           <Property name="readOnly">true</Property>
-          <DataColumn name="name">
-            <Property name="property">name</Property>
-          </DataColumn>
           <DataColumn>
             <Property name="property">customerName</Property>
             <Property name="align">center</Property>
             <Property name="name">customerName</Property>
           </DataColumn>
-          <DataColumn name="id">
-            <Property name="property">id</Property>
-            <Property name="align">center</Property>
-            <Property name="visible">false</Property>
+          <DataColumn name="name">
+            <Property name="property">name</Property>
           </DataColumn>
         </DataGrid>
       </Container>
     </CustomDropDown>
-    <YearDropDown id="yearDropDown"/>
-    <UpdateAction id="uaSave">
-      <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
-      <Property name="confirmMessage">纭畾瑕佹彁浜や箞锛�</Property>
-      <UpdateItem>
-        <Property name="dataSet">dsMain</Property>
-        <Property name="dataPath">[#current]</Property>
-        <Property name="validateData">false</Property>
-      </UpdateItem>
-    </UpdateAction>
-    <AjaxAction id="ajaxGetDepot">
-      <Property name="service">depotPR#getDepot</Property>
-    </AjaxAction>
-    <AjaxAction id="ajaxPrint">
-      <Property name="service">inoutDataPR#printWeightBill</Property>
-      <Property name="executingMessage">姝e湪鎵ц鎵撳嵃鈥︹��</Property>
-      <Property name="async">false</Property>
-    </AjaxAction>
   </View>
 </ViewConfig>

--
Gitblit v1.9.3