From 6f45f4a29ce38525f3f9e3931bcedfc77bde765e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 24 六月 2023 18:07:43 +0800
Subject: [PATCH] 出入库流程优化-入库详单优化

---
 igds-inout/src/main/java/models/inout.model.xml |  127 +++++++++++++++++++++++-------------------
 1 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index c356dfd..c172533 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -156,14 +156,6 @@
       <Property></Property>
       <Property name="label">杩愯緭鏂瑰紡</Property>
     </PropertyDef>
-    <PropertyDef name="specType">
-      <Property></Property>
-      <Property name="label">瑙勬牸</Property>
-    </PropertyDef>
-    <PropertyDef name="customerId">
-      <Property></Property>
-      <Property name="label">寰�鏉ュ崟浣岻D</Property>
-    </PropertyDef>
     <PropertyDef name="customerName">
       <Property></Property>
       <Property name="label">寰�鏉ュ崟浣�</Property>
@@ -178,26 +170,6 @@
       <Property name="label">绮骞翠唤</Property>
       <Property name="required">true</Property>
     </PropertyDef>
-    <PropertyDef name="impurity">
-      <Property name="dataType">Double</Property>
-      <Property name="label">鏉傝川</Property>
-      <Property name="displayFormat">0.00 %</Property>
-    </PropertyDef>
-    <PropertyDef name="wet">
-      <Property name="dataType">Double</Property>
-      <Property name="label">姘村垎</Property>
-      <Property name="displayFormat">0.00 %</Property>
-    </PropertyDef>
-    <PropertyDef name="deImpurity">
-      <Property name="dataType">Double</Property>
-      <Property name="label">鏉傝川鎵ｉ噸</Property>
-      <Property name="displayFormat">0.0 KG</Property>
-    </PropertyDef>
-    <PropertyDef name="deWet">
-      <Property name="dataType">Double</Property>
-      <Property name="label">姘村垎澧為噸</Property>
-      <Property name="displayFormat">0.0 KG</Property>
-    </PropertyDef>
     <PropertyDef name="deHandle">
       <Property name="dataType">Double</Property>
       <Property name="label">鍊间粨鎵ｉ噸</Property>
@@ -206,11 +178,6 @@
     <PropertyDef name="deOther">
       <Property name="dataType">Double</Property>
       <Property name="label">鍏朵粬鎵ｉ噸</Property>
-      <Property name="displayFormat">0.0 KG</Property>
-    </PropertyDef>
-    <PropertyDef name="deSum">
-      <Property name="dataType">Double</Property>
-      <Property name="label">鎬绘墸閲�</Property>
       <Property name="displayFormat">0.0 KG</Property>
     </PropertyDef>
     <PropertyDef name="fullWeight">
@@ -271,7 +238,7 @@
     </PropertyDef>
     <PropertyDef name="completeTime">
       <Property name="dataType">DateTime</Property>
-      <Property name="label">瀹屾垚鏃堕棿</Property>
+      <Property name="label">绂诲簱鏃堕棿</Property>
       <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="completeUser">
@@ -336,7 +303,7 @@
     </PropertyDef>
     <PropertyDef name="foodLevel">
       <Property></Property>
-      <Property name="label">绮绛夌骇</Property>
+      <Property name="label">绮瀹氱瓑</Property>
       <Property name="mapping">
         <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
         <Property name="keyProperty">code</Property>
@@ -345,23 +312,16 @@
     </PropertyDef>
     <PropertyDef name="checkUser">
       <Property></Property>
-      <Property name="label">鍖栭獙浜�</Property>
+      <Property name="label">璐ㄦ浜�</Property>
     </PropertyDef>
     <PropertyDef name="checkId">
       <Property></Property>
       <Property name="label">鍖栭獙鍗曞彿</Property>
     </PropertyDef>
-    <PropertyDef name="curStorage">
-      <Property name="dataType">double</Property>
-      <Property name="label">褰撳墠搴撳瓨</Property>
-    </PropertyDef>
     <PropertyDef name="price">
       <Property name="dataType">double</Property>
