From 46adcbf7494340a495539708210bb39110bdc33b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 29 十一月 2025 17:35:03 +0800
Subject: [PATCH] 快速登记、化验及称重作业页面提交1
---
fzzy-igdss-view/src/main/java/models/core.model.xml | 486 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 482 insertions(+), 4 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 1bfba3a..3464b49 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -163,9 +163,9 @@
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#getData").getResult()}</Property>
- <Property name="keyProperty">deptId</Property>
- <Property name="valueProperty">deptName</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
</Property>
<Property name="readOnly">true</Property>
</PropertyDef>
@@ -405,7 +405,7 @@
<PropertyDef name="storageReal">
<Property name="dataType">Double</Property>
<Property name="label">瀹為檯鍌ㄩ噺</Property>
- <Property name="displayFormat">#,##0 KG</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="remark">
@@ -433,4 +433,482 @@
<Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtDeviceSer">
+ <Property name="creationType">com.fzzy.igds.domain.DeviceSer</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">鍒嗘満缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="sn">
+ <Property></Property>
+ <Property name="label">搴忓垪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍒嗘満鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="ip">
+ <Property></Property>
+ <Property name="label">鍒嗘満IP</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="port">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鍒嗘満绔彛</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">鍒嗘満绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("SER_TYPE")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="status">
+ <Property></Property>
+ <Property name="label">鏄惁鍦ㄧ嚎</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("sys_yes_no")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="controlModel">
+ <Property></Property>
+ <Property name="label">鎿嶄綔妯″紡</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#controlModel").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="networkType">
+ <Property></Property>
+ <Property name="label">缃戠粶妯″紡</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">01</Property>
+ <Property name="name">鏈夌嚎妯″紡</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">02</Property>
+ <Property name="name">鏃犵嚎妯″紡</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="protocol">
+ <Property></Property>
+ <Property name="label">鍒嗘満鍗忚</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("PROTOCOL")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="isMoreDepot">
+ <Property></Property>
+ <Property name="label">澶氫粨骞跺彂</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">Y</Property>
+ <Property name="name">鏄�</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">N</Property>
+ <Property name="name">鍚�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="producer">
+ <Property></Property>
+ <Property name="label">鍘傚晢鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="orderNum">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">椤哄簭鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="contactPhone">
+ <Property></Property>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="powerModel">
+ <Property></Property>
+ <Property name="label">渚涚數妯″紡</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("POWER_TYPE")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="cableStart">
+ <Property name="dataType">int</Property>
+ <Property name="label">寮�濮嬪垪</Property>
+ </PropertyDef>
+ <PropertyDef name="cableZ">
+ <Property name="dataType">int</Property>
+ <Property name="label">灞傞厤缃�</Property>
+ </PropertyDef>
+ <PropertyDef name="cableY">
+ <Property name="dataType">int</Property>
+ <Property name="label">琛岄厤缃�</Property>
+ </PropertyDef>
+ <PropertyDef name="cableX">
+ <Property name="dataType">int</Property>
+ <Property name="label">鍒楅厤缃�</Property>
+ </PropertyDef>
+ <PropertyDef name="cableType">
+ <Property></Property>
+ <Property name="label">鐢电紗绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("CABLE_TYPE")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="cableFormat">
+ <Property></Property>
+ <Property name="label">鐢电紗鍒跺紡</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("CABLE_FORMAT")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="orgId">
+ <Property></Property>
+ <Property name="label">缁勭粐鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtDeviceIot">
+ <Property name="creationType">com.fzzy.igds.domain.DeviceIot</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">璁惧缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="passCode">
+ <Property name="dataType">int</Property>
+ <Property name="label">璁惧缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="serId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎鏈�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">璁惧绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("DEVICE_IOT_TYPE")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="posX">
+ <Property name="dataType">Double</Property>
+ <Property name="label">X鍧愭爣</Property>
+ </PropertyDef>
+ <PropertyDef name="posY">
+ <Property name="dataType">Double</Property>
+ <Property name="label">Y鍧愭爣</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtDepotConf">
+ <Property name="creationType">com.fzzy.igds.domain.DepotConf</Property>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="grainSer">
+ <Property></Property>
+ <Property name="label">绮儏鍒嗘満</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="thSer">
+ <Property></Property>
+ <Property name="label">娓╂箍搴﹀垎鏈�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="grainFreq">
+ <Property></Property>
+ <Property name="label">淇濆瓨棰戠巼</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("GRAIN_FREQ")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="thConf">
+ <Property></Property>
+ <Property name="label">娓╂箍搴﹂�氶亾</Property>
+ </PropertyDef>
+ <PropertyDef name="cableRule">
+ <Property></Property>
+ <Property name="label">甯冪嚎瑙勫垯</Property>
+ </PropertyDef>
+ <PropertyDef name="cableCir">
+ <Property></Property>
+ <Property name="label">绛掍粨灞傝鍒�</Property>
+ </PropertyDef>
+ <PropertyDef name="cableCone">
+ <Property name="label">绛掍粨閿ュ舰</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerCableCone").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="cableStart">
+ <Property name="dataType">int</Property>
+ <Property name="label">鐢电紗寮�濮嬪垪</Property>
+ </PropertyDef>
+ <PropertyDef name="cableEnd">
+ <Property name="dataType">int</Property>
+ <Property name="label">鐢电紗鎴嚦鍒�</Property>
+ </PropertyDef>
+ <PropertyDef name="startOrientation">
+ <Property></Property>
+ <Property name="label">鐢电紗璧峰鏂逛綅</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStartOrientation").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="startDirection">
+ <Property name="label">鐢电紗甯冪嚎鏂瑰悜</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStartDirection").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="startPoint">
+ <Property name="label">鐢电紗璧峰鐐逛綅</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStartPoint").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="startConvert">
+ <Property name="label">灞傝杞崲</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStartConvert").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="tempMax">
+ <Property name="dataType">Double</Property>
+ <Property name="label">娓╁害涓婇檺</Property>
+ </PropertyDef>
+ <PropertyDef name="temperature">
+ <Property name="dataType">Double</Property>
+ <Property name="label">娓╁樊闃堝��</Property>
+ </PropertyDef>
+ <PropertyDef name="startRow">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">璧峰鏍瑰彿</Property>
+ </PropertyDef>
+ <PropertyDef name="grainAuto">
+ <Property></Property>
+ <Property name="label">绮儏浼樺寲</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">Y</Property>
+ <Property name="name">鏄�</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">N</Property>
+ <Property name="name">鍚�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="depotName">
+ <Property></Property>
+ </PropertyDef>
+ <PropertyDef name="depotType">
+ <Property></Property>
+ </PropertyDef>
+ <PropertyDef name="isOnlyTH">
+ <Property></Property>
+ <Property name="label">绮儏绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="code">Y</Property>
+ <Property name="name">娓╂箍搴﹁澶�</Property>
+ </Entity>
+ <Entity>
+ <Property name="code">N</Property>
+ <Property name="name">绮儏鐢电紗</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ </DataType>
</Model>
--
Gitblit v1.9.3