From 256f9c48f2c52985a094a220b644d60d24cb6ed4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 14 十月 2025 09:49:32 +0800
Subject: [PATCH] 省质检报告提交
---
igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java | 44
igds-core/src/main/java/com/ld/igds/models/CheckItemSyy.java | 98 ++
igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java | 6
igds-core/src/main/java/com/ld/igds/models/CheckItemDm.java | 104 ++
igds-core/src/main/java/com/ld/igds/m/view/QualityManager1.view.xml | 1718 +++++++++++++++++++++++++++++++++++++++
igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java | 6
igds-core/src/main/java/com/ld/igds/models/CheckItemDd.java | 86 +
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 93 ++
igds-core/src/main/java/com/ld/igds/models/MQuality.java | 158 +++
igds-core/src/main/java/com/ld/igds/models/CheckItemXmf.java | 110 ++
igds-core/src/main/java/com/ld/igds/m/view/QualityManager1PR.java | 194 ++++
11 files changed, 2,614 insertions(+), 3 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
index f0422a7..84abd33 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
@@ -1,14 +1,18 @@
package com.ld.igds.check;
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.check.dto.CheckUpdateResult;
import com.ld.igds.check.service.CoreCheckStandardService;
+import com.ld.igds.models.*;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 妫�楠岄」 ---- 绠＄悊涓氬姟
@@ -16,7 +20,7 @@
* @author: chen
*/
@Component(CheckStandardManager.BEAN_ID)
-public class CheckStandardManager {
+public class CheckStandardManager extends HibernateDao {
public static final String BEAN_ID = "check.checkStandardManager";
@@ -92,4 +96,91 @@
}
return result;
}
+
+ /************鐪佽川妫�鎶ュ憡妫�楠岄」**************/
+
+ /**
+ * 澶ц眴
+ * @param param
+ * @return
+ */
+ public List<CheckItemDd> findDataDd(Map<String, Object> param){
+ String hql = " from " + CheckItemDd.class.getName()
+ + " where 1 =1";
+
+ Map<String,Object> args = new HashMap<String,Object>();
+ if(null != param){
+ String str = (String) param.get("qlyOrgReportId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and qlyOrgReportId =:qlyOrgReportId";
+ args.put("qlyOrgReportId", str);
+ }
+ }
+ hql += " order by qlyOrgReportSoybeanId";
+ return this.query(hql, args);
+ }
+
+ /**
+ * 澶х背
+ * @param param
+ * @return
+ */
+ public List<CheckItemDm> findDataDm(Map<String, Object> param){
+ String hql = " from " + CheckItemDm.class.getName()
+ + " where 1 =1";
+
+ Map<String,Object> args = new HashMap<String,Object>();
+ if(null != param){
+ String str = (String) param.get("qlyOrgReportId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and qlyOrgReportId =:qlyOrgReportId";
+ args.put("qlyOrgReportId", str);
+ }
+ }
+ hql += " order by qlyOrgReportRiceId";
+ return this.query(hql, args);
+ }
+
+ /**
+ * 澶х背
+ * @param param
+ * @return
+ */
+ public List<CheckItemXmf> findDataXmf(Map<String, Object> param){
+ String hql = " from " + CheckItemXmf.class.getName()
+ + " where 1 =1";
+
+ Map<String,Object> args = new HashMap<String,Object>();
+ if(null != param){
+ String str = (String) param.get("qlyOrgReportId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and qlyOrgReportId =:qlyOrgReportId";
+ args.put("qlyOrgReportId", str);
+ }
+ }
+ hql += " order by qlyOrgReportNoodlesId";
+ return this.query(hql, args);
+ }
+
+ /**
+ * 澶х背
+ * @param param
+ * @return
+ */
+ public List<CheckItemSyy> findDataSyy(Map<String, Object> param){
+ String hql = " from " + CheckItemSyy.class.getName()
+ + " where 1 =1";
+
+ Map<String,Object> args = new HashMap<String,Object>();
+ if(null != param){
+ String str = (String) param.get("qlyOrgReportId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and qlyOrgReportId =:qlyOrgReportId";
+ args.put("qlyOrgReportId", str);
+ }
+ }
+ hql += " order by qlyOrgReportOilId";
+ return this.query(hql, args);
+ }
+
}
\ No newline at end of file
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
index 65b2400..66494a8 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
@@ -6,7 +6,7 @@
import com.bstek.dorado.annotation.Expose;
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.check.service.HCheckStandardService;
-import com.ld.igds.models.CheckStandard;
+import com.ld.igds.models.*;
import com.ld.igds.sys.service.SysDeptService;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
@@ -125,4 +125,46 @@
return result;
}
+
+ /**
+ * 鐪佽川妫�鎶ュ憡妫�楠岄」-澶ц眴
+ * checkStandardPR#listCheckItemsDdByParam
+ */
+ @DataProvider
+ @Expose
+ public List<CheckItemDd> listCheckItemsDdByParam(Map<String, Object> param) {
+ return checkStandardManager.findDataDd(param);
+ }
+
+ /**
+ * 鐪佽川妫�鎶ュ憡妫�楠岄」-灏忛害绮�
+ *
+ * checkStandardPR#listCheckItemsXmfByParam
+ */
+ @DataProvider
+ @Expose
+ public List<CheckItemXmf> listCheckItemsXmfByParam(Map<String, Object> param) {
+ return checkStandardManager.findDataXmf(param);
+ }
+
+ /**
+ * 鐪佽川妫�鎶ュ憡妫�楠岄」-澶х背
+ * checkStandardPR#listCheckItemsDmByParam
+ */
+ @DataProvider
+ @Expose
+ public List<CheckItemDm> listCheckItemsDmByParam(Map<String, Object> param) {
+ return checkStandardManager.findDataDm(param);
+ }
+
+ /**
+ * 鐪佽川妫�鎶ュ憡妫�楠岄」-椋熺敤娌�
+ * checkStandardPR#listCheckItemsSyyByParam
+ */
+ @DataProvider
+ @Expose
+ public List<CheckItemSyy> listCheckItemsSyyByParam(Map<String, Object> param) {
+ return checkStandardManager.findDataSyy(param);
+ }
+
}
diff --git a/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java b/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java
index e149c87..e8d166b 100644
--- a/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java
+++ b/igds-core/src/main/java/com/ld/igds/m/service/HQualityManageService.java
@@ -51,6 +51,12 @@
args.put("type", str);
}
+ str = (String) param.get("provReserve");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and provReserve =:provReserve";
+ args.put("provReserve", str);
+ }
+
Date date = (Date) param.get("start");
if (null != date) {
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager1.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager1.view.xml
new file mode 100644
index 0000000..610089b
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager1.view.xml
@@ -0,0 +1,1718 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <ClientEvent name="onDataChange">if(arg.property =="depotId"){
+ autoByDepot(arg.newValue);
+}
+if(arg.property =="foodVariety"){
+ checkByFood(arg.newValue);
+} </ClientEvent>
+ <Property name="creationType">com.ld.igds.models.MQuality</Property>
+ <PropertyDef name="id">
+ <Property name="label">ID</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property name="label">搴撳尯缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property name="label">妫�娴嬩粨搴�</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <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>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="foodLevel">
+ <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>
+ <Property name="label">绮绛夌骇</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property name="label">妫�楠岀被鍒�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="standard">
+ <Property name="label">妫�楠屼緷鎹�</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="user">
+ <Property name="label">妫�楠屼汉</Property>
+ </PropertyDef>
+ <PropertyDef name="time">
+ <Property name="label">妫�楠屾椂闂�</Property>
+ <Property name="dataType">DateTime</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="result">
+ <Property name="label">妫�楠岀粨璁�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="checkArea">
+ <Property name="label">鎵︽牱鍖哄煙</Property>
+ </PropertyDef>
+ <PropertyDef name="checkUser">
+ <Property name="label">鎵︽牱浜�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="ypsl">
+ <Property name="label">鏍峰搧鏁伴噺</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">0.## KG</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="checkTime">
+ <Property name="label">鎵︽牱鏃堕棿</Property>
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="dbsl">
+ <Property name="label">浠ｈ〃鏁伴噺</Property>
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">0.## KG</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="ypdj">
+ <Property name="label">鏍峰搧绛夌骇</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>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="normalYear">
+ <Property name="label">姝ｅ父瀛樺偍骞撮檺</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鏄�</Property>
+ <Property name="code">1</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鍚�</Property>
+ <Property name="code">0</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="storeDate">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍏ュ簱鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="unit">
+ <Property></Property>
+ <Property name="label">妫�楠屽崟浣�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="zblb">
+ <Property></Property>
+ <Property name="label">鎸囨爣绫诲埆</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="qfrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">绛惧彂鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="bgcjsj">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎶ュ憡鍑哄叿鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="shrxm">
+ <Property></Property>
+ <Property name="label">瀹℃牳浜哄鍚�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="qydbh">
+ <Property></Property>
+ <Property name="label">鎵︽牱鍗曠紪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="jdrxm">
+ <Property></Property>
+ <Property name="label">鐩戠潱浜哄鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="ypbh">
+ <Property></Property>
+ <Property name="label">鏍峰搧缂栧彿</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="spaqzbsfhg">
+ <Property></Property>
+ <Property name="label">椋熷搧鏄惁鍚堟牸</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">0-涓嶅悎鏍�</Property>
+ <Property name="code">0</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">1-鍚堟牸</Property>
+ <Property name="code">1</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="reportType">
+ <Property name="label">鎶ュ憡绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">1-鍗曚綅妫�楠�</Property>
+ <Property name="code">1</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">2-鏁翠綋妫�楠�(鍔犳潈骞冲潎)</Property>
+ <Property name="code">2</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">3-鍏朵粬</Property>
+ <Property name="code">3</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="fileId">
+ <Property></Property>
+ <Property name="label">闄勪欢id</Property>
+ </PropertyDef>
+ <PropertyDef name="fileName">
+ <Property></Property>
+ <Property name="label">闄勪欢鍚嶇О</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="fileTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">闄勪欢涓婁紶鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="qlyOrgReportId">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡id</Property>
+ </PropertyDef>
+ <PropertyDef name="orderId">
+ <Property></Property>
+ <Property name="label">璁㈠崟琛↖D</Property>
+ </PropertyDef>
+ <PropertyDef name="sampleId">
+ <Property></Property>
+ <Property name="label">鏍峰搧琛↖D</Property>
+ </PropertyDef>
+ <PropertyDef name="orgId">
+ <Property></Property>
+ <Property name="label">鏈烘瀯琛↖D</Property>
+ </PropertyDef>
+ <PropertyDef name="qualityOrgId">
+ <Property></Property>
+ <Property name="label">璐ㄦ鏈烘瀯缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="qualityOrgName">
+ <Property></Property>
+ <Property name="label">璐ㄦ鏈烘瀯鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="gysxydm">
+ <Property></Property>
+ <Property name="label">渚涘簲鍟嗕俊鐢ㄤ唬鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqybh">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="jlqymc">
+ <Property></Property>
+ <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="kdbm">
+ <Property></Property>
+ <Property name="label">搴撶偣缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="kdmc">
+ <Property></Property>
+ <Property name="label">搴撶偣鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionType">
+ <Property></Property>
+ <Property name="label">妫�娴嬫姤鍛婄被鍨�</Property>
+ </PropertyDef>
+ <PropertyDef name="deletctionNumber">
+ <Property></Property>
+ <Property name="label">妫�娴嬫姤鍛婄紪鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="jlcpmc">
+ <Property></Property>
+ <Property name="label">鍐涚伯浜у搧鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="jllspz">
+ <Property></Property>
+ <Property name="label">鍐涚伯绮鍝佺</Property>
+ </PropertyDef>
+ <PropertyDef name="lotNumber">
+ <Property></Property>
+ <Property name="label">鎵瑰彿</Property>
+ </PropertyDef>
+ <PropertyDef name="specificationModel">
+ <Property></Property>
+ <Property name="label">瑙勬牸鍨嬪彿</Property>
+ </PropertyDef>
+ <PropertyDef name="cysm">
+ <Property></Property>
+ <Property name="label">鎶芥牱璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="registration">
+ <Property></Property>
+ <Property name="label">鐧昏鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="inspectPlan">
+ <Property></Property>
+ <Property name="label">妫�楠屾柟妗�</Property>
+ </PropertyDef>
+ <PropertyDef name="productType">
+ <Property></Property>
+ <Property name="label">浜у搧绫诲瀷</Property>
+ </PropertyDef>
+ <PropertyDef name="cyjs">
+ <Property></Property>
+ <Property name="label">鎶芥牱鍩烘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="cysl">
+ <Property></Property>
+ <Property name="label">鎶芥牱鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="sampler">
+ <Property></Property>
+ <Property name="label">鎶芥牱浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="samplerTime">
+ <Property></Property>
+ <Property name="label">鎶芥牱鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="samplerArea">
+ <Property></Property>
+ <Property name="label">鎶芥牱鍦扮偣</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鐢熶骇鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="isActive">
+ <Property></Property>
+ <Property name="label">鏄惁鏈夋晥</Property>
+ </PropertyDef>
+ <PropertyDef name="reportFile">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡鏂囦欢</Property>
+ </PropertyDef>
+ <PropertyDef name="createDate">
+ <Property></Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateDate">
+ <Property></Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ </PropertyDef>
+ <Reference name="orgReportRiceList">
+ <Property name="dataProvider">checkStandardPR#listCheckItemsDmByParam</Property>
+ <Property name="dataType">[dtDm]</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="qlyOrgReportId">$${this.qlyOrgReportId}</Property>
+ </Entity>
+ </Property>
+ </Reference>
+ <Reference name="orgReportNoodlesList">
+ <Property name="dataProvider">checkStandardPR#listCheckItemsXmfByParam</Property>
+ <Property name="dataType">[dtXmf]</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="qlyOrgReportId">$${this.qlyOrgReportId}</Property>
+ </Entity>
+ </Property>
+ </Reference>
+ <Reference name="orgReportSoybeanList">
+ <Property name="dataProvider">checkStandardPR#listCheckItemsDdByParam</Property>
+ <Property name="dataType">[dtDd]</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="qlyOrgReportId">$${this.qlyOrgReportId}</Property>
+ </Entity>
+ </Property>
+ </Reference>
+ <Reference name="orgReportOilList">
+ <Property name="dataProvider">checkStandardPR#listCheckItemsSyyByParam</Property>
+ <Property name="dataType">[dtSyy]</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="qlyOrgReportId">$${this.qlyOrgReportId}</Property>
+ </Entity>
+ </Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtQualityParam">
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property name="label">妫�楠岀被鍒�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}</Property>
+ <Property name="keyProperty">code</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>
+ <DataType name="dataTypeUser">
+ <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property>
+ <PropertyDef name="password">
+ <Property name="dataType">String</Property>
+ <Property name="label">瀵嗙爜</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="minLength">6</Property>
+ </Validator>
+ <Validator type="custom">
+ <ClientEvent name="onValidate">if (arg.entity.get("confirmPassword")){
+ arg.entity.validate("confirmPassword");
+ }
+ </ClientEvent>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="confirmPassword">
+ <Property name="dataType">String</Property>
+ <Property name="label">纭瀵嗙爜</Property>
+ <Property name="required">true</Property>
+ <Validator type="custom">
+ <ClientEvent name="onValidate">var confirm = arg.data;
+ var password = arg.entity.get("password");
+ if (confirm ==password) {
+ arg.result = { state:"ok"}
+ } else {
+ arg.result = { state:"error", text: "涓ゆ瀵嗙爜涓嶄竴鑷�"}; 
+ }
+ </ClientEvent>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="salt">
+ <Property name="dataType">String</Property>
+ </PropertyDef>
+ <PropertyDef name="male">
+ <Property name="dataType">boolean</Property>
+ <Property name="label">鎬у埆</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">true</Property>
+ <Property name="value">鐢�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">false</Property>
+ <Property name="value">濂�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="defaultValue">true</Property>
+ </PropertyDef>
+ <PropertyDef name="enabled">
+ <Property name="dataType">boolean</Property>
+ <Property name="label">鏄惁鍙敤</Property>
+ <Property name="defaultValue">true</Property>
+ </PropertyDef>
+ <PropertyDef name="birthday">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍑虹敓鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="address">
+ <Property name="dataType">String</Property>
+ <Property name="label">鍦板潃</Property>
+ <Validator type="length">
+ <Property name="maxLength">120</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="username">
+ <Property name="dataType">String</Property>
+ <Property name="label">鐢ㄦ埛鍚�</Property>
+ <Property name="required">true</Property>
+ <Validator type="ajax">
+ <Property name="service">bdf2.userMaintain#userIsExists</Property>
+ </Validator>
+ <Validator type="length">
+ <Property name="maxLength">60</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="cname">
+ <Property name="dataType">String</Property>
+ <Property name="label">涓枃鍚�</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="minLength">2</Property>
+ <Property name="maxLength">60</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="ename">
+ <Property name="dataType">String</Property>
+ <Property name="label">鑻辨枃鍚�</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="maxLength">60</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="administrator">
+ <Property name="dataType">boolean</Property>
+ <Property name="label">鏄惁涓虹鐞嗗憳</Property>
+ </PropertyDef>
+ <PropertyDef name="mobile">
+ <Property name="dataType">String</Property>
+ <Property name="label">鎵嬫満</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="maxLength">11</Property>
+ <Property name="minLength">11</Property>
+ <Property name="resultMessage">璇疯緭鍏�11浣嶆墜鏈哄彿鐮�</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="email">
+ <Property name="dataType">String</Property>
+ <Property name="label">閭</Property>
+ <Property name="required">true</Property>
+ <Validator type="regExp">
+ <Property name="resultMessage">閭鏍煎紡杈撳叆閿欒</Property>
+ <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$
+ </Property>
+ <Property name="validateMode">whiteBlack</Property>
+ </Validator>
+ <Validator type="length">
+ <Property name="maxLength">120</Property>
+ </Validator>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property name="dataType">String</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtDd">
+ <ClientEvent name="onDataChange"> </ClientEvent>
+ <Property name="creationType">com.ld.igds.models.CheckItemDd</Property>
+ <PropertyDef name="qlyOrgReportSoybeanId">
+ <Property></Property>
+ <Property name="label">澶ц眴璐ㄦ缁撴灉ID</Property>
+ </PropertyDef>
+ <PropertyDef name="qlyOrgReportId">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡绠＄悊id</Property>
+ </PropertyDef>
+ <PropertyDef name="completeParticle">
+ <Property></Property>
+ <Property name="label">瀹屾暣绮掔巼</Property>
+ </PropertyDef>
+ <PropertyDef name="damageParticle">
+ <Property></Property>
+ <Property name="label">鎹熶激绮掔巼</Property>
+ </PropertyDef>
+ <PropertyDef name="damageParticleHot">
+ <Property></Property>
+ <Property name="label">鐑崯浼ょ矑鐜�</Property>
+ </PropertyDef>
+ <PropertyDef name="waterContent">
+ <Property></Property>
+ <Property name="label">姘村垎鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="colorOdor">
+ <Property></Property>
+ <Property name="label">鑹叉辰姘斿懗</Property>
+ </PropertyDef>
+ <PropertyDef name="impurityContent">
+ <Property></Property>
+ <Property name="label">鏉傝川鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="transgenosisCamv">
+ <Property></Property>
+ <Property name="label">CAMV35S</Property>
+ </PropertyDef>
+ <PropertyDef name="transgenosisNos">
+ <Property></Property>
+ <Property name="label">NOS</Property>
+ </PropertyDef>
+ <PropertyDef name="transgenosisCoFour">
+ <Property></Property>
+ <Property name="label">CO4EPSPS</Property>
+ </PropertyDef>
+ <PropertyDef name="lection">
+ <Property></Property>
+ <Property name="label">LECTION</Property>
+ </PropertyDef>
+ <PropertyDef name="qualityResult">
+ <Property></Property>
+ <Property name="label">璐ㄩ噺鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionPerson">
+ <Property></Property>
+ <Property name="label">妫�楠屼汉</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionStartTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionEndTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬬粨鏉熸椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="inspectionResult">
+ <Property></Property>
+ <Property name="label">妫�楠岀粨璁�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtDm">
+ <ClientEvent name="onDataChange"> </ClientEvent>
+ <Property name="creationType">com.ld.igds.models.CheckItemDm</Property>
+ <PropertyDef name="qlyOrgReportRiceId">
+ <Property></Property>
+ <Property name="label">澶х背璐ㄦ缁撴灉ID</Property>
+ </PropertyDef>
+ <PropertyDef name="qlyOrgReportId">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡绠＄悊id</Property>
+ </PropertyDef>
+ <PropertyDef name="brokenRice">
+ <Property></Property>
+ <Property name="label">纰庣背鎬婚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="smallBrokenRice">
+ <Property></Property>
+ <Property name="label">灏忕绫冲惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="processingAccuracy">
+ <Property></Property>
+ <Property name="label">鍔犲伐绮惧害</Property>
+ </PropertyDef>
+ <PropertyDef name="colorOdor">
+ <Property></Property>
+ <Property name="label">鑹叉辰姘斿懗</Property>
+ </PropertyDef>
+ <PropertyDef name="impuriryContent">
+ <Property></Property>
+ <Property name="label">鏉傝川鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="tastingValue">
+ <Property></Property>
+ <Property name="label">鍝佸皾璇勫垎鍊�</Property>
+ </PropertyDef>
+ <PropertyDef name="amyloseContent">
+ <Property></Property>
+ <Property name="label">鐩撮摼娣�绮夊惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="waterContent">
+ <Property></Property>
+ <Property name="label">姘村垎鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="incompleteContent">
+ <Property></Property>
+ <Property name="label">涓嶅畬鍠勭矑鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="inorganicContent">
+ <Property></Property>
+ <Property name="label">鏃犳満鏉傝川鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="yellowRiceContent">
+ <Property></Property>
+ <Property name="label">榛勭矑绫冲惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="mixingRate">
+ <Property></Property>
+ <Property name="label">浜掓贩鐜�</Property>
+ </PropertyDef>
+ <PropertyDef name="aflatioxin">
+ <Property></Property>
+ <Property name="label">榛勬洸闇夋瘨绱�</Property>
+ </PropertyDef>
+ <PropertyDef name="cadmium">
+ <Property></Property>
+ <Property name="label">闀�</Property>
+ </PropertyDef>
+ <PropertyDef name="inorganicArsenic">
+ <Property></Property>
+ <Property name="label">鏃犳満鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="qualityResult">
+ <Property></Property>
+ <Property name="label">璐ㄩ噺鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionPerson">
+ <Property></Property>
+ <Property name="label">妫�楠屼汉</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionStartTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionEndTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬬粨鏉熸椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="inspectionResult">
+ <Property></Property>
+ <Property name="label">妫�楠岀粨璁�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtXmf">
+ <ClientEvent name="onDataChange"> </ClientEvent>
+ <Property name="creationType">com.ld.igds.models.CheckItemXmf</Property>
+ <PropertyDef name="qlyOrgReportNoodlesId">
+ <Property></Property>
+ <Property name="label">灏忛害绮夎川妫�缁撴灉ID</Property>
+ </PropertyDef>
+ <PropertyDef name="qlyOrgReportId">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡绠＄悊id</Property>
+ </PropertyDef>
+ <PropertyDef name="processingAccuracy">
+ <Property></Property>
+ <Property name="label">鍔犲伐绮惧害</Property>
+ </PropertyDef>
+ <PropertyDef name="colorOdor">
+ <Property></Property>
+ <Property name="label">鑹叉辰姘斿懗</Property>
+ </PropertyDef>
+ <PropertyDef name="waterContent">
+ <Property></Property>
+ <Property name="label">姘村垎鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="cadmium">
+ <Property></Property>
+ <Property name="label">闀�</Property>
+ </PropertyDef>
+ <PropertyDef name="qualityResult">
+ <Property></Property>
+ <Property name="label">璐ㄩ噺鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionPerson">
+ <Property></Property>
+ <Property name="label">妫�楠屼汉</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionStartTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionEndTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬬粨鏉熸椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="inspectionResult">
+ <Property></Property>
+ <Property name="label">妫�楠岀粨璁�</Property>
+ </PropertyDef>
+ <PropertyDef name="ashContent">
+ <Property></Property>
+ <Property name="label">鐏板垎鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="fattyContent">
+ <Property></Property>
+ <Property name="label">鑴傝偑閰稿惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="sandContent">
+ <Property></Property>
+ <Property name="label">鍚爞閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="looksForm">
+ <Property></Property>
+ <Property name="label">澶栬褰㈡��</Property>
+ </PropertyDef>
+ <PropertyDef name="wetGluten">
+ <Property></Property>
+ <Property name="label">婀块潰绛嬪惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="deoxynivalenol">
+ <Property></Property>
+ <Property name="label">鑴辨哀闆厫闀板垁鑿岀儻閱�</Property>
+ </PropertyDef>
+ <PropertyDef name="zearalenone">
+ <Property></Property>
+ <Property name="label">鐜夌背璧ら湁鐑叜</Property>
+ </PropertyDef>
+ <PropertyDef name="lead">
+ <Property></Property>
+ <Property name="label">閾�</Property>
+ </PropertyDef>
+ <PropertyDef name="benzoylPeroxide">
+ <Property></Property>
+ <Property name="label">杩囨哀鍖栬嫰鐢查叞</Property>
+ </PropertyDef>
+ <PropertyDef name="reportFile">
+ <Property></Property>
+ <Property name="label">鎶ュ憡鏂囦欢</Property>
+ </PropertyDef>
+ <PropertyDef name="hfhljg">
+ <Property></Property>
+ <Property name="label">鐏板垎鍚噺缁撴灉</Property>
+ </PropertyDef>
+ <PropertyDef name="zfshljg">
+ <Property></Property>
+ <Property name="label">鑴傝偑閰稿惈閲忕粨鏋�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtSyy">
+ <ClientEvent name="onDataChange"> </ClientEvent>
+ <Property name="creationType">com.ld.igds.models.CheckItemSyy</Property>
+ <PropertyDef name="qlyOrgReportOilId">
+ <Property></Property>
+ <Property name="label">椋熺敤娌硅川妫�缁撴灉ID</Property>
+ </PropertyDef>
+ <PropertyDef name="qlyOrgReportId">
+ <Property></Property>
+ <Property name="label">璐ㄦ鎶ュ憡绠＄悊id</Property>
+ </PropertyDef>
+ <PropertyDef name="colorLustre">
+ <Property></Property>
+ <Property name="label">鑹叉辰</Property>
+ </PropertyDef>
+ <PropertyDef name="transparency">
+ <Property></Property>
+ <Property name="label">閫忔槑搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="odorTaste">
+ <Property></Property>
+ <Property name="label">姘斿懗婊嬪懗</Property>
+ </PropertyDef>
+ <PropertyDef name="waterVolatileContent">
+ <Property></Property>
+ <Property name="label">姘村垎鍙婃尌鍙戠墿鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="insolubleContent">
+ <Property></Property>
+ <Property name="label">涓嶆憾鎬ф潅璐ㄥ惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="acidValue">
+ <Property></Property>
+ <Property name="label">閰镐环</Property>
+ </PropertyDef>
+ <PropertyDef name="peroxideValue">
+ <Property></Property>
+ <Property name="label">杩囨哀鍖栧��</Property>
+ </PropertyDef>
+ <PropertyDef name="heatingTest">
+ <Property></Property>
+ <Property name="label">鍔犵儹璇曢獙</Property>
+ </PropertyDef>
+ <PropertyDef name="aflatioxin">
+ <Property></Property>
+ <Property name="label">榛勬洸闇夋瘨绱�</Property>
+ </PropertyDef>
+ <PropertyDef name="benzoPyrene">
+ <Property></Property>
+ <Property name="label">鑻苟鑺�</Property>
+ </PropertyDef>
+ <PropertyDef name="bha">
+ <Property></Property>
+ <Property name="label">BHA</Property>
+ </PropertyDef>
+ <PropertyDef name="bht">
+ <Property></Property>
+ <Property name="label">BHT</Property>
+ </PropertyDef>
+ <PropertyDef name="tbhq">
+ <Property></Property>
+ <Property name="label">TBHQ</Property>
+ </PropertyDef>
+ <PropertyDef name="qualityResult">
+ <Property></Property>
+ <Property name="label">璐ㄩ噺鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionPerson">
+ <Property></Property>
+ <Property name="label">妫�楠屼汉</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionStartTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬪紑濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="delectionEndTime">
+ <Property></Property>
+ <Property name="label">妫�娴嬬粨鏉熸椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="inspectionResult">
+ <Property></Property>
+ <Property name="label">妫�楠岀粨璁�</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
+
+/**
+ * 棰勮PDF鏂囦欢
+ */
+showFilePdf = function(){
+ var cur = view.get("#dsMain.data:#");
+ var fileName = cur.get("fileId");
+ var fileTime = new Date(cur.get("fileTime")).formatDate("y-m-d H:i:s");
+ if(!fileName){
+ $alert("娌℃湁鑾峰彇鍒版枃浠跺悕绉帮紝鏃犳硶棰勮銆�");
+ return;
+ }
+ if(!cur.get("fileTime")){
+ $alert("娌℃湁鑾峰彇鍒伴檮浠朵笂浼犳椂闂达紝鏃犳硶璁块棶銆�");
+ return;
+ }
+ 
+ var url = "./basic/file/show-pdf?fileName="+fileName+"&fileTime="+fileTime+"&filePathType=common";
+ 
+ window.open(url, "_blank");
+};</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
+ <DataSet id="dsMain">
+ <Property name="loadMode">lazy</Property>
+ <Property name="dataProvider">qualityManager1PR#listQuality</Property>
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({});</ClientEvent>
+ <Property name="dataType">dtQualityParam</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="contentOverflow">hidden</Property>
+ <Property name="height">55</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">view.get("#dsMain").flushAsync();
+ </ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">showFilePdf();</ClientEvent>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="caption">鏌ョ湅璐ㄦ闄勪欢</Property>
+ <Property name="iconClass">fa fa-picture-o</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+if (!data) {
+ $alert("璇峰厛閫夋嫨鏁版嵁锛�");
+ return;
+}
+printBill();</ClientEvent>
+ <Property name="caption">鎵撳嵃璐ㄦ鎶ュ憡</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-print</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="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">110</Property>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">type</Property>
+ <Property name="property">type</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="hbox regionPadding:15">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data");
+view.get("#dsMain").set("parameter",param.toJSON()).flushAsync(); </ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});</ClientEvent>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="caption">閲嶇疆</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ <DataGrid layoutConstraint="center padding:5px">
+ <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/>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="orderId">
+ <Property name="property">orderId</Property>
+ </DataColumn>
+ <DataColumn name="sampleId">
+ <Property name="property">sampleId</Property>
+ </DataColumn>
+ <DataColumn name="orgId">
+ <Property name="property">orgId</Property>
+ </DataColumn>
+ <DataColumn name="qualityOrgId">
+ <Property name="property">qualityOrgId</Property>
+ </DataColumn>
+ <DataColumn name="qualityOrgName">
+ <Property name="property">qualityOrgName</Property>
+ </DataColumn>
+ <DataColumn name="gysxydm">
+ <Property name="property">gysxydm</Property>
+ </DataColumn>
+ <DataColumn name="jlqybh">
+ <Property name="property">jlqybh</Property>
+ </DataColumn>
+ <DataColumn name="jlqymc">
+ <Property name="property">jlqymc</Property>
+ </DataColumn>
+ <DataColumn name="kdbm">
+ <Property name="property">kdbm</Property>
+ </DataColumn>
+ <DataColumn name="kdmc">
+ <Property name="property">kdmc</Property>
+ </DataColumn>
+ <DataColumn name="delectionType">
+ <Property name="property">delectionType</Property>
+ </DataColumn>
+ <DataColumn name="deletctionNumber">
+ <Property name="property">deletctionNumber</Property>
+ </DataColumn>
+ <DataColumn name="jlcpmc">
+ <Property name="property">jlcpmc</Property>
+ </DataColumn>
+ <DataColumn name="jllspz">
+ <Property name="property">jllspz</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layout="regionPadding:10" layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="itemCodes">pageSize,pages</Property>
+ <Property name="dataSet">dsMain</Property>
+ </DataPilot>
+ </Container>
+ <Dialog id="dialogMain">
+ <ClientEvent name="beforeShow">var data = view.get("#dsMain.data:#")
+var metricsBefore = data.get("zblb")
+if(metricsBefore){
+ var list = metricsBefore.split("#");
+ var metrics ="" ;
+ list.forEach(item=>{
+ if(item == 1)metrics+="1:璐ㄩ噺鎸囨爣妫�楠�#";
+ if(item == 2)metrics+="2:鍌ㄥ瓨鍝佽川妫�楠�#";
+ if(item == 3)metrics+="3:椋熷搧瀹夊叏妫�楠�#"; 
+ });
+ data.set("zblb", metrics.substring(0,metrics.length-1));
+}</ClientEvent>
+ <Property name="visible">false</Property>
+ <Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
+ <Property name="width">80%</Property>
+ <Property name="height">720</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+ self.get("parent").hide();
+ </ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet layout="padding:5">
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement>
+ <Property name="name">qlyOrgReportId</Property>
+ <Property name="property">qlyOrgReportId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orderId</Property>
+ <Property name="property">orderId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sampleId</Property>
+ <Property name="property">sampleId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgId</Property>
+ <Property name="property">orgId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qualityOrgId</Property>
+ <Property name="property">qualityOrgId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qualityOrgName</Property>
+ <Property name="property">qualityOrgName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gysxydm</Property>
+ <Property name="property">gysxydm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqybh</Property>
+ <Property name="property">jlqybh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlqymc</Property>
+ <Property name="property">jlqymc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kdbm</Property>
+ <Property name="property">kdbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kdmc</Property>
+ <Property name="property">kdmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">delectionType</Property>
+ <Property name="property">delectionType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deletctionNumber</Property>
+ <Property name="property">deletctionNumber</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jlcpmc</Property>
+ <Property name="property">jlcpmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jllspz</Property>
+ <Property name="property">jllspz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lotNumber</Property>
+ <Property name="property">lotNumber</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">specificationModel</Property>
+ <Property name="property">specificationModel</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cysm</Property>
+ <Property name="property">cysm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">registration</Property>
+ <Property name="property">registration</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">inspectPlan</Property>
+ <Property name="property">inspectPlan</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">productType</Property>
+ <Property name="property">productType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cyjs</Property>
+ <Property name="property">cyjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cysl</Property>
+ <Property name="property">cysl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sampler</Property>
+ <Property name="property">sampler</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">samplerTime</Property>
+ <Property name="property">samplerTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">samplerArea</Property>
+ <Property name="property">samplerArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">isActive</Property>
+ <Property name="property">isActive</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createDate</Property>
+ <Property name="property">createDate</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createBy</Property>
+ <Property name="property">createBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateDate</Property>
+ <Property name="property">updateDate</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateBy</Property>
+ <Property name="property">updateBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileId</Property>
+ <Property name="property">fileId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileName</Property>
+ <Property name="property">fileName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileTime</Property>
+ <Property name="property">fileTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container>
+ <Label layoutConstraint="left">
+ <Property name="width">10px</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">showFilePdf();</ClientEvent>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="caption">棰勮</Property>
+ <Property name="iconClass">fa fa-picture-o</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <Control>
+ <Property name="height">10</Property>
+ </Control>
+ <FieldSet layout="padding:5">
+ <Property name="caption">澶х背妫�娴嬮」淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridorgReportRiceList">
+ <Property name="dataPath">#.orgReportRiceList</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="highlightCurrentRow">false</Property>
+ <Property name="visible">true</Property>
+ <Property name="height">200</Property>
+ <RowNumColumn/>
+ <DataColumn name="brokenRice">
+ <Property name="property">brokenRice</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="smallBrokenRice">
+ <Property name="property">smallBrokenRice</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="processingAccuracy">
+ <Property name="property">processingAccuracy</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="impuriryContent">
+ <Property name="property">impuriryContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="tastingValue">
+ <Property name="property">tastingValue</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="amyloseContent">
+ <Property name="property">amyloseContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="incompleteContent">
+ <Property name="property">incompleteContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="inorganicContent">
+ <Property name="property">inorganicContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="yellowRiceContent">
+ <Property name="property">yellowRiceContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="mixingRate">
+ <Property name="property">mixingRate</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="aflatioxin">
+ <Property name="property">aflatioxin</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="cadmium">
+ <Property name="property">cadmium</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="inorganicArsenic">
+ <Property name="property">inorganicArsenic</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">灏忛害绮夋娴嬮」淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridOrgReportNoodlesList">
+ <Property name="dataPath">#.orgReportNoodlesList</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="highlightCurrentRow">false</Property>
+ <Property name="visible">true</Property>
+ <Property name="height">200</Property>
+ <RowNumColumn/>
+ <DataColumn name="processingAccuracy">
+ <Property name="property">processingAccuracy</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="cadmium">
+ <Property name="property">cadmium</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="ashContent">
+ <Property name="property">ashContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="fattyContent">
+ <Property name="property">fattyContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="sandContent">
+ <Property name="property">sandContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="looksForm">
+ <Property name="property">looksForm</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="wetGluten">
+ <Property name="property">wetGluten</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="deoxynivalenol">
+ <Property name="property">deoxynivalenol</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="zearalenone">
+ <Property name="property">zearalenone</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="lead">
+ <Property name="property">lead</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="benzoylPeroxide">
+ <Property name="property">benzoylPeroxide</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="reportFile">
+ <Property name="property">reportFile</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="hfhljg">
+ <Property name="property">hfhljg</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="zfshljg">
+ <Property name="property">zfshljg</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">澶ц眴妫�娴嬮」淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridCheckItem">
+ <Property name="dataPath">#.orgReportSoybeanList</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="highlightCurrentRow">false</Property>
+ <Property name="visible">true</Property>
+ <Property name="height">200</Property>
+ <RowNumColumn/>
+ <DataColumn name="completeParticle">
+ <Property name="property">completeParticle</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="damageParticle">
+ <Property name="property">damageParticle</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="damageParticleHot">
+ <Property name="property">damageParticleHot</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="impurityContent">
+ <Property name="property">impurityContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisCamv">
+ <Property name="property">transgenosisCamv</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisNos">
+ <Property name="property">transgenosisNos</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisCoFour">
+ <Property name="property">transgenosisCoFour</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="lection">
+ <Property name="property">lection</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ </FieldSet>
+ <FieldSet layout="padding:5">
+ <Property name="caption">椋熺敤娌规娴嬮」淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridOrgReportOilList">
+ <Property name="dataPath">#.orgReportOilList</Property>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="hideMode">display</Property>
+ <Property name="highlightCurrentRow">false</Property>
+ <Property name="visible">true</Property>
+ <Property name="height">200</Property>
+ <RowNumColumn/>
+ <DataColumn name="colorLustre">
+ <Property name="property">colorLustre</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="transparency">
+ <Property name="property">transparency</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="odorTaste">
+ <Property name="property">odorTaste</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="waterVolatileContent">
+ <Property name="property">waterVolatileContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="insolubleContent">
+ <Property name="property">insolubleContent</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="acidValue">
+ <Property name="property">acidValue</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="peroxideValue">
+ <Property name="property">peroxideValue</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="heatingTest">
+ <Property name="property">heatingTest</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="aflatioxin">
+ <Property name="property">aflatioxin</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="benzoPyrene">
+ <Property name="property">benzoPyrene</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="bha">
+ <Property name="property">bha</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="bht">
+ <Property name="property">bht</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="tbhq">
+ <Property name="property">tbhq</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ </FieldSet>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaAction">
+ <Property name="dataResolver">qualityManagerPR#saveQuality</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">qualityManagerPR#delQuality</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxGetDepot">
+ <Property name="service">depotPR#getDepot</Property>
+ </AjaxAction>
+ <UploadAction id="uploadFile">
+ <ClientEvent name="onFileUploaded">var fileId = arg.returnValue;
+ if(fileId==("10")){
+ $alert("涓婁紶澶辫触锛氶檮浠跺悕绉颁负绌恒��");
+ return;
+ }
+ if(fileId==("20")){
+ $alert("涓婁紶澶辫触锛氶檮浠朵笉鏄痯df鏂囦欢銆�");
+ return;
+ }
+var data = view.get("#dsMain.data:#");
+data.set("fileId",fileId);
+data.set("fileName",arg.file.name);
+data.set("fileTime",new Date);</ClientEvent>
+ <Property name="fileResolver">myUploadProcessor#uploadCommonFile</Property>
+ <Filters/>
+ </UploadAction>
+ </View>
+</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager1PR.java b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager1PR.java
new file mode 100644
index 0000000..0dfae7a
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager1PR.java
@@ -0,0 +1,194 @@
+package com.ld.igds.m.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.check.CheckStandardManager;
+import com.ld.igds.check.dto.CheckItemData;
+import com.ld.igds.m.ReportManage;
+import com.ld.igds.m.service.HQualityManageService;
+import com.ld.igds.models.Depot;
+import com.ld.igds.models.DicTrigger;
+import com.ld.igds.models.MQuality;
+import com.ld.igds.view.service.HDepotService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 璐ㄩ噺杩芥函绠＄悊
+ *
+ * @author: chen
+ */
+@Component
+public class QualityManager1PR {
+
+ @Autowired
+ private HQualityManageService qualityManageService;
+ @Autowired
+ private CheckStandardManager checkStandardManager;
+ @Autowired
+ private ReportManage reportManage;
+ @Autowired
+ private HDepotService depotService;
+
+ /**
+ * 妫�楠岀被鍒�
+ * <p>
+ * ${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger("01", "鍏ヤ粨楠屾敹"));
+ list.add(new DicTrigger("02", "鍑轰粨妫�楠�"));
+ list.add(new DicTrigger("03", "3鏈堟湯鏅"));
+ list.add(new DicTrigger("04", "9鏈堟湯鏅"));
+ list.add(new DicTrigger("05", "鍏ュ簱鍒濇"));
+ list.add(new DicTrigger("06", "鏈堝害妫�鏌�"));
+ list.add(new DicTrigger("07", "3鏈堟湯搴撳唴鏅煡"));
+ list.add(new DicTrigger("08", "9鏈堟湯搴撳唴鏅煡"));
+ return list;
+ }
+
+ /**
+ * 鎸囨爣绫诲埆
+ * <p>
+ * ${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerStandard() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+
+ list.add(new DicTrigger("1", "鍥芥爣"));
+ list.add(new DicTrigger("0", "鍏朵粬"));
+
+ return list;
+ }
+
+ /**
+ * 妫�楠屼緷鎹�
+ * <p>
+ * ${dorado.getDataProvider("qualityManagerPR#triggerMetrics").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerMetrics() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+
+ list.add(new DicTrigger("1", "璐ㄩ噺鎸囨爣妫�楠�"));
+ list.add(new DicTrigger("2", "鍌ㄥ瓨鍝佽川妫�楠�"));
+ list.add(new DicTrigger("3", "椋熷搧瀹夊叏妫�楠�"));
+
+ return list;
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇璐ㄩ噺宸℃璁板綍淇℃伅
+ * <p>
+ * qualityManager1PR#listQuality
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void listQuality(Page<MQuality> page, Map<String, Object> param) throws Exception {
+ if (param == null) {
+ param = new java.util.HashMap<>();
+ }
+ param.put("provReserve", "Y");
+ qualityManageService.listQuality(page, param);
+ }
+
+ /**
+ * 淇濆瓨璐ㄩ噺宸℃璁板綍鍙婄浉鍏虫娴嬮」淇℃伅
+ * qualityManagerPR#saveQuality
+ *
+ * @param data
+ */
+ @DataResolver
+ public void saveQuality(MQuality data) {
+ if (StringUtils.isEmpty(data.getId())) {
+ data.setId( "ZJ_" + qualityManageService.getIdByTime(data.getTime()));
+ }
+ try {
+ qualityManageService.saveQuality(data.getId(), data);
+ //淇濆瓨璐т綅璐ㄦ鏁版嵁
+ Depot depot = depotService.getDepotById(data.getCompanyId(), data.getDepotId());
+ depot.setCheckDate(data.getTime());
+
+ //淇濆瓨妫�娴嬬殑鍖栭獙椤逛俊鎭�
+ if (null != data.getCheckItems()) {
+ checkStandardManager.updateCheckItems(data.getId(), null, data.getCheckItems());
+ List<CheckItemData> checkItems = data.getCheckItems();
+
+ for (CheckItemData checkItem : checkItems) {
+ if("C01".equals(checkItem.getStandardId())){
+ String value = checkItem.getValue();
+ depot.setPerWet(Double.valueOf(value));
+ }
+ if("C02".equals(checkItem.getStandardId())){
+ String value = checkItem.getValue();
+ depot.setPerImpurity(Double.valueOf(value));
+ }
+ if("C03".equals(checkItem.getStandardId())){
+ String value = checkItem.getValue();
+ depot.setBulkWeight(Double.valueOf(value));
+ }
+ }
+ }
+
+ depotService.updateDepot(depot);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * qualityManagerPR#delQuality
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delQuality(MQuality data) {
+ return qualityManageService.delQuality(data);
+ }
+
+ /**
+ * qualityManagerPR#getPer
+ *
+ * @param checkId
+ * @return
+ */
+ @Expose
+ public CheckItemData getPer(String checkId) {
+ return qualityManageService.getCheckItem(checkId);
+ }
+
+ /**
+ * qualityManagerPR#printQualityBill 鎵撳嵃璐ㄦ鎶ュ憡鍗�
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String printQualityBill(MQuality data) {
+ if (StringUtils.isEmpty(data.getFoodVariety())) {
+ return "绮儏鍝佺涓虹┖锛屼笉鏀寔鎵撳嵃锛�";
+ }
+ return reportManage.printQualityBill(data);
+ }
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
index 903c971..0a1ca04 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManagerPR.java
@@ -96,7 +96,7 @@
/**
* 鍒嗛〉鑾峰彇璐ㄩ噺宸℃璁板綍淇℃伅
* <p>
- * qualityManagerPR#listQuality
+ * qualityManager1PR#listQuality
*
* @param page
* @param param
@@ -104,6 +104,10 @@
*/
@DataProvider
public void listQuality(Page<MQuality> page, Map<String, Object> param) throws Exception {
+ if (param == null) {
+ param = new java.util.HashMap<>();
+ }
+ param.put("provReserve", "N");
qualityManageService.listQuality(page, param);
}
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckItemDd.java b/igds-core/src/main/java/com/ld/igds/models/CheckItemDd.java
new file mode 100644
index 0000000..7b88653
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckItemDd.java
@@ -0,0 +1,86 @@
+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;
+
+@Data
+@Entity
+@Table(name = "D_CHECK_ITEM_Dd")
+public class CheckItemDd {
+
+
+ @Id
+ @Column(name = "QLY_ORG_REPORT_SOYBEAN_ID_", length = 40)
+ @PropertyDef(label = "澶ц眴璐ㄦ缁撴灉ID")
+ private String qlyOrgReportSoybeanId; //澶ц眴璐ㄦ缁撴灉ID
+
+ @Column(name = "QLY_ORG_REPORT_ID_", length = 40)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡绠＄悊id")
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+
+ @Column(name = "COMPLETE_PARTICLE_", length = 50)
+ @PropertyDef(label = "瀹屾暣绮掔巼")
+ private String completeParticle; //瀹屾暣绮掔巼
+
+ @Column(name = "DAMAGE_PARTICLE_", length = 50)
+ @PropertyDef(label = "鎹熶激绮掔巼")
+ private String damageParticle; //鎹熶激绮掔巼
+
+ @Column(name = "DAMAGE_PARTICLE_HOT_", length = 50)
+ @PropertyDef(label = "鐑崯浼ょ矑鐜�")
+ private String damageParticleHot; //鐑崯浼ょ矑鐜�
+
+ @Column(name = "WATER_CONTENT_", length = 50)
+ @PropertyDef(label = "姘村垎鍚噺")
+ private String waterContent; //姘村垎鍚噺
+
+ @Column(name = "COLOR_ODOR_", length = 50)
+ @PropertyDef(label = "鑹叉辰姘斿懗")
+ private String colorOdor; //鑹叉辰姘斿懗
+
+ @Column(name = "IMPURITY_CONTENT_", length = 50)
+ @PropertyDef(label = "鏉傝川鍚噺")
+ private String impurityContent; //鏉傝川鍚噺
+
+ @Column(name = "TRANSGENOSIS_CAMV_", length = 50)
+ @PropertyDef(label = "CAMV35S")
+ private String transgenosisCamv; //CAMV35S
+
+ @Column(name = "TRANSGENOSIS_NOS_", length = 50)
+ @PropertyDef(label = "NOS")
+ private String transgenosisNos; //NOS
+
+ @Column(name = "TRANSGENOSIS_CO_FOUR_", length = 50)
+ @PropertyDef(label = "CO4EPSPS")
+ private String transgenosisCoFour; //CO4EPSPS
+
+ @Column(name = "LECTION_", length = 50)
+ @PropertyDef(label = "LECTION")
+ private String lection; //LECTION
+
+ @Column(name = "QUALITY_RESULT_", length = 50)
+ @PropertyDef(label = "璐ㄩ噺鍒ゅ畾")
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+
+ @Column(name = "DELECTION_PERSON_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉")
+ private String delectionPerson; //妫�楠屼汉
+
+ @Column(name = "DELECTION_START_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬪紑濮嬫椂闂�")
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+
+ @Column(name = "DELECTION_END_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬬粨鏉熸椂闂�")
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+
+ @Column(name = "INSPECTION_RESULT_", length = 50)
+ @PropertyDef(label = "妫�楠岀粨璁�")
+ private String inspectionResult; //妫�楠岀粨璁�
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckItemDm.java b/igds-core/src/main/java/com/ld/igds/models/CheckItemDm.java
new file mode 100644
index 0000000..aa0e5ff
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckItemDm.java
@@ -0,0 +1,104 @@
+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;
+
+@Data
+@Entity
+@Table(name = "D_CHECK_ITEM_DM")
+public class CheckItemDm {
+
+ @Id
+ @Column(name = "QLY_ORG_REPORT_RICE_ID_", length = 40)
+ @PropertyDef(label = "澶х背璐ㄦ缁撴灉ID")
+ private String qlyOrgReportRiceId; //澶х背璐ㄦ缁撴灉ID
+
+ @Column(name = "QLY_ORG_REPORT_ID_", length = 40)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡绠＄悊id")
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+
+ @Column(name = "BROKEN_RICE_", length = 50)
+ @PropertyDef(label = "纰庣背鎬婚噺")
+ private String brokenRice; //纰庣背鎬婚噺
+
+ @Column(name = "SMALL_BROKEN_RICE_", length = 50)
+ @PropertyDef(label = "灏忕绫冲惈閲�")
+ private String smallBrokenRice; //灏忕绫冲惈閲�
+
+ @Column(name = "PROCESSING_ACCURACY_", length = 50)
+ @PropertyDef(label = "鍔犲伐绮惧害")
+ private String processingAccuracy; //鍔犲伐绮惧害
+
+ @Column(name = "COLOR_ODOR_", length = 50)
+ @PropertyDef(label = "鑹叉辰姘斿懗")
+ private String colorOdor; //鑹叉辰姘斿懗
+
+ @Column(name = "IMPURITY_CONTENT_", length = 50)
+ @PropertyDef(label = "鏉傝川鍚噺")
+ private String impuriryContent; //鏉傝川鍚噺
+
+ @Column(name = "TASTING_VALUE_", length = 50)
+ @PropertyDef(label = "鍝佸皾璇勫垎鍊�")
+ private String tastingValue; //鍝佸皾璇勫垎鍊�
+
+ @Column(name = "AMYLOSE_CONTENT_", length = 50)
+ @PropertyDef(label = "鐩撮摼娣�绮夊惈閲�")
+ private String amyloseContent; //鐩撮摼娣�绮夊惈閲�
+
+ @Column(name = "WATER_CONTENT_", length = 50)
+ @PropertyDef(label = "姘村垎鍚噺")
+ private String waterContent; //姘村垎鍚噺
+
+ @Column(name = "INCOMPLETE_CONTENT_", length = 50)
+ @PropertyDef(label = "涓嶅畬鍠勭矑鍚噺")
+ private String incompleteContent; //涓嶅畬鍠勭矑鍚噺
+
+ @Column(name = "INORGANIC_CONTENT_", length = 50)
+ @PropertyDef(label = "鏃犳満鏉傝川鍚噺")
+ private String inorganicContent; //鏃犳満鏉傝川鍚噺
+
+ @Column(name = "YELLOW_RICE_CONTENT_", length = 50)
+ @PropertyDef(label = "榛勭矑绫冲惈閲�")
+ private String yellowRiceContent; //榛勭矑绫冲惈閲�
+
+ @Column(name = "MIXING_RATE_", length = 50)
+ @PropertyDef(label = "浜掓贩鐜�")
+ private String mixingRate; //浜掓贩鐜�
+
+ @Column(name = "AFLATIOXIN_", length = 50)
+ @PropertyDef(label = "榛勬洸闇夋瘨绱�")
+ private String aflatioxin; //榛勬洸闇夋瘨绱�
+
+ @Column(name = "CADMIUM_", length = 50)
+ @PropertyDef(label = "闀�")
+ private String cadmium; //闀�
+
+ @Column(name = "INORGANIC_ARCENIC_", length = 50)
+ @PropertyDef(label = "鏃犳満鐮�")
+ private String inorganicArsenic; //鏃犳満鐮�
+
+ @Column(name = "QUALITY_RESULT_", length = 50)
+ @PropertyDef(label = "璐ㄩ噺鍒ゅ畾")
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+
+ @Column(name = "DELECTION_PERSON_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉")
+ private String delectionPerson; //妫�楠屼汉
+
+ @Column(name = "DELECTION_START_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬪紑濮嬫椂闂�")
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+
+ @Column(name = "DELECTION_END_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬬粨鏉熸椂闂�")
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+
+ @Column(name = "INSPECTION_RESULT_", length = 50)
+ @PropertyDef(label = "妫�楠岀粨璁�")
+ private String inspectionResult; //妫�楠岀粨璁�
+}
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckItemSyy.java b/igds-core/src/main/java/com/ld/igds/models/CheckItemSyy.java
new file mode 100644
index 0000000..be5db6e
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckItemSyy.java
@@ -0,0 +1,98 @@
+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;
+
+@Data
+@Entity
+@Table(name = "D_CHECK_ITEM_SYY")
+public class CheckItemSyy {
+
+
+ @Id
+ @Column(name = "QLY_ORG_REPORT_OIL_ID_", length = 40)
+ @PropertyDef(label = "椋熺敤娌硅川妫�缁撴灉ID")
+ private String qlyOrgReportOilId; //椋熺敤娌硅川妫�缁撴灉ID
+
+ @Column(name = "QLY_ORG_REPORT_ID_", length = 40)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡绠＄悊id")
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+
+ @Column(name = "COLOR_LUSTRE_", length = 50)
+ @PropertyDef(label = "鑹叉辰")
+ private String colorLustre; //鑹叉辰
+
+ @Column(name = "TRANSPARENCY_", length = 50)
+ @PropertyDef(label = "閫忔槑搴�")
+ private String transparency; //閫忔槑搴�
+
+ @Column(name = "ODOR_TASTE_", length = 50)
+ @PropertyDef(label = "姘斿懗婊嬪懗")
+ private String odorTaste; //姘斿懗婊嬪懗
+
+ @Column(name = "WATER_VOLATILE_CONTENT_", length = 50)
+ @PropertyDef(label = "姘村垎鍙婃尌鍙戠墿鍚噺")
+ private String waterVolatileContent; //姘村垎鍙婃尌鍙戠墿鍚噺
+
+ @Column(name = "INSOLUBLE_CONTENT_", length = 50)
+ @PropertyDef(label = "涓嶆憾鎬ф潅璐ㄥ惈閲�")
+ private String insolubleContent; //涓嶆憾鎬ф潅璐ㄥ惈閲�
+
+ @Column(name = "ACID_VALUE_", length = 50)
+ @PropertyDef(label = "閰镐环")
+ private String acidValue; //閰镐环
+
+ @Column(name = "PEROXIDE_VALUE_", length = 50)
+ @PropertyDef(label = "杩囨哀鍖栧��")
+ private String peroxideValue; //杩囨哀鍖栧��
+
+ @Column(name = "HEATING_TEST_", length = 50)
+ @PropertyDef(label = "鍔犵儹璇曢獙")
+ private String heatingTest; //鍔犵儹璇曢獙
+
+ @Column(name = "AFLATIOXIN_", length = 50)
+ @PropertyDef(label = "榛勬洸闇夋瘨绱�")
+ private String aflatioxin; //榛勬洸闇夋瘨绱�
+
+ @Column(name = "BENZO_PYRENE_", length = 50)
+ @PropertyDef(label = "鑻苟鑺�")
+ private String benzoPyrene; //鑻苟鑺�
+
+ @Column(name = "BHA_", length = 50)
+ @PropertyDef(label = "BHA")
+ private String bha; //BHA
+
+ @Column(name = "BHT_", length = 50)
+ @PropertyDef(label = "BHT")
+ private String bht; //BHT
+
+ @Column(name = "TBHQ_", length = 50)
+ @PropertyDef(label = "TBHQ")
+ private String tbhq; //TBHQ
+
+ @Column(name = "QUALITY_RESULT_", length = 50)
+ @PropertyDef(label = "璐ㄩ噺鍒ゅ畾")
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+
+ @Column(name = "DELECTION_PERSON_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉")
+ private String delectionPerson; //妫�楠屼汉
+
+ @Column(name = "DELECTION_START_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬪紑濮嬫椂闂�")
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+
+ @Column(name = "DELECTION_END_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬬粨鏉熸椂闂�")
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+
+ @Column(name = "INSPECTION_RESULT_", length = 50)
+ @PropertyDef(label = "妫�楠岀粨璁�")
+ private String inspectionResult; //妫�楠岀粨璁�
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckItemXmf.java b/igds-core/src/main/java/com/ld/igds/models/CheckItemXmf.java
new file mode 100644
index 0000000..552439d
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckItemXmf.java
@@ -0,0 +1,110 @@
+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;
+
+@Data
+@Entity
+@Table(name = "D_CHECK_ITEM_XMF")
+public class CheckItemXmf {
+
+ @Id
+ @Column(name = "QLY_ORG_REPORT_NOODLES_ID_", length = 40)
+ @PropertyDef(label = "灏忛害绮夎川妫�缁撴灉ID")
+ private String qlyOrgReportNoodlesId; //灏忛害绮夎川妫�缁撴灉ID
+
+ @Column(name = "QLY_ORG_REPORT_ID_", length = 40)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡绠＄悊id")
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+
+ @Column(name = "PROCESSING_ACCURACY_", length = 50)
+ @PropertyDef(label = "鍔犲伐绮惧害")
+ private String processingAccuracy; //鍔犲伐绮惧害
+
+ @Column(name = "COLOR_ODOR_", length = 50)
+ @PropertyDef(label = "鑹叉辰姘斿懗")
+ private String colorOdor; //鑹叉辰姘斿懗
+
+ @Column(name = "WATER_CONTENT_", length = 50)
+ @PropertyDef(label = "姘村垎鍚噺")
+ private String waterContent; //姘村垎鍚噺
+
+ @Column(name = "CADMIUM_", length = 50)
+ @PropertyDef(label = "闀�")
+ private String cadmium; //闀�
+
+ @Column(name = "QUALITY_RESULT_", length = 50)
+ @PropertyDef(label = "璐ㄩ噺鍒ゅ畾")
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+
+ @Column(name = "DELECTION_PERSON_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉")
+ private String delectionPerson; //妫�楠屼汉
+
+ @Column(name = "DELECTION_START_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬪紑濮嬫椂闂�")
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+
+ @Column(name = "DELECTION_END_TIME_", length = 50)
+ @PropertyDef(label = "妫�娴嬬粨鏉熸椂闂�")
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+
+ @Column(name = "INSPECTION_RESULT_", length = 50)
+ @PropertyDef(label = "妫�楠岀粨璁�")
+ private String inspectionResult; //妫�楠岀粨璁�
+
+ @Column(name = "ASH_CONTENT_", length = 50)
+ @PropertyDef(label = "鐏板垎鍚噺")
+ private String ashContent; //鐏板垎鍚噺
+
+ @Column(name = "FATTY_CONTENT_", length = 50)
+ @PropertyDef(label = "鑴傝偑閰稿惈閲�")
+ private String fattyContent; //鑴傝偑閰稿惈閲�
+
+ @Column(name = "SAND_CONTENT_", length = 50)
+ @PropertyDef(label = "鍚爞閲�")
+ private String sandContent; //鍚爞閲�
+
+ @Column(name = "LOOKS_FORM_", length = 50)
+ @PropertyDef(label = "澶栬褰㈡��")
+ private String looksForm; //澶栬褰㈡��
+
+ @Column(name = "WET_GLUTEN_", length = 50)
+ @PropertyDef(label = "婀块潰绛嬪惈閲�")
+ private String wetGluten; //婀块潰绛嬪惈閲�
+
+ @Column(name = "DEOXYNIVALENOL_", length = 50)
+ @PropertyDef(label = "鑴辨哀闆厫闀板垁鑿岀儻閱�")
+ private String deoxynivalenol; //鑴辨哀闆厫闀板垁鑿岀儻閱�
+
+ @Column(name = "ZEARALENONE_", length = 50)
+ @PropertyDef(label = "鐜夌背璧ら湁鐑叜")
+ private String zearalenone; //鐜夌背璧ら湁鐑叜
+
+ @Column(name = "LEAD_", length = 50)
+ @PropertyDef(label = "閾�")
+ private String lead; //閾�
+
+ @Column(name = "BENZOYL_PEROXIDE_", length = 50)
+ @PropertyDef(label = "杩囨哀鍖栬嫰鐢查叞")
+ private String benzoylPeroxide; //杩囨哀鍖栬嫰鐢查叞
+
+ @Column(name = "REPORT_FILE_", length = 100)
+ @PropertyDef(label = "鎶ュ憡鏂囦欢")
+ private String reportFile; //鎶ュ憡鏂囦欢
+
+ @Column(name = "HFHLJG_", length = 50)
+ @PropertyDef(label = "鐏板垎鍚噺缁撴灉")
+ private String hfhljg; //鐏板垎鍚噺缁撴灉
+
+ @Column(name = "ZFSHLJG_", length = 50)
+ @PropertyDef(label = "鑴傝偑閰稿惈閲忕粨鏋�")
+ private String zfshljg; //鑴傝偑閰稿惈閲忕粨鏋�
+
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/models/MQuality.java b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
index 9cf9038..867d282 100644
--- a/igds-core/src/main/java/com/ld/igds/models/MQuality.java
+++ b/igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.check.dto.CheckItemData;
+import com.ld.igds.constant.Constant;
import lombok.Data;
import javax.persistence.*;
@@ -167,4 +168,161 @@
@PropertyDef(label = "闄勪欢涓婁紶鏃堕棿")
private Date fileTime;
+
+ /************
+ * 榛勯檪鍐涚伯鐢�-鐪佽川妫�涓績鎶ュ憡
+ ************/
+
+ @Column(name = "PROV_RESERVE_", length = 1)
+ @PropertyDef(label = "鏄惁涓虹渷绾ц川妫�涓績鎶ュ憡", description = "Y-鏄紝N-鍚�")
+ private String provReserve = Constant.YN_N;
+
+
+ @Column(name = "QLY_ORG_REPORTID_", length = 20)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡id")
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡id
+
+ @Column(name = "ORDER_ID_", length = 20)
+ @PropertyDef(label = "璁㈠崟琛↖D")
+ private String orderId; //璁㈠崟琛↖D
+
+ @Column(name = "SAMPLE_ID_", length = 20)
+ @PropertyDef(label = "鏍峰搧琛↖D")
+ private String sampleId; //鏍峰搧琛↖D
+
+ @Column(name = "ORG_ID_", length = 20)
+ @PropertyDef(label = "鏈烘瀯琛↖D")
+ private String orgId; //鏈烘瀯琛↖D
+
+ @Column(name = "QUALITY_ORG_ID_", length = 50)
+ @PropertyDef(label = "璐ㄦ鏈烘瀯缂栧彿")
+ private String qualityOrgId; //璐ㄦ鏈烘瀯缂栧彿
+
+ @Column(name = "QUALITY_ORG_NAME_", length = 50)
+ @PropertyDef(label = "璐ㄦ鏈烘瀯鍚嶇О")
+ private String qualityOrgName; //璐ㄦ鏈烘瀯鍚嶇О
+
+ @Column(name = "GYSXYDM_", length = 50)
+ @PropertyDef(label = "渚涘簲鍟嗕俊鐢ㄤ唬鐮�")
+ private String gysxydm; //渚涘簲鍟嗕俊鐢ㄤ唬鐮�
+
+ @Column(name = "JLQYBH_", length = 50)
+ @PropertyDef(label = "鍐涚伯浼佷笟缂栧彿")
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+
+ @Column(name = "JLQYMC_", length = 50)
+ @PropertyDef(label = "鍐涚伯浼佷笟鍚嶇О")
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
+
+ @Column(name = "KDBM_", length = 20)
+ @PropertyDef(label = "搴撶偣缂栫爜")
+ private String kdbm; //搴撶偣缂栫爜
+
+ @Column(name = "KDMC_", length = 50)
+ @PropertyDef(label = "搴撶偣鍚嶇О")
+ private String kdmc; //搴撶偣鍚嶇О
+
+ @Column(name = "DELECTION_TYPE_", length = 20)
+ @PropertyDef(label = "妫�娴嬫姤鍛婄被鍨�")
+ private String delectionType; //妫�娴嬫姤鍛婄被鍨�
+
+ @Column(name = "DELETCTION_NUMBER_", length = 50)
+ @PropertyDef(label = "妫�娴嬫姤鍛婄紪鍙�")
+ private String deletctionNumber; //妫�娴嬫姤鍛婄紪鍙�
+
+ @Column(name = "JLCPMC_", length = 50)
+ @PropertyDef(label = "鍐涚伯浜у搧鍚嶇О")
+ private String jlcpmc; //鍐涚伯浜у搧鍚嶇О
+
+ @Column(name = "JLLSPZ_", length = 50)
+ @PropertyDef(label = "鍐涚伯绮鍝佺")
+ private String jllspz; //鍐涚伯绮鍝佺
+
+ @Column(name = "LOT_NUMBER_", length = 50)
+ @PropertyDef(label = "鎵瑰彿")
+ private String lotNumber; //鎵瑰彿
+
+ @Column(name = "SPECIFICATION_MODEL_", length = 50)
+ @PropertyDef(label = "瑙勬牸鍨嬪彿")
+ private String specificationModel; //瑙勬牸鍨嬪彿
+
+ @Column(name = "CYSM_", length = 200)
+ @PropertyDef(label = "鎶芥牱璇存槑")
+ private String cysm; //鎶芥牱璇存槑
+
+ @JSONField(format = "yyyy-MM-dd")
+ @Column(name = "REGISTRATION_", length = 20)
+ @PropertyDef(label = "鐧昏鏃堕棿")
+ private String registration; //鐧昏鏃堕棿
+
+ @Column(name = "INSPECT_PLAN_", length = 200)
+ @PropertyDef(label = "妫�楠屾柟妗�")
+ private String inspectPlan; //妫�楠屾柟妗�
+
+ @Column(name = "PRODUCT_TYPE_", length = 20)
+ @PropertyDef(label = "浜у搧绫诲瀷")
+ private String productType; //浜у搧绫诲瀷
+
+ @Column(name = "CYJS_", length = 20)
+ @PropertyDef(label = "鎶芥牱鍩烘暟")
+ private String cyjs; //鎶芥牱鍩烘暟
+
+ @Column(name = "CYSL_", length = 20)
+ @PropertyDef(label = "鎶芥牱鏁伴噺")
+ private String cysl; //鎶芥牱鏁伴噺
+
+ @Column(name = "SAMPLER_", length = 50)
+ @PropertyDef(label = "鎶芥牱浜�")
+ private String sampler; //鎶芥牱浜�
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "SAMPLER_TIME_", length = 20)
+ @PropertyDef(label = "鎶芥牱鏃堕棿")
+ private String samplerTime; //鎶芥牱鏃堕棿
+
+ @Column(name = "SAMPLER_AREA_", length = 200)
+ @PropertyDef(label = "鎶芥牱鍦扮偣")
+ private String samplerArea; //鎶芥牱鍦扮偣
+
+ @JSONField(format = "yyyy-MM-dd")
+ @Column(name = "CREATE_TIME_", length = 20)
+ @PropertyDef(label = "鐢熶骇鏃ユ湡")
+ private Date createTime; //鐢熶骇鏃ユ湡
+
+ @Column(name = "IS_ACTIVE_", length = 1)
+ @PropertyDef(label = "鏄惁鏈夋晥")
+ private String isActive; //鏄惁鏈夋晥
+
+ @Column(name = "REPORT_FILE_", length = 200)
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鏂囦欢")
+ private String reportFile; //璐ㄦ鎶ュ憡鏂囦欢
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "CREATE_DATE_", length = 20)
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private String createDate; //鍒涘缓鏃堕棿
+
+ @Column(name = "CREATE_BY_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createBy; //鍒涘缓浜�
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @Column(name = "UPDATE_DATE_", length = 20)
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private String updateDate; //鏇存柊鏃堕棿
+
+ @Column(name = "UPDATE_BY_", length = 50)
+ @PropertyDef(label = "鏇存柊浜�")
+ private String updateBy; //鏇存柊浜�
+
+
+ @Transient
+ private List<CheckItemDm> orgReportRiceList; //澶х背妫�楠岀粨鏋�
+ @Transient
+ private List<CheckItemXmf> orgReportNoodlesList; //灏忛害绮夎川妫�缁撴灉
+ @Transient
+ private List<CheckItemDd> orgReportSoybeanList; //澶ц眴璐ㄦ缁撴灉
+ @Transient
+ private List<CheckItemSyy> orgReportOilList; //椋熺敤娌硅川妫�缁撴灉
+
}
--
Gitblit v1.9.3