-      <Property name="label">鍗曚环</Property>
-    </PropertyDef>
-    <PropertyDef name="settleMoney">
-      <Property name="dataType">double</Property>
-      <Property name="label">缁撶畻閲戦</Property>
+      <Property name="label">绮瀹氫环</Property>
+      <Property name="displayFormat">#.00 鍏�/鍏枻</Property>
     </PropertyDef>
     <PropertyDef name="foodType">
       <Property></Property>
@@ -371,22 +331,73 @@
       <Property></Property>
       <Property name="label">閫氱煡鍗曠紪鐮�</Property>
     </PropertyDef>
-    <PropertyDef name="noticeName">
-      <Property></Property>
-      <Property name="label">閫氱煡鍗�</Property>
-    </PropertyDef>
-    <PropertyDef name="price">
-      <Property name="dataType">Double</Property>
-      <Property name="label">鍗曚环</Property>
-      <Property name="displayFormat">#.00 鍏�/鍏枻</Property>
-    </PropertyDef>
-    <PropertyDef name="settleTag">
-      <Property></Property>
-      <Property name="label">鏄惁缁撶畻</Property>
-    </PropertyDef>
     <PropertyDef name="remarks">
       <Property name="label">澶囨敞璇存槑</Property>
     </PropertyDef>
+    <PropertyDef name="foodLocationId">
+      <Property></Property>
+      <Property name="label">浜у湴鍚嶇О浠ｇ爜</Property>
+    </PropertyDef>
+    <PropertyDef name="checkTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">璐ㄦ鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="sampleUser">
+      <Property></Property>
+      <Property name="label">鎵︽牱浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="sampleTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">鎵︽牱鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="sampleType">
+      <Property></Property>
+      <Property name="label">鎵︽牱鏂瑰紡</Property>
+    </PropertyDef>
+    <PropertyDef name="deCheck">
+      <Property name="dataType">double</Property>
+      <Property name="label">璐ㄦ鎵ｉ噸</Property>
+      <Property name="displayFormat">0.0 KG</Property>
+    </PropertyDef>
+    <PropertyDef name="addCheck">
+      <Property name="dataType">double</Property>
+      <Property name="label">璐ㄦ澧為噸</Property>
+      <Property name="displayFormat">0.0 KG</Property>
+    </PropertyDef>
+    <PropertyDef name="jjlx">
+      <Property></Property>
+      <Property name="label">妫�鏂ょ被鍨�</Property>
+    </PropertyDef>
+    <PropertyDef name="dePackage">
+      <Property name="dataType">double</Property>
+      <Property name="label">鍖呰鎵ｉ噸</Property>
+      <Property name="displayFormat">0.0 KG</Property>
+    </PropertyDef>
+    <PropertyDef name="deOtherInfo">
+      <Property></Property>
+      <Property name="label">鍏朵粬鎵ｉ噸鍘熷洜</Property>
+    </PropertyDef>
+    <PropertyDef name="settleId">
+      <Property></Property>
+      <Property name="label">缁撶畻鍗曞彿</Property>
+    </PropertyDef>
+    <PropertyDef name="bzw">
+      <Property></Property>
+      <Property name="label">鍖呰鐗�</Property>
+    </PropertyDef>
+    <PropertyDef name="dbz">
+      <Property name="dataType">Double</Property>
+      <Property name="label">鍗曞寘閲�</Property>
+      <Property name="displayFormat">0.0 KG</Property>
+    </PropertyDef>
+    <PropertyDef name="bzbjs">
+      <Property name="dataType">int</Property>
+      <Property name="label">鍖呬欢鏁�</Property>
+    </PropertyDef>
+    <PropertyDef name="updateTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtInoutSettle">
     <Property name="matchType">com.ld.igds.models.InoutSettle</Property>

--
Gitblit v1.9.3