From d54186539b00fab8f4b639752aaf9b758c914ffd Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 21 七月 2023 17:05:56 +0800
Subject: [PATCH] 出入库检斤、货位卡
---
igds-inout/src/main/java/models/inout.model.xml | 172 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 111 insertions(+), 61 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..69a099a 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -9,7 +9,7 @@
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
- <Property name="label">瀹㈡埛绫诲瀷</Property>
+ <Property name="label">涓氬姟鍒嗙被</Property>
<Property name="mapping">
<Property name="mapValues">
<Collection>
@@ -34,12 +34,12 @@
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
- <Property name="label">鍗曚綅鍚嶅悕绉�</Property>
+ <Property name="label">瀹㈡埛鍚嶇О</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cardId">
<Property></Property>
- <Property name="label">韬唤璇佸彿</Property>
+ <Property name="label">鑱旂郴浜鸿韩浠借瘉鍙�</Property>
</PropertyDef>
<PropertyDef name="address">
<Property></Property>
@@ -68,6 +68,40 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="khlx">
+ <Property></Property>
+ <Property name="label">瀹㈡埛绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("contractManagePR#triggerCustomerType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="khbh">
+ <Property></Property>
+ <Property name="label">瀹㈡埛缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="fddbr">
+ <Property></Property>
+ <Property name="label">娉曞畾浠ｈ〃浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="yzbm">
+ <Property></Property>
+ <Property name="label">閭斂缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="dzyx">
+ <Property></Property>
+ <Property name="label">鐢靛瓙淇＄</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtInoutRecord">
@@ -156,14 +190,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 +204,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 +212,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 +272,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 +337,7 @@
</PropertyDef>
<PropertyDef name="foodLevel">
<Property></Property>
- <Property name="label">绮绛夌骇</Property>
+ <Property name="label">绮瀹氱瓑</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
<Property name="keyProperty">code</Property>
@@ -345,23 +346,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 +365,78 @@
<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>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerSampleType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </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