From 92c29136e298a2b6023f701082c24229733d6768 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 28 七月 2023 16:05:41 +0800
Subject: [PATCH] 熏蒸备案及熏蒸作业
---
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml | 1047 ++++++++++++++++++++++
igds-recir/src/main/java/models/recir.model.xml | 30
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java | 5
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml | 541 +++++++++++
igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java | 272 +++++
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml | 64
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java | 404 ++++++++
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogPR.java | 74
igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java | 133 ++
igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java | 63 +
igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java | 54 +
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java | 4
igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml | 5
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java | 83 +
14 files changed, 2,669 insertions(+), 110 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
index 68c1cf8..750038c 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml
@@ -68,12 +68,12 @@
<Property name="label">澶囨敞璇存槑</Property>
</PropertyDef>
<PropertyDef name="jhxddw">
- <Property/>
+ <Property></Property>
<Property name="label">璁″垝涓嬭揪鍗曚綅</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="jhxddwmc">
- <Property/>
+ <Property></Property>
<Property name="label">璁″垝涓嬭揪鍗曚綅鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="jhxdsj">
@@ -244,26 +244,26 @@
</Button>
<Button layoutConstraint="left">
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
- if(data){
- view.get("#dialogMain").show();
- }</ClientEvent>
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
<Property name="caption">璋冩暣</Property>
<Property name="exClassName">btn-warm</Property>
<Property name="iconClass">fa fa-pencil</Property>
</Button>
<Button layoutConstraint="left">
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
- if(!data){
- return;
- }
- view.get("#ajaxDel").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- }
- });</ClientEvent>
+if(!data){
+ return;
+}
+view.get("#ajaxDel").set("parameter",data).execute(function(result){
+if(result){
+ $alert(result);
+ return;
+}else{
+ data.remove();
+ }
+});</ClientEvent>
<Property name="caption">鍒犻櫎</Property>
<Property name="exClassName">btn-warn</Property>
<Property name="iconClass">fa fa-minus</Property>
@@ -274,7 +274,7 @@
<AutoForm>
<Property name="cols">*,*,*,*,*</Property>
<Property name="dataSet">dsParam</Property>
- <Property name="labelAlign">right</Property>
+ <Property name="labelAlign">left</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">100</Property>
<AutoFormElement>
@@ -322,9 +322,9 @@
</AutoForm>
<DataGrid layoutConstraint="center padding:5px">
<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
- if(data){
- view.get("#dialogMain").show();
- }</ClientEvent>
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
@@ -398,7 +398,7 @@
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
- self.get("parent").hide();</ClientEvent>
+self.get("parent").hide();</ClientEvent>
<Property name="caption">鍙栨秷</Property>
<Property name="iconClass">fa fa-times-circle</Property>
<Property name="width">90</Property>
@@ -533,17 +533,17 @@
</Button>
<Button layoutConstraint="left">
<ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
- if(!data){
- return;
- }
- view.get("#ajaxDelDetail").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- }
- });</ClientEvent>
+if(!data){
+ return;
+}
+view.get("#ajaxDelDetail").set("parameter",data).execute(function(result){
+if(result){
+ $alert(result);
+ return;
+}else{
+ data.remove();
+ }
+});</ClientEvent>
<Property name="caption">鍒犻櫎</Property>
<Property name="exClassName">btn-warn</Property>
<Property name="iconClass">fa fa-minus</Property>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
new file mode 100644
index 0000000..50dc1d6
--- /dev/null
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
@@ -0,0 +1,404 @@
+package com.ld.igds.drug.service;
+
+import com.bstek.bdf2.core.model.DefaultDept;
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.constant.RedisConst;
+import com.ld.igds.models.*;
+import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.RedisUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author:YAN
+ */
+@Service
+public class HDrugLogApplyService extends HibernateDao {
+ @Autowired
+ private RedisUtil redisUtil;
+ /**
+ * 缂撳瓨鐔忚捀澶囨id
+ */
+ public static final String CACHE_DRUG_LOG_APPLY_ID = "DRUG_LOG_APPLY_ID";
+
+ /**
+ * 鍒嗛〉鏌ヨ鐔忚捀浣滀笟涓昏〃淇℃伅
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ public void pageDrugLogApply(Page<DrugLogApply> page, Map<String, Object> param) throws Exception {
+ StringBuffer hql = new StringBuffer();
+ Map<String, Object> args = new HashMap<>();
+ hql.append(" from " + DrugLogApply.class.getName() + " where companyId=:companyId");
+ args.put("companyId", ContextUtil.getCompanyId());
+ if (null != param) {
+ buildHql(hql, param, args);
+ }
+ hql.append(" order by id ");
+ String countHql = "select count(*) " + hql.toString();
+ this.pagingQuery(page, String.valueOf(hql), countHql, args);
+ }
+
+ /**
+ * 鏇存柊鎴栨坊鍔犵啅钂稿妗堜富琛ㄤ俊鎭�
+ *
+ * @param data
+ * @return
+ */
+ public String saveDrugLogApply(DrugLogApply data) {
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ Session session = this.getSessionFactory().openSession();
+ data.setUpdateTime(new Date());
+ try {
+ if (null == data.getId()) {
+ String id = createId(data.getCompanyId());
+ data.setId(id);
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ if (CollectionUtils.isEmpty(data.getDrugLogPeople())) {
+ for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
+ if (null == drugLogPeople.getId()) {
+ drugLogPeople.setId(ContextUtil.getUUID());
+ drugLogPeople.setDrugLogId(data.getId());
+ drugLogPeople.setCompanyId(data.getCompanyId());
+ drugLogPeople.setDeptId(data.getDeptId());
+ session.save(drugLogPeople);
+ } else {
+ session.update(drugLogPeople);
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鐔忚捀澶囨涓昏〃淇℃伅
+ *
+ * @param data
+ * @return
+ */
+ public String delDrugLogApply(DrugLogApply data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
+ session.delete(drugLogPeople);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇DrugLogApply鍒楄〃
+ *
+ * @param param
+ * @throws Exception
+ */
+ public List<DrugLogApply> drugLogApplyList(Map<String, Object> param) throws Exception {
+ StringBuffer hql = new StringBuffer();
+ Map<String, Object> args = new HashMap<>();
+ hql.append(" from " + DrugLogApply.class.getName() + " where companyId=:companyId");
+ args.put("companyId", ContextUtil.getCompanyId());
+ if (null != param) {
+ buildHql(hql, param, args);
+ }
+ hql.append(" order by id desc");
+ return this.query(String.valueOf(hql), args);
+ }
+
+ /**
+ * 鑾峰彇DrugLogDtl鍒楄〃
+ *
+ * @param param
+ * @throws Exception
+ */
+ public List<DrugLogDtl> drugLogDtlList(Map<String, Object> param) throws Exception {
+ StringBuffer hql = new StringBuffer();
+ Map<String, Object> args = new HashMap<>();
+ hql.append(" from " + DrugLogDtl.class.getName() + " where companyId=:companyId");
+ args.put("companyId", ContextUtil.getCompanyId());
+ if (null != param) {
+ buildHql(hql, param, args);
+ }
+ return this.query(String.valueOf(hql), args);
+ }
+
+ /**
+ * 鏇存柊鎴栨坊鍔犵啅钂稿妗堝偍绮鎯呬俊鎭�
+ *
+ * @param data
+ * @return
+ */
+ public String saveDrugLogDtl(DrugLogDtl data) {
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getId()) {
+ data.setId(ContextUtil.getUUID());
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+
+ /**
+ * 鍒犻櫎鐔忚捀澶囨涓昏〃淇℃伅
+ *
+ * @param data
+ * @return
+ */
+ public String delDrugLogDtl(DrugLogDtl data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+
+ /**
+ * 鑾峰彇DrugLogPeople鍒楄〃
+ *
+ * @param param
+ * @throws Exception
+ */
+ public List<DrugLogPeople> drugLogPeopleList(Map<String, Object> param) throws Exception {
+ StringBuffer hql = new StringBuffer();
+ Map<String, Object> args = new HashMap<>();
+ hql.append(" from " + DrugLogPeople.class.getName() + " where companyId=:companyId");
+ args.put("companyId", ContextUtil.getCompanyId());
+ if (null != param) {
+ buildHql(hql, param, args);
+ }
+ return this.query(String.valueOf(hql), args);
+ }
+
+ /**
+ * 鏇存柊鎴栨坊鍔犵啅钂稿伐浣滀汉鍛樹俊鎭�
+ *
+ * @param data
+ * @return
+ */
+ public String saveDrugLogPeople(DrugLogPeople data) {
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getId()) {
+ data.setId(ContextUtil.getUUID());
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+
+ /**
+ * 鍒犻櫎鐔忚捀宸ヤ綔浜哄憳淇℃伅
+ *
+ * @param data
+ * @return
+ */
+ public String delDrugLogPeople(DrugLogPeople data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ /**
+ * 鑾峰彇DrugLogWay鍒楄〃
+ *
+ * @param param
+ * @throws Exception
+ */
+ public List<DrugLogWay> drugLogWayList(Map<String, Object> param) throws Exception {
+ StringBuffer hql = new StringBuffer();
+ Map<String, Object> args = new HashMap<>();
+ hql.append(" from " + DrugLogWay.class.getName() + " where companyId=:companyId");
+ args.put("companyId", ContextUtil.getCompanyId());
+ if (null != param) {
+ buildHql(hql, param, args);
+ }
+ return this.query(String.valueOf(hql), args);
+ }
+
+
+ /**
+ * 鏇存柊鎴栨坊鍔犵啅钂稿妗堜富琛ㄤ俊鎭�
+ *
+ * @param data
+ * @return
+ */
+ public String saveDrugLogWay(DrugLogWay data) {
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (null == data.getDeptId()) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getId()) {
+ data.setId(ContextUtil.getUUID());
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ /**
+ * 鍒犻櫎鐔忚捀澶囨涓昏〃淇℃伅
+ *
+ * @param data
+ * @return
+ */
+ public String delDrugLogWay(DrugLogWay data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ /**
+ * 鏋勫缓hql
+ *
+ * @param hql
+ * @param param
+ * @param args
+ */
+ public void buildHql(StringBuffer hql, Map<String, Object> param, Map<String, Object> args) {
+ String str = (String) param.get("drugLogId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql.append(" and drugLogId=:drugLogId");
+ args.put("drugLogId", str);
+ }
+ str = (String) param.get("depotId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql.append(" and depotId=:depotId");
+ args.put("depotId", str);
+ }
+ Date date = (Date) param.get("start");
+ if (null != date) {
+ hql.append(" and updateTime >=:start");
+ args.put("start", date);
+ }
+ date = (Date) param.get("end");
+ if (null != date) {
+ hql.append(" and updateTime <=:end");
+ args.put("end", date);
+ }
+ }
+
+ public String createId(String companyId) throws Exception {
+
+ // 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
+ String cacheKey = RedisConst.buildKey(companyId, HDrugLogApplyService.CACHE_DRUG_LOG_APPLY_ID);
+
+ String cacheId = (String) redisUtil.get(cacheKey);
+
+ if (null != cacheId) {
+ Integer i = Integer.valueOf(cacheId);
+ cacheId = String.format("%04d", ++i);
+ } else {
+ List<DrugLogApply> drugLogApplies = this.drugLogApplyList(null);
+ if (null == drugLogApplies || drugLogApplies.size() == 0) {
+ cacheId = "0001";
+ } else {
+
+ String temp = drugLogApplies.get(0).getId();
+ Integer i = Integer.valueOf(temp);
+ cacheId = String.format("%04d", ++i);
+ }
+ }
+ // 鏇存柊缂撳瓨
+ redisUtil.set(cacheKey, cacheId);
+
+ return cacheId;
+ }
+}
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
index 7b5a279..fd9718a 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogService.java
@@ -32,6 +32,11 @@
hql += " and depotId =:depotId";
args.put("depotId", str);
}
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and user =:name";
+ args.put("name", "%" + str + "%");
+ }
}
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml
index 4550575..e3439ac 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/Drug.view.xml
@@ -199,11 +199,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">cgrq</Property>
<Property name="property">cgrq</Property>
<Editor/>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
index 58e60f1..e61c1c3 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
@@ -7,7 +7,8 @@
<Property name="creationType">com.ld.igds.models.DrugLog</Property>
<PropertyDef name="id">
<Property></Property>
- <Property name="label">id</Property>
+ <Property name="label">鐔忚捀浣滀笟鍗曞彿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
@@ -51,8 +52,9 @@
</PropertyDef>
<PropertyDef name="dose">
<Property></Property>
- <Property name="label">浣跨敤鍓傞噺</Property>
+ <Property name="label">鎬荤敤鑽噺</Property>
<Property name="dataType">Double</Property>
+ <Property name="displayFormat">##0.000kg</Property>
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
@@ -61,10 +63,12 @@
<PropertyDef name="pestBatchId">
<Property></Property>
<Property name="label">铏妫�娴嬪崟鍙�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="num">
<Property name="dataType">Integer</Property>
<Property name="label">绗嚑娆＄啅钂�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="mode">
<Property></Property>
@@ -117,18 +121,22 @@
<PropertyDef name="drugName">
<Property></Property>
<Property name="label">鑽墏鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="concentration">
<Property name="dataType">Double</Property>
<Property name="label">鑽墏娴撳害</Property>
+ <Property name="displayFormat">#0.000%</Property>
</PropertyDef>
<PropertyDef name="grainDose">
<Property name="dataType">Double</Property>
<Property name="label">绮爢浣跨敤鍓傞噺</Property>
+ <Property name="displayFormat">##0.000g/m鲁</Property>
</PropertyDef>
<PropertyDef name="SpaceDose">
<Property name="dataType">Double</Property>
<Property name="label">绌洪棿浣跨敤鍓傞噺</Property>
+ <Property name="displayFormat">##0.000g/m鲁</Property>
</PropertyDef>
<PropertyDef name="ventilateTime">
<Property name="dataType">Date</Property>
@@ -137,10 +145,12 @@
<PropertyDef name="ventilateMethod">
<Property></Property>
<Property name="label">鏁ｆ皵鏂规硶</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="afterPh3">
<Property name="dataType">Double</Property>
<Property name="label">鏁ｆ皵鍚庢祿搴�</Property>
+ <Property name="displayFormat">##0.000g/m鲁</Property>
</PropertyDef>
<PropertyDef name="evaluate">
<Property></Property>
@@ -165,6 +175,7 @@
<Property name="keyProperty">key</Property>
<Property name="valueProperty">value</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="czsjff">
<Property></Property>
@@ -173,6 +184,261 @@
<PropertyDef name="czclcs">
<Property></Property>
<Property name="label">娈嬫福澶勭悊鎺柦</Property>
+ </PropertyDef>
+ <PropertyDef name="hlxzynhljsjh">
+ <Property></Property>
+ <Property name="label">鐜祦鐔忚捀涓庡唴鐜祦鎶�鏈粨鍚�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">鍒嗗埆浣跨敤_鍥哄畾寮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">鍒嗗埆浣跨敤_绉诲姩寮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">浜屽悎涓�搴旂敤_鍗曞悜鎺у埗</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">浜屽悎涓�搴旂敤_鍙屽悜鎺у埗</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="xzfazd">
+ <Property></Property>
+ <Property name="label">鐔忚捀鏂规鍒跺畾</Property>
+ </PropertyDef>
+ <PropertyDef name="xzfaqcr">
+ <Property></Property>
+ <Property name="label">鐔忚捀鏂规璧疯崏浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="xzfapzr">
+ <Property></Property>
+ <Property name="label">鐔忚捀鏂规鎵瑰噯浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="xzfabbqk">
+ <Property></Property>
+ <Property name="label">鐔忚捀鏂规鎶ュ鎯呭喌</Property>
+ </PropertyDef>
+ <PropertyDef name="syryzzqk">
+ <Property></Property>
+ <Property name="label">鏂借嵂浜哄憳璧勮川鎯呭喌</Property>
+ </PropertyDef>
+ <PropertyDef name="syzzsh">
+ <Property></Property>
+ <Property name="label">鏂借嵂璧勮川瀹℃牳</Property>
+ </PropertyDef>
+ <PropertyDef name="jx">
+ <Property></Property>
+ <Property name="label">鍓傚瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="syff">
+ <Property></Property>
+ <Property name="label">鏂借嵂鏂规硶</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">娼В娉�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">浠撳鍙戠敓鍣�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">閽㈢摱姘�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="fzsycs">
+ <Property></Property>
+ <Property name="label">杈呭姪鏂借嵂鎺柦</Property>
+ </PropertyDef>
+ <PropertyDef name="kqhqjaqjcqk">
+ <Property></Property>
+ <Property name="label">绌烘皵鍛煎惛鍣ㄥ強瀹夊叏妫�鏌ユ儏鍐�</Property>
+ </PropertyDef>
+ <PropertyDef name="lhqjczztsqk">
+ <Property></Property>
+ <Property name="label">纾峰寲姘㈡娴嬭缃皟璇曟儏鍐�</Property>
+ </PropertyDef>
+ <PropertyDef name="yqsdjczztsqk">
+ <Property></Property>
+ <Property name="label">姘ф皵娣卞害妫�娴嬭缃皟璇曟儏鍐�</Property>
+ </PropertyDef>
+ <PropertyDef name="lhqbjyaqjc">
+ <Property></Property>
+ <Property name="label">纾峰寲姘㈡姤璀︿华瀹夊叏妫�鏌�</Property>
+ </PropertyDef>
+ <PropertyDef name="yqbjyaqjc">
+ <Property></Property>
+ <Property name="label">姘ф皵鎶ヨ浠畨鍏ㄦ鏌�</Property>
+ </PropertyDef>
+ <PropertyDef name="byqcnlhqnd">
+ <Property name="dataType">double</Property>
+ <Property name="label">琛ヨ嵂鍓嶄粨鍐呯７鍖栨阿娴撳害</Property>
+ </PropertyDef>
+ <PropertyDef name="nlhqnddw">
+ <Property></Property>
+ <Property name="label">纾峰寲姘㈡祿搴﹀崟浣�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">g/m鲁</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">ppm</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">ml/m鲁</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">%VOL</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="mbnd">
+ <Property name="dataType">double</Property>
+ <Property name="label">鐩爣娴撳害</Property>
+ <Property name="displayFormat">##0.000g/m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="jsbyl">
+ <Property name="dataType">double</Property>
+ <Property name="label">璁＄畻琛ヨ嵂閲�</Property>
+ <Property name="displayFormat">##0.000g</Property>
+ </PropertyDef>
+ <PropertyDef name="sjbyl">
+ <Property name="dataType">double</Property>
+ <Property name="label">瀹為檯琛ヨ嵂閲�</Property>
+ <Property name="displayFormat">##0.000g</Property>
+ </PropertyDef>
+ <PropertyDef name="byff">
+ <Property></Property>
+ <Property name="label">琛ヨ嵂鏂规硶</Property>
+ </PropertyDef>
+ <PropertyDef name="zyrs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">浣滀笟浜烘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="byzypzr">
+ <Property></Property>
+ <Property name="label">琛ヨ嵂浣滀笟鎵瑰噯浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="xczhr">
+ <Property></Property>
+ <Property name="label">鐜板満鎸囨尌浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="fznd">
+ <Property name="dataType">double</Property>
+ <Property name="label">宄板�兼祿搴�</Property>
+ <Property name="displayFormat">##0.000g/m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="mbndwcts">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鐩爣娴撳害缁存寔澶╂暟</Property>
+ </PropertyDef>
+ <PropertyDef name="lswzjc">
+ <Property></Property>
+ <Property name="label">婕忔皵浣嶇疆鐩戞祴</Property>
+ </PropertyDef>
+ <PropertyDef name="lqbwcqdbjcs">
+ <Property></Property>
+ <Property name="label">婕忔皵閮ㄤ綅閲囧彇鐨勮ˉ鏁戞帾鏂�</Property>
+ </PropertyDef>
+ <PropertyDef name="mbsj">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">瀵嗛棴鏃堕棿</Property>
+ <Property name="displayFormat">#澶�</Property>
+ </PropertyDef>
+ <PropertyDef name="ctz">
+ <Property name="dataType">double</Property>
+ <Property name="label">CT鍊�</Property>
+ </PropertyDef>
+ <PropertyDef name="sqqlhqnd">
+ <Property name="dataType">double</Property>
+ <Property name="label">鏁ｆ皵鍓嶇７鍖栨阿娴撳害</Property>
+ <Property name="displayFormat">##0.000g/m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="sqpzr">
+ <Property></Property>
+ <Property name="label">鏁ｆ皵鎵瑰噯浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="sqcsts">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鏁ｆ皵鎸佺画澶╂暟</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="czsjzysj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">娈嬫福鏀堕泦浣滀笟鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="czsjzyrs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">娈嬫福鏀堕泦浣滀笟浜烘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="czsjzypzr">
+ <Property></Property>
+ <Property name="label">娈嬫福鏀堕泦浣滀笟鎵瑰噯浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="czclzyrs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">娈嬫福澶勭悊浣滀笟浜烘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="czclpzr">
+ <Property></Property>
+ <Property name="label">娈嬫福澶勭悊鎵瑰噯浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="xzhhcjcqk">
+ <Property></Property>
+ <Property name="label">鐔忚捀鍚庢椿铏鍑烘儏鍐�</Property>
+ </PropertyDef>
+ <PropertyDef name="xzhckmd">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鐔忚捀鍚庤櫕鍙ｅ瘑搴�</Property>
+ <Property name="displayFormat">#澶�/kg</Property>
+ </PropertyDef>
+ <PropertyDef name="pyswthhcs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鍩瑰吇15澶╁悗娲昏櫕鏁�</Property>
+ <Property name="displayFormat">#澶�/kg</Property>
+ </PropertyDef>
+ <PropertyDef name="pysswthhcs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">鍩瑰吇45澶╁悗娲昏櫕鏁�</Property>
+ <Property name="displayFormat">#澶�/kg</Property>
+ </PropertyDef>
+ <PropertyDef name="xzfzr">
+ <Property></Property>
+ <Property name="label">鐔忚捀璐熻矗浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="xzzyry">
+ <Property></Property>
+ <Property name="label">鐔忚捀浣滀笟浜哄憳</Property>
</PropertyDef>
</DataType>
</Model>
@@ -238,13 +504,11 @@
</TextEditor>
<Trigger id="triggerQuery">
<ClientEvent name="onExecute">var name = view.get("#paramName.text");
-if(null != name && ""!= name){
- view.get("#dsMain").set("parameter",{name:name}).flushAsync();
-}</ClientEvent>
+view.get("#dsMain").set("parameter",{name:name}).flushAsync();</ClientEvent>
<Property name="iconClass">fa fa-search</Property>
</Trigger>
</Container>
- <Container layoutConstraint="center">
+ <Container layout="regionPadding:5" layoutConstraint="center">
<Property name="exClassName">bg-color</Property>
<DataGrid>
<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
@@ -285,7 +549,8 @@
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
<Property name="closeable">false</Property>
<Property name="caption">鐔忚捀淇℃伅</Property>
- <Property name="width">60%</Property>
+ <Property name="width">85%</Property>
+ <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -316,8 +581,19 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelWidth">0</Property>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">--绯荤粺鑷姩鐢熸垚--</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
@@ -361,8 +637,49 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">hlxzynhljsjh</Property>
+ <Property name="property">hlxzynhljsjh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzfazd</Property>
+ <Property name="property">xzfazd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzfaqcr</Property>
+ <Property name="property">xzfaqcr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzfapzr</Property>
+ <Property name="property">xzfapzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzfabbqk</Property>
+ <Property name="property">xzfabbqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">syryzzqk</Property>
+ <Property name="property">syryzzqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">syzzsh</Property>
+ <Property name="property">syzzsh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">drugName</Property>
<Property name="property">drugName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jx</Property>
+ <Property name="property">jx</Property>
+ <Property name="trigger">listDosage</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -386,6 +703,121 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">syff</Property>
+ <Property name="property">syff</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fzsycs</Property>
+ <Property name="property">fzsycs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqhqjaqjcqk</Property>
+ <Property name="property">kqhqjaqjcqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lhqjczztsqk</Property>
+ <Property name="property">lhqjczztsqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yqsdjczztsqk</Property>
+ <Property name="property">yqsdjczztsqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lhqbjyaqjc</Property>
+ <Property name="property">lhqbjyaqjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yqbjyaqjc</Property>
+ <Property name="property">yqbjyaqjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">byqcnlhqnd</Property>
+ <Property name="property">byqcnlhqnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">nlhqnddw</Property>
+ <Property name="property">nlhqnddw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">mbnd</Property>
+ <Property name="property">mbnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jsbyl</Property>
+ <Property name="property">jsbyl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sjbyl</Property>
+ <Property name="property">sjbyl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">byff</Property>
+ <Property name="property">byff</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zyrs</Property>
+ <Property name="property">zyrs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">byzypzr</Property>
+ <Property name="property">byzypzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xczhr</Property>
+ <Property name="property">xczhr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fznd</Property>
+ <Property name="property">fznd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">mbndwcts</Property>
+ <Property name="property">mbndwcts</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lswzjc</Property>
+ <Property name="property">lswzjc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqbwcqdbjcs</Property>
+ <Property name="property">lqbwcqdbjcs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">mbsj</Property>
+ <Property name="property">mbsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ctz</Property>
+ <Property name="property">ctz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqqlhqnd</Property>
+ <Property name="property">sqqlhqnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">ventilateTime</Property>
<Property name="property">ventilateTime</Property>
<Editor/>
@@ -396,8 +828,73 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">sqpzr</Property>
+ <Property name="property">sqpzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqcsts</Property>
+ <Property name="property">sqcsts</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">afterPh3</Property>
<Property name="property">afterPh3</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czsjzysj</Property>
+ <Property name="property">czsjzysj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czsjzyrs</Property>
+ <Property name="property">czsjzyrs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czsjff</Property>
+ <Property name="property">czsjff</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czsjzypzr</Property>
+ <Property name="property">czsjzypzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czclcs</Property>
+ <Property name="property">czclcs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czclzyrs</Property>
+ <Property name="property">czclzyrs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czclpzr</Property>
+ <Property name="property">czclpzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzhhcjcqk</Property>
+ <Property name="property">xzhhcjcqk</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzhckmd</Property>
+ <Property name="property">xzhckmd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pyswthhcs</Property>
+ <Property name="property">pyswthhcs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">pysswthhcs</Property>
+ <Property name="property">pysswthhcs</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -407,13 +904,13 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">czsjff</Property>
- <Property name="property">czsjff</Property>
+ <Property name="name">xzfzr</Property>
+ <Property name="property">xzfzr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">czclcs</Property>
- <Property name="property">czclcs</Property>
+ <Property name="name">xzzyry</Property>
+ <Property name="property">xzzyry</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -422,16 +919,16 @@
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remarks</Property>
- <Property name="property">remarks</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement>
<Property name="name">updateTime</Property>
<Property name="property">updateTime</Property>
<Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">remarks</Property>
+ <Property name="property">remarks</Property>
+ <Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -439,11 +936,15 @@
<Tools/>
</Dialog>
<AjaxAction id="ajaxSave">
- <Property name="service">drugLogPR#updateDrugLog</Property>
+ <Property name="service">drugLogPR#saveDrugLog</Property>
</AjaxAction>
<AjaxAction id="ajaxDel">
<Property name="service">drugLogPR#delDrugLog</Property>
<Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
</AjaxAction>
+ <ListDropDown id="listDosage">
+ <Property name="items">鐗囧墏,娉ㄥ皠鍓�,涔冲墏,涓稿墏,棰楃矑鍓�,鍏朵粬</Property>
+ <Property name="autoOpen">true</Property>
+ </ListDropDown>
</View>
</ViewConfig>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
new file mode 100644
index 0000000..9b461dd
--- /dev/null
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApply.view.xml
@@ -0,0 +1,1047 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.ld.igds.models.DrugLogApply</Property>
+ <PropertyDef name="id">
+ <Property/>
+ <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property/>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="tbrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">濉姤鏃ユ湡</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="dwdm">
+ <Property/>
+ <Property name="label">鍗曚綅浠ｇ爜</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="sqxzrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鐢宠鐔忚捀鏃ユ湡</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="fzr">
+ <Property/>
+ <Property name="label">璐熻矗浜�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="fzrdh">
+ <Property/>
+ <Property name="label">璐熻矗浜虹數璇�</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="xcfzr">
+ <Property/>
+ <Property name="label">鐜板満璐熻矗浜�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="fzrzw">
+ <Property/>
+ <Property name="label">璐熻矗浜鸿亴鍔�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xcfzrdh">
+ <Property/>
+ <Property name="label">鐜板満璐熻矗浜�</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="tbr">
+ <Property/>
+ <Property name="label">濉〃浜�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="tbrdh">
+ <Property/>
+ <Property name="label">濉〃浜虹數璇�</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxd">
+ <Property/>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxx">
+ <Property/>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxn">
+ <Property/>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="sfszjjxb">
+ <Property/>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="ssxzzystqybqk">
+ <Property/>
+ <Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="xzssgcap">
+ <Property/>
+ <Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="aqfhjyjcccs">
+ <Property/>
+ <Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="xzzysx">
+ <Property/>
+ <Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="fileStorageId">
+ <Property/>
+ <Property name="label">鏂囦欢瀛樺偍ID</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="drugName">
+ <Property/>
+ <Property name="label">鑽墏鍚嶇О</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="drugType">
+ <Property/>
+ <Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="yjyxqz">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鑽墏鏈夋晥鏈熻嚦</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="lqsl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">棰嗗彇鏁伴噺</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000鍏枻</Property>
+ </PropertyDef>
+ <PropertyDef name="sysbjfs">
+ <Property/>
+ <Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="zcdd">
+ <Property/>
+ <Property name="label">鏆傚瓨鍦扮偣</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="lqr">
+ <Property/>
+ <Property name="label">棰嗗彇浜�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="required">false</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <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>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <Property/>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodType">
+ <Property/>
+ <Property name="label">绮鎬ц川</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <Property/>
+ <Property name="label">绮绛夌骇</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="number">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮鏁伴噺</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="perWet">
+ <Property name="dataType">Double</Property>
+ <Property name="label">姘村垎</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ </PropertyDef>
+ <PropertyDef name="perImpurity">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏉傝川</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000%</Property>
+ </PropertyDef>
+ <PropertyDef name="lw">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮俯</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000鈩�</Property>
+ </PropertyDef>
+ <PropertyDef name="cnsd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">浠撳唴婀垮害</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000%RH</Property>
+ </PropertyDef>
+ <PropertyDef name="clfs">
+ <Property/>
+ <Property name="label">瀛樼伯鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">鏁ｈ鍌ㄧ伯</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">鍖呰</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">鍥村寘鏁ｅ瓨</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">鍏朵粬</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="rkrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍏ュ簱鏃ユ湡</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="hc">
+ <Property/>
+ <Property name="label">瀹宠櫕</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="cldjpd">
+ <Property/>
+ <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">531</Property>
+ <Property name="value">鍩烘湰鏃犺櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">532</Property>
+ <Property name="value">涓�鑸櫕绮�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">533</Property>
+ <Property name="value">涓ラ噸铏伯</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">534</Property>
+ <Property name="value">鍗遍櫓铏伯</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="ldtj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮爢浣撶Н</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="kjtj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绌洪棿浣撶Н</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="lddwyyl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绮爢鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="kjdwyyl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绌洪棿鍗曚綅鐢ㄨ嵂閲�</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000g/m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="zyyl">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎬荤敤鑽噺</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000kg</Property>
+ </PropertyDef>
+ <PropertyDef name="qmx">
+ <Property/>
+ <Property name="label">姘斿瘑鎬�</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">鈪犵骇;t鈮�300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">鈪＄骇;120s鈮<300s</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">鈪㈢骇;40s鈮<120s (骞虫埧浠�) ,60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">鈪ｇ骇;t<40s (骞虫埧浠�) ,t<60s (绔嬬瓛浠撱�佹祬鍦嗕粨)</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="valueProperty">value</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="jhxzksrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璁″垝鐔忚捀寮�濮嬫棩鏈�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="jhxzjsrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璁″垝鐔忚捀缁撴潫鏃ユ湡</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xznd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璁惧畾鐔忚捀娴撳害</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0.000ml/m鲁</Property>
+ </PropertyDef>
+ <PropertyDef name="mbsj">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">瀵嗛棴鏃堕棿</Property>
+ <Property name="required">true</Property>
+ <Property name="displayFormat">#0澶�</Property>
+ </PropertyDef>
+ <PropertyDef name="xzfs">
+ <Property/>
+ <Property name="label">鐔忚捀鏂瑰紡</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="sqfs">
+ <Property/>
+ <Property name="label">鏁ｆ皵鏂瑰紡</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <Reference name="drugLogPeople">
+ <Property name="parameter">$${this.id}</Property>
+ <Property name="dataType">[dtPeople]</Property>
+ <Property name="dataProvider">drugLogApplyPR#peopleList</Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtPeople">
+ <Property name="creationType">com.ld.igds.models.DrugLogPeople</Property>
+ <PropertyDef name="id">
+ <Property/>
+ <Property name="label">id</Property>
+ </PropertyDef>
+ <PropertyDef name="drugLogId">
+ <Property/>
+ <Property name="label">鐔忚捀澶囨缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property/>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property/>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="mx">
+ <Property/>
+ <Property name="label">濮撳悕</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="zw">
+ <Property/>
+ <Property name="label">鑱屽姟</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="zyzg">
+ <Property/>
+ <Property name="label">鑱屼笟璧勬牸</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="stzk">
+ <Property/>
+ <Property name="label">韬綋鐘跺喌</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xzrwfg">
+ <Property/>
+ <Property name="label">鐔忚捀浠诲姟鍒嗗伐</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="sfwb">
+ <Property/>
+ <Property name="label">鏄惁澶栧寘</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="depotId">
+ <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="start">
+ <Property name="dataType">Date</Property>
+ <Property name="label">澶囨寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="end">
+ <Property name="dataType">Date</Property>
+ <Property name="label">澶囨缁撴潫鏃堕棿</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <ClientEvent name="onReady">view.get("#dsParam").insert({});</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataProvider">drugLogApplyPR#pageData</Property>
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <Property name="dataType">dtParam</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert({});
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="caption">娣诲姞</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(!data){
+ return;
+}
+view.get("#ajaxDel").set("parameter",data).execute(function(result){
+if(result){
+ $alert(result);
+ return;
+}else{
+ data.remove();
+ }
+});</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <AutoForm>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">start</Property>
+ <Property name="property">start</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">end</Property>
+ <Property name="property">end</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:15">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ <DataGrid layoutConstraint="center padding:5">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn>
+ <Property name="caption">搴忓彿</Property>
+ </RowNumColumn>
+ <DataColumn name="id">
+ <Property name="property">id</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sqxzrq">
+ <Property name="property">sqxzrq</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fzr">
+ <Property name="property">fzr</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fzrdh">
+ <Property name="property">fzrdh</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="xcfzr">
+ <Property name="property">xcfzr</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fzrzw">
+ <Property name="property">fzrzw</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="drugName">
+ <Property name="property">drugName</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lqsl">
+ <Property name="property">lqsl</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
+ <Property name="caption">澶囨淇℃伅</Property>
+ <Property name="width">85%</Property>
+ <Property name="height">85%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-flag-o</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if(data.validate() != 'ok'){
+ $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
+ return;
+}
+view.get("#uaAction").set("parameter",data).execute();
+self.get("parent").hide();</ClientEvent>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">---绯荤粺鑷姩鐢熸垚---</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbrq</Property>
+ <Property name="property">tbrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqxzrq</Property>
+ <Property name="property">sqxzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fzr</Property>
+ <Property name="property">fzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fzrdh</Property>
+ <Property name="property">fzrdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xcfzr</Property>
+ <Property name="property">xcfzr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fzrzw</Property>
+ <Property name="property">fzrzw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xcfzrdh</Property>
+ <Property name="property">xcfzrdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbr</Property>
+ <Property name="property">tbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tbrdh</Property>
+ <Property name="property">tbrdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxd</Property>
+ <Property name="property">sfszjjxd</Property>
+ <Property name="trigger">listYesOrNo</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxx</Property>
+ <Property name="property">sfszjjxx</Property>
+ <Property name="trigger">listYesOrNo</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxn</Property>
+ <Property name="property">sfszjjxn</Property>
+ <Property name="trigger">listYesOrNo</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfszjjxb</Property>
+ <Property name="property">sfszjjxb</Property>
+ <Property name="trigger">listYesOrNo</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileStorageId</Property>
+ <Property name="property">fileStorageId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">drugName</Property>
+ <Property name="property">drugName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">drugType</Property>
+ <Property name="property">drugType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yjyxqz</Property>
+ <Property name="property">yjyxqz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqsl</Property>
+ <Property name="property">lqsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sysbjfs</Property>
+ <Property name="property">sysbjfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcdd</Property>
+ <Property name="property">zcdd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lqr</Property>
+ <Property name="property">lqr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">ssxzzystqybqk</Property>
+ <Property name="property">ssxzzystqybqk</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">xzssgcap</Property>
+ <Property name="property">xzssgcap</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">aqfhjyjcccs</Property>
+ <Property name="property">aqfhjyjcccs</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:4">
+ <Property name="name">xzzysx</Property>
+ <Property name="property">xzzysx</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">绮儏淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodType</Property>
+ <Property name="property">foodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodLevel</Property>
+ <Property name="property">foodLevel</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">number</Property>
+ <Property name="property">number</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">perWet</Property>
+ <Property name="property">perWet</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">perImpurity</Property>
+ <Property name="property">perImpurity</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lw</Property>
+ <Property name="property">lw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cnsd</Property>
+ <Property name="property">cnsd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">clfs</Property>
+ <Property name="property">clfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkrq</Property>
+ <Property name="property">rkrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hc</Property>
+ <Property name="property">hc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cldjpd</Property>
+ <Property name="property">cldjpd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ldtj</Property>
+ <Property name="property">ldtj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kjtj</Property>
+ <Property name="property">kjtj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lddwyyl</Property>
+ <Property name="property">lddwyyl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kjdwyyl</Property>
+ <Property name="property">kjdwyyl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zyyl</Property>
+ <Property name="property">zyyl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qmx</Property>
+ <Property name="property">qmx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxzksrq</Property>
+ <Property name="property">jhxzksrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxzjsrq</Property>
+ <Property name="property">jhxzjsrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="regionPadding:5">
+ <Property name="caption">鐔忚捀鏂瑰紡</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelPosition">top</Property>
+ <Property name="labelSeparator">:</Property>
+ <AutoFormElement>
+ <Property name="name">xznd</Property>
+ <Property name="property">xznd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">mbsj</Property>
+ <Property name="property">mbsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzfs</Property>
+ <Property name="property">xzfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sqfs</Property>
+ <Property name="property">sqfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">鐔忚捀宸ヤ綔浜哄憳</Property>
+ <Property name="height">400</Property>
+ <Buttons/>
+ <Children>
+ <Container layout="regionPadding:10">
+ <Property name="height">55</Property>
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var list = view.get("#dsMain.data:#").get("drugLogPeople");
+list.insert({});</ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dataGridDetail.currentEntity");
+if(!data){
+ return;
+}
+view.get("#ajaxDelPeople").set("parameter",data).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ data.remove();
+ }
+});</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ </Button>
+ </Container>
+ <DataGrid id="dataGridDetail">
+ <Property name="dataPath">#.drugLogPeople</Property>
+ <Property name="dataSet">dsMain</Property>
+ <DataColumn name="mx">
+ <Property name="property">mx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zw">
+ <Property name="property">zw</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zyzg">
+ <Property name="property">zyzg</Property>
+ <Property name="trigger">listEligible</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="stzk">
+ <Property name="property">stzk</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="xzrwfg">
+ <Property name="property">xzrwfg</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sfwb">
+ <Property name="property">sfwb</Property>
+ <Property name="align">center</Property>
+ <Property name="trigger">listYesOrNo</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaAction">
+ <Property name="dataResolver">drugLogApplyPR#saveDrugLogApply</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">drugLogApplyPR#delDrugLogApply</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxDelPeople">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">drugLogApplyPR#delDrugLogPeople</Property>
+ </AjaxAction>
+ <ListDropDown id="listYesOrNo">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ <ListDropDown id="listEligible">
+ <Property name="items">鍒濈骇,涓骇,楂樼骇</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
new file mode 100644
index 0000000..f61c84b
--- /dev/null
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogApplyPR.java
@@ -0,0 +1,83 @@
+package com.ld.igds.drug.view;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.drug.service.HDrugLogApplyService;
+import com.ld.igds.models.DrugLogApply;
+import com.ld.igds.models.DrugLogPeople;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author:YAN
+ */
+@Component
+public class DrugLogApplyPR {
+ @Autowired
+ private HDrugLogApplyService drugLogApplyService;
+
+ /**
+ * drugLogApplyPR#pageData
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageData(Page<DrugLogApply> page, Map<String, Object> param) throws Exception {
+ drugLogApplyService.pageDrugLogApply(page, param);
+ }
+
+ /**
+ * drugLogApplyPR#peopleList
+ *
+ * @param id
+ * @return
+ * @throws Exception
+ */
+ @DataProvider
+ public List<DrugLogPeople> peopleList(String id) throws Exception {
+ Map<String, Object> param = new HashMap<>();
+ param.put("drugLogId", id);
+ return drugLogApplyService.drugLogPeopleList(param);
+ }
+
+ /**
+ * drugLogApplyPR#saveDrugLogApply 鏂板鎴栬�呬慨鏀�
+ *
+ * @param data
+ * @throws Exception
+ */
+ @DataResolver
+ public String saveDrugLogApply(DrugLogApply data) throws Exception {
+ drugLogApplyService.saveDrugLogApply(data);
+ return "";
+ }
+
+ /**
+ * drugLogApplyPR#delDrugLogApply
+ *
+ * @throws Exception
+ */
+ @Expose
+ public String delDrugLogApply(DrugLogApply data) throws Exception {
+ return drugLogApplyService.delDrugLogApply(data);
+ }
+
+ /**
+ * drugLogApplyPR#delDrugLogPeople
+ *
+ * @throws Exception
+ */
+ @Expose
+ public String delDrugLogPeople(DrugLogPeople data) throws Exception {
+ return drugLogApplyService.delDrugLogPeople(data);
+ }
+
+}
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogPR.java b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogPR.java
index dfd5cc3..fffb6ba 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogPR.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLogPR.java
@@ -1,5 +1,6 @@
package com.ld.igds.drug.view;
+
import java.util.Map;
import com.ld.igds.drug.service.HDrugLogService;
@@ -9,57 +10,56 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.drug.service.HDrugService;
import com.ld.igds.models.DrugLog;
/**
* 鐔忚捀绠＄悊鐨凱R
- *
+ *
* @author:
* @description:
* @version:
* @data:2020骞�3鏈�6鏃�
- *
*/
@Component("drugLogPR")
public class DrugLogPR {
- @Autowired
- private HDrugLogService drugLogService;
+ @Autowired
+ private HDrugLogService drugLogService;
- /**
- * drugLogPR#pageDrugLog
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pageDrugLog(Page<DrugLog> page, Map<String, Object> param)
- throws Exception {
- drugLogService.pageData(page, param);
- }
+ /**
+ * drugLogPR#pageDrugLog
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageDrugLog(Page<DrugLog> page, Map<String, Object> param)
+ throws Exception {
+ drugLogService.pageData(page, param);
+ }
- /**
- * drugLogPR#delDrugLog
- *
- * @param data
- * @throws Exception
- */
- @Expose
- public String delDrugLog(DrugLog data) throws Exception {
- return drugLogService.delData(data);
- }
+ /**
+ * drugLogPR#delDrugLog
+ *
+ * @param data
+ * @throws Exception
+ */
+ @Expose
+ public String delDrugLog(DrugLog data) throws Exception {
+ return drugLogService.delData(data);
+ }
- /**
- * drugLogPR#updateDrugLog 鏂板鎴栬�呬慨鏀�
- *
- * @param data
- * @throws Exception
- */
- @Expose
- public String updateDrugLog(DrugLog data) throws Exception {
- drugLogService.saveData(data);
- return "";
- }
+ /**
+ * drugLogPR#saveDrugLog 鏂板鎴栬�呬慨鏀�
+ *
+ * @param data
+ * @throws Exception
+ */
+ @Expose
+ public String saveDrugLog(DrugLog data) throws Exception {
+ drugLogService.saveData(data);
+ return "";
+ }
}
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
index 86aeecf..8935bb3 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
@@ -42,10 +42,12 @@
@Column(name = "START_")
@PropertyDef(label = "寮�濮嬫椂闂�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date start;
@Column(name = "END_")
@PropertyDef(label = "鎴嚦鏃堕棿")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date end;
@Column(name = "PEST_BATCH_ID_", length = 50)
@@ -151,7 +153,7 @@
@PropertyDef(label = "纾峰寲姘㈡祿搴﹀崟浣�", description = "1锛歡/m鲁(榛樿);2锛歱pm;3:ml/m鲁;4锛�%VOL")
@Column(name = "nlhqnddw", length = 1)
- private String nlhqnddw;
+ private String nlhqnddw = "1";
@PropertyDef(label = "鐩爣娴撳害", description = "鍗曚綅锛歡/m鲁")
@Column(name = "mbnd", precision = 20, scale = 3)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
new file mode 100644
index 0000000..e9e08b8
--- /dev/null
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogApply.java
@@ -0,0 +1,272 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鐔忚捀浣滀笟涓昏〃淇℃伅
+ *
+ * @Author:YAN
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_APPLY")
+public class DrugLogApply implements Serializable {
+
+ @Id
+ @Column(name = "ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ private String id;
+
+ @Id
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
+
+ @Column(name = "dwdm", length = 18)
+ @PropertyDef(label = "鍗曚綅浠ｇ爜", description = "浼佷笟淇＄敤浠ｇ爜")
+ private String dwdm;
+
+ @Column(name = "sqxzrq")
+ @PropertyDef(label = "鐢宠鐔忚捀鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date sqxzrq;
+
+ @Column(name = "fzr", length = 20)
+ @PropertyDef(label = "璐熻矗浜�")
+ private String fzr;
+
+ @Column(name = "fzrdh", length = 11)
+ @PropertyDef(label = "璐熻矗浜虹數璇�")
+ private String fzrdh;
+
+ @Column(name = "xcfzr", length = 20)
+ @PropertyDef(label = "鐜板満璐熻矗浜�")
+ private String xcfzr;
+
+ @Column(name = "fzrzw", length = 10)
+ @PropertyDef(label = "璐熻矗浜鸿亴鍔�")
+ private String fzrzw;
+
+ @Column(name = "xcfzrdh", length = 11)
+ @PropertyDef(label = "鐜板満璐熻矗浜�")
+ private String xcfzrdh;
+
+ @Column(name = "tbr", length = 20)
+ @PropertyDef(label = "濉〃浜�")
+ private String tbr;
+
+ @Column(name = "tbrdh", length = 11)
+ @PropertyDef(label = "濉〃浜虹數璇�")
+ private String tbrdh;
+
+ @Column(name = "sfszjjxd", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(涓�)", description = "鏄垨鍚�")
+ private String sfszjjxd;
+
+ @Column(name = "sfszjjxx", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(瑗�)", description = "鏄垨鍚�")
+ private String sfszjjxx;
+
+ @Column(name = "sfszjjxn", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍗�)", description = "鏄垨鍚�")
+ private String sfszjjxn;
+
+ @Column(name = "sfszjjxb", length = 2)
+ @PropertyDef(label = "鏄惁璁剧疆璀︽垝绾�(鍖�)", description = "鏄垨鍚�")
+ private String sfszjjxb;
+
+ @Column(name = "ssxzzystqybqk", length = 1024)
+ @PropertyDef(label = "瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�")
+ private String ssxzzystqybqk;
+
+ @Column(name = "xzssgcap", length = 1024)
+ @PropertyDef(label = "鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�")
+ private String xzssgcap;
+
+ @Column(name = "aqfhjyjcccs", length = 1024)
+ @PropertyDef(label = "瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�")
+ private String aqfhjyjcccs;
+
+ @Column(name = "xzzysx", length = 1024)
+ @PropertyDef(label = "鐔忚捀娉ㄦ剰浜嬮」")
+ private String xzzysx;
+
+ @Column(name = "FILE_STORAGE_ID_", length = 19)
+ @PropertyDef(label = "鏂囦欢瀛樺偍ID")
+ private String fileStorageId;
+
+ @Column(name = "DRUG_NAME_", length = 64)
+ @PropertyDef(label = "鑽墏鍚嶇О")
+ private String drugName;
+
+ @Column(name = "DRUG_TYPE_", length = 10)
+ @PropertyDef(label = "鑽墏绫诲瀷/鍨嬪彿")
+ private String drugType;
+
+ @Column(name = "yjyxqz")
+ @PropertyDef(label = "鑽墏鏈夋晥鏈熻嚦")
+ private Date yjyxqz;
+
+ @Column(name = "lqsl", precision = 20, scale = 3)
+ @PropertyDef(label = "棰嗗彇鏁伴噺", description = "鍏枻")
+ private Double lqsl;
+
+ @Column(name = "sysbjfs", length = 20)
+ @PropertyDef(label = "鏂借嵂璁惧鍙婃柟寮�")
+ private String sysbjfs;
+
+ @Column(name = "zcdd", length = 30)
+ @PropertyDef(label = "鏆傚瓨鍦扮偣")
+ private String zcdd;
+
+ @Column(name = "lqr", length = 20)
+ @PropertyDef(label = "棰嗗彇浜�")
+ private String lqr;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
+
+ /**
+ * 鍌ㄧ伯绮儏鏄庣粏琛�
+ */
+// @Transient
+// private List<DrugLogDtl> drugLogDtls;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "NUMBER_", precision = 20, scale = 3)
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬惃")
+ private Double number = 0.0;
+
+ @Column(name = "PER_WET_", precision = 20, scale = 3)
+ @PropertyDef(label = "姘村垎", description = "鍗曚綅锛�%")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
+ @PropertyDef(label = "鏉傝川", description = "鍗曚綅锛�%")
+ private Double perImpurity;
+
+ @Column(name = "lw", precision = 20, scale = 3)
+ @PropertyDef(label = "绮俯")
+ private Double lw;
+
+ @Column(name = "cnsd", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double cnsd;
+
+ @Column(name = "clfs", length = 1)
+ @PropertyDef(label = "瀛樼伯鏂瑰紡", description = "1锛氭暎瑁呭偍绮�;2锛氬寘瑁�;3锛氬洿鍖呮暎瀛�;9锛氬叾浠�")
+ private String clfs;
+
+ @Column(name = "rkrq")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rkrq;
+
+ @Column(name = "hc", length = 30)
+ @PropertyDef(label = "瀹宠櫕")
+ private String hc;
+
+ @Column(name = "cldjpd", length = 3)
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String cldjpd;
+
+ @Column(name = "ldtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢浣撶Н", description = "m鲁")
+ private Double ldtj;
+
+ @Column(name = "kjtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿浣撶Н", description = "m鲁")
+ private Double kjtj;
+
+ @Column(name = "lddwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+ private Double lddwyyl;
+
+ @Column(name = "kjdwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+ private Double kjdwyyl;
+
+ @Column(name = "zyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "鎬荤敤鑽噺")
+ private Double zyyl;
+ /**
+ * 浠撴埧姘斿瘑鎬т互 500 Pa 鐨勫帇鍔涘崐琛� 鏈� t 鍒嗕负鍥涗釜绛夌骇銆�
+ * 1锛� 鈪犵骇锛宼鈮�300s銆�
+ * 2锛� 鈪＄骇锛�120s鈮<300s銆�
+ * 3锛氣參绾э紝40s鈮<120s (骞虫埧浠�) 锛� 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ * 4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ */
+ @Column(name = "qmx", length = 1)
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @Column(name = "jhxzksrq")
+ @PropertyDef(label = "璁″垝鐔忚捀寮�濮嬫棩鏈�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzksrq;
+
+ @Column(name = "jhxzjsrq")
+ @PropertyDef(label = "璁″垝鐔忚捀缁撴潫鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzjsrq;
+
+ /**
+ * 鐔忚捀澶囨鏂瑰紡
+ */
+// @Transient
+// private List<DrugLogWay> drugLogWays;
+ @Column(name = "xznd", precision = 20, scale = 3)
+ @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
+ private Double xznd;
+
+ @Column(name = "mbsj")
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ private Integer mbsj;
+
+ @Column(name = "xzfs", length = 30)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡")
+ private String xzfs;
+
+ @Column(name = "sqfs", length = 30)
+ @PropertyDef(label = "鏁ｆ皵鏂瑰紡")
+ private String sqfs;
+
+ /**
+ * 鐔忚捀浣滀笟浜哄憳
+ */
+ @Transient
+ private List<DrugLogPeople> drugLogPeople;
+
+}
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
new file mode 100644
index 0000000..633b681
--- /dev/null
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
@@ -0,0 +1,133 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
+ *
+ * @Author:YAN
+ */
+@Entity
+@Data
+@Table(name = "D_DRUG_LOG_DTL")
+public class DrugLogDtl implements Serializable {
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @Column(name = "NUMBER_", precision = 20, scale = 3)
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬惃")
+ private Double number = 0.0;
+
+ @Column(name = "PER_WET_", precision = 20, scale = 3)
+ @PropertyDef(label = "姘村垎", description = "鍗曚綅锛�%")
+ private Double perWet;
+
+ @Column(name = "PER_IMPURITY_", precision = 20, scale = 3)
+ @PropertyDef(label = "鏉傝川", description = "鍗曚綅锛�%")
+ private Double perImpurity;
+
+ @Column(name = "lw", precision = 20, scale = 3)
+ @PropertyDef(label = "绮俯")
+ private Double lw;
+
+ @Column(name = "cnsd", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撳唴婀垮害")
+ private Double cnsd;
+
+ @Column(name = "clfs", length = 1)
+ @PropertyDef(label = "瀛樼伯鏂瑰紡", description = "1锛氭暎瑁呭偍绮�;2锛氬寘瑁�;3锛氬洿鍖呮暎瀛�;9锛氬叾浠�")
+ private String clfs;
+
+ @Column(name = "rkrq")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date rkrq;
+
+ @Column(name = "hc", length = 30)
+ @PropertyDef(label = "瀹宠櫕")
+ private String hc;
+
+ @Column(name = "cldjpd", length = 3)
+ @PropertyDef(label = "铏伯绛夌骇鍒ゅ畾")
+ private String cldjpd;
+
+ @Column(name = "ldtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢浣撶Н", description = "m鲁")
+ private Double ldtj;
+
+ @Column(name = "kjtj", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿浣撶Н", description = "m鲁")
+ private Double kjtj;
+
+ @Column(name = "lddwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绮爢鍗曚綅鐢ㄨ嵂閲�")
+ private Double lddwyyl;
+
+ @Column(name = "kjdwyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "绌洪棿鍗曚綅鐢ㄨ嵂閲�")
+ private Double kjdwyyl;
+
+ @Column(name = "zyyl", precision = 20, scale = 3)
+ @PropertyDef(label = "鎬荤敤鑽噺")
+ private Double zyyl;
+ /**
+ * 浠撴埧姘斿瘑鎬т互 500 Pa 鐨勫帇鍔涘崐琛� 鏈� t 鍒嗕负鍥涗釜绛夌骇銆�
+ * 1锛� 鈪犵骇锛宼鈮�300s銆�
+ * 2锛� 鈪＄骇锛�120s鈮<300s銆�
+ * 3锛氣參绾э紝40s鈮<120s (骞虫埧浠�) 锛� 60s鈮� t<120s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆� 4锛氣叄绾э紝t<40s (骞虫埧浠�) 锛宼<60s (绔嬬瓛浠撱�佹祬鍦嗕粨) 銆�
+ */
+ @Column(name = "qmx", length = 1)
+ @PropertyDef(label = "姘斿瘑鎬�")
+ private String qmx;
+
+ @Column(name = "jhxzksrq")
+ @PropertyDef(label = "璁″垝鐔忚捀寮�濮嬫棩鏈�")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzksrq;
+
+ @Column(name = "jhxzjsrq")
+ @PropertyDef(label = "璁″垝鐔忚捀缁撴潫鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date jhxzjsrq;
+
+}
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
new file mode 100644
index 0000000..eb48fe8
--- /dev/null
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogPeople.java
@@ -0,0 +1,63 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 鐔忚捀浣滀笟浜哄憳淇℃伅琛�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_PEOPLE")
+public class DrugLogPeople implements Serializable {
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "mx", length = 20)
+ @PropertyDef(label = "濮撳悕")
+ private String mx;
+
+ @Column(name = "zw", length = 10)
+ @PropertyDef(label = "鑱屽姟")
+ private String zw;
+
+ @Column(name = "zyzg", length = 6)
+ @PropertyDef(label = "鑱屼笟璧勬牸", description = "鍒濈骇/涓骇/楂樼骇")
+ private String zyzg;
+
+ @Column(name = "stzk", length = 10)
+ @PropertyDef(label = "韬綋鐘跺喌")
+ private String stzk;
+
+ @Column(name = "xzrwfg", length = 30)
+ @PropertyDef(label = "鐔忚捀浠诲姟鍒嗗伐")
+ private String xzrwfg;
+
+ @Column(name = "sfwb", length = 2)
+ @PropertyDef(label = "鏄惁澶栧寘", description = "鏄�/鍚�")
+ private String sfwb;
+
+}
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
new file mode 100644
index 0000000..8c57292
--- /dev/null
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogWay.java
@@ -0,0 +1,54 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * 鐔忚捀澶囨鏂瑰紡琛�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DRUG_LOG_WAY")
+public class DrugLogWay implements Serializable {
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "id")
+ private String id;
+
+ @Column(name = "DRUG_LOG_ID_", length = 4)
+ @PropertyDef(label = "鐔忚捀澶囨缂栧彿", description = "4浣嶉『搴忓彿")
+ private String drugLogId;
+
+ @Column(name = "DEPT_ID_", length = 21)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String deptId;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "xznd", precision = 20, scale = 3)
+ @PropertyDef(label = "璁惧畾鐔忚捀娴撳害", description = "鍗曚綅锛歮l/m鲁")
+ private Double xznd;
+
+ @Column(name = "mbsj")
+ @PropertyDef(label = "瀵嗛棴鏃堕棿", description = "鍗曚綅锛氬ぉ")
+ private Integer mbsj;
+
+ @Column(name = "xzfs", length = 30)
+ @PropertyDef(label = "鐔忚捀鏂瑰紡")
+ private String xzfs;
+
+ @Column(name = "sqfs", length = 30)
+ @PropertyDef(label = "鏁ｆ皵鏂瑰紡")
+ private String sqfs;
+}
diff --git a/igds-recir/src/main/java/models/recir.model.xml b/igds-recir/src/main/java/models/recir.model.xml
index 1cafba1..b27ceb3 100644
--- a/igds-recir/src/main/java/models/recir.model.xml
+++ b/igds-recir/src/main/java/models/recir.model.xml
@@ -42,21 +42,21 @@
<Property name="label">澶囨敞淇℃伅</Property>
</PropertyDef>
<PropertyDef name="deptId">
- <Property/>
+ <Property></Property>
<Property name="label">鎵�灞炲簱鍖�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
- <Property name="required">true</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="deptName">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳尯鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="dwdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍗曚綅浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="cgrq">
@@ -65,7 +65,7 @@
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="bzw">
- <Property/>
+ <Property></Property>
<Property name="label">鍖呰鐗�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("drugPR#triggerPackage").getResult()}</Property>
@@ -75,29 +75,29 @@
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="ggxh">
- <Property/>
+ <Property></Property>
<Property name="label">鍨嬪彿瑙勬牸</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="aqsysms">
- <Property/>
+ <Property></Property>
<Property name="label">瀹夊叏浣跨敤璇存槑涔�</Property>
</PropertyDef>
<PropertyDef name="sccj">
- <Property/>
+ <Property></Property>
<Property name="label">鐢熶骇鍘傚</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cgly">
- <Property/>
+ <Property></Property>
<Property name="label">閲囪喘鏉ユ簮</Property>
</PropertyDef>
<PropertyDef name="cctj">
- <Property/>
+ <Property></Property>
<Property name="label">瀛樺偍鏉′欢</Property>
</PropertyDef>
<PropertyDef name="ccdd">
- <Property/>
+ <Property></Property>
<Property name="label">鍌ㄥ瓨鍦扮偣</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("drugPR#triggerLocation").getResult()}</Property>
@@ -107,21 +107,21 @@
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="bzwclfs">
- <Property/>
+ <Property></Property>
<Property name="label">鍖呰鐗╁鐞嗘柟寮�</Property>
</PropertyDef>
<PropertyDef name="czclfs">
- <Property/>
+ <Property></Property>
<Property name="label">娈嬫福澶勭悊鏂瑰紡</Property>
</PropertyDef>
<PropertyDef name="bzq">
- <Property/>
+ <Property></Property>
<Property name="label">淇濊川鏈�</Property>
<Property name="required">true</Property>
<Property name="dataType">Date</Property>
</PropertyDef>
<PropertyDef name="kcsldw">
- <Property/>
+ <Property></Property>
<Property name="label">搴撳瓨閲忓崟浣�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("drugPR#triggerUnit").getResult()}</Property>
--
Gitblit v1.9.3