From 9f6dacf7b39e5aeba37d8faf575c9e56d8cbe51a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 11 十月 2025 13:35:42 +0800
Subject: [PATCH] 武汉黄陂军粮-质检报告共享接口同步及推送
---
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml | 4
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java | 18
src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Syy.java | 40
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java | 59
src/main/resources/templates/home/home-whjl.html | 3
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013XmfRep.java | 19
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemSyy.java | 98 +
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDd.java | 86 +
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlMQuality.java | 313 +++
src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Xmf.java | 43
src/main/java/com/fzzy/api/timer/ApiWhjlScheduled.java | 35
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml | 8
src/main/java/com/fzzy/api/utils/ContextUtil.java | 5
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR.java | 391 ++++
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java | 327 +++
src/main/resources/application-dev.yml | 9
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemXmf.java | 110 +
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java | 4
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDm.java | 104 +
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013Rep.java | 23
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 2
src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi2013.view.xml | 1282 +++++++++++++++
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1108Rep.java | 24
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlShareApi2013.java | 79
src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dd.java | 37
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1216Rep.java | 24
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DdRep.java | 18
src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi20132.view.xml | 1330 +++++++++++++++
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java | 19
src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1216.java | 123 +
src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dm.java | 41
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItem.java | 113 +
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013SyyRep.java | 19
src/main/java/com/fzzy/api/utils/Base64Util.java | 199 ++
src/main/resources/application.yml | 2
src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DmRep.java | 18
37 files changed, 4,982 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/fzzy/api/timer/ApiWhjlScheduled.java b/src/main/java/com/fzzy/api/timer/ApiWhjlScheduled.java
new file mode 100644
index 0000000..d79a5b7
--- /dev/null
+++ b/src/main/java/com/fzzy/api/timer/ApiWhjlScheduled.java
@@ -0,0 +1,35 @@
+package com.fzzy.api.timer;
+
+import com.fzzy.otherview.whhpjl.pr.WhjlShareApi2013PR2;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 姝︽眽鍐涚伯鐪佸钩鍙�
+ * @Author CZT
+ * @Date 2024/6/28 16:38
+ */
+@Slf4j
+@Component(ApiWhjlScheduled.BEAN_ID)
+public class ApiWhjlScheduled {
+ public static final String BEAN_ID = "api.apiWhjlScheduled";
+
+ @Autowired
+ private WhjlShareApi2013PR2 whjlShareApi2013PR2;
+ /**
+ * 姣忓ぉ鏅氫笂11鐐瑰畾鏃剁粺璁℃暟鎹浉绗︽��
+ */
+ @Scheduled(cron = "0 0 23 * * ? ")
+ public void scheduled() {
+
+ log.info("------->>>>>>>>>>姝︽眽榛勯檪鍐涚伯锛岀郴缁熷畾鏃剁粺璁″叡浜帴鍙ｇ渷璐ㄦ鎶ュ憡");
+
+ //鑾峰彇鍏变韩鏁版嵁
+ whjlShareApi2013PR2.pullData(null);
+ //鍚屾鑷冲簱鍖烘暟鎹簱
+ whjlShareApi2013PR2.sysDataToDept();
+ }
+
+}
diff --git a/src/main/java/com/fzzy/api/utils/Base64Util.java b/src/main/java/com/fzzy/api/utils/Base64Util.java
new file mode 100644
index 0000000..c366c7d
--- /dev/null
+++ b/src/main/java/com/fzzy/api/utils/Base64Util.java
@@ -0,0 +1,199 @@
+package com.fzzy.api.utils;
+
+import sun.misc.BASE64Decoder;
+import sun.misc.BASE64Encoder;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+/**
+ *
+ */
+@SuppressWarnings("restriction")
+public class Base64Util {
+
+ static BASE64Decoder decoder = new BASE64Decoder();
+
+ public static String UTF_8 = "UTF-8";
+
+ public static String BASE_IMG_START = "data:image/jpg;base64,";
+
+ /**
+ * 鏍规嵁鍦板潃锛屾妸鍥剧墖杞崲涓築ase64瀛楃涓�
+ * <p>
+ * data:image/jpg;base64,
+ *
+ * @param diskFile
+ * @return
+ */
+ public static String getImageStr(String diskFile) {
+ InputStream in = null;
+ byte[] data = null;
+ // 璇诲彇鍥剧墖瀛楄妭鏁扮粍
+ try {
+ in = new FileInputStream(diskFile);
+ data = new byte[in.available()];
+ in.read(data);
+ // in.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (null != in)
+ in.close();
+ } catch (Exception e) {
+ }
+ }
+ BASE64Encoder encoder = new BASE64Encoder();
+ return BASE_IMG_START + encoder.encode(data);
+ }
+
+ /**
+ * 瀵瑰瓧鑺傛暟缁勫瓧绗︿覆杩涜Base64瑙ｇ爜骞剁敓鎴愬浘鐗�
+ *
+ * @param imgStr
+ * @return
+ */
+ public static boolean generateImage(String imgStr, String diskFile) {
+ if (imgStr == null)
+ return false;
+
+ if (imgStr.startsWith("data:")) {
+ imgStr = imgStr.substring(BASE_IMG_START.length());
+ }
+ BASE64Decoder decoder = new BASE64Decoder();
+ OutputStream out = null;
+ try {
+ // Base64瑙ｇ爜
+ byte[] b = decoder.decodeBuffer(imgStr);
+ for (int i = 0; i < b.length; ++i) {
+ if (b[i] < 0) {
+ b[i] += 256;
+ }
+ }
+ // 鐢熸垚jpeg鍥剧墖
+ out = new FileOutputStream(diskFile);
+ out.write(b);
+ out.flush();
+ // out.close();
+ return true;
+ } catch (Exception e) {
+ return false;
+ } finally {
+ try {
+ if (null != out)
+ out.close();
+ } catch (Exception e) {
+
+ }
+ }
+ }
+
+ public static String encode2String(byte[] data) {
+ BASE64Encoder encoder = new BASE64Encoder();
+ return BASE_IMG_START + encoder.encode(data);
+ }
+
+
+ /**
+ * 灏咮ase64缂栫爜鐨勬暟鎹浆鎹负鏂囦欢骞朵繚瀛樺埌鏈湴
+ *
+ * @param base64Data Base64缂栫爜鐨勫瓧绗︿覆鏁版嵁
+ * @param outputFilePath 杈撳嚭鏂囦欢鐨勮矾寰�
+ * @return 濡傛灉鎴愬姛锛岃繑鍥炰繚瀛樼殑鏂囦欢璺緞锛涘惁鍒欒繑鍥瀗ull
+ */
+ public static String saveBase64ToFile(String base64Data, String outputFilePath) {
+ try {
+ // 绉婚櫎鍙兘瀛樺湪鐨凚ase64鏁版嵁鍓嶇紑锛堜緥濡俤ata:image/png;base64,锛�
+ if (base64Data.contains(";base64,")) {
+ base64Data = base64Data.split(";base64,")[1];
+ }
+
+ // 瑙ｇ爜Base64鏁版嵁
+ byte[] fileData = Base64.getDecoder().decode(base64Data);
+
+ // 纭繚鐩綍瀛樺湪
+ Path path = Paths.get(outputFilePath);
+ Path parentDir = path.getParent();
+ if (parentDir != null && !Files.exists(parentDir)) {
+ Files.createDirectories(parentDir);
+ }
+
+ // 鍐欏叆鏂囦欢
+ Files.write(path, fileData, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+
+ System.out.println("鏂囦欢宸叉垚鍔熶繚瀛樿嚦: " + outputFilePath);
+ return outputFilePath;
+
+ } catch (IllegalArgumentException e) {
+ System.out.println("閿欒: 鏃犳晥鐨凚ase64鏁版嵁 - " + e.getMessage());
+ return null;
+ } catch (IOException e) {
+ System.out.println("閿欒: 鏂囦欢鎿嶄綔澶辫触 - " + e.getMessage());
+ return null;
+ } catch (Exception e) {
+ System.out.println("閿欒: 鍙戠敓浜嗘湭鐭ラ敊璇� - " + e.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * 灏哹ase64缂栫爜杞崲鎴怭DF锛屼繚瀛�
+ *
+ * @param base64sString 1.浣跨敤BASE64Decoder瀵圭紪鐮佺殑瀛楃涓茶В鐮佹垚瀛楄妭鏁扮粍
+ * 2.浣跨敤搴曞眰杈撳叆娴丅yteArrayInputStream瀵硅薄浠庡瓧鑺傛暟缁勪腑鑾峰彇鏁版嵁锛�
+ * 3.寤虹珛浠庡簳灞傝緭鍏ユ祦涓鍙栨暟鎹殑BufferedInputStream缂撳啿杈撳嚭娴佸璞★紱
+ * 4.浣跨敤BufferedOutputStream鍜孎ileOutputSteam杈撳嚭鏁版嵁鍒版寚瀹氱殑鏂囦欢涓�
+ */
+ public static void base64StringToPDF(String base64sString, String filePath, String fileName) {
+ File file1 = new File(filePath);
+ if (!file1.exists()) {
+ file1.mkdirs();
+ }
+ BufferedInputStream bin = null;
+ FileOutputStream fout = null;
+ BufferedOutputStream bout = null;
+ try {
+ //灏哹ase64缂栫爜鐨勫瓧绗︿覆瑙ｇ爜鎴愬瓧鑺傛暟缁�
+ byte[] bytes = decoder.decodeBuffer(base64sString);
+ //apache鍏徃鐨凙PI
+ //byte[] bytes = Base64.decodeBase64(base64sString);
+ //鍒涘缓涓�涓皢bytes浣滀负鍏剁紦鍐插尯鐨凚yteArrayInputStream瀵硅薄
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ //鍒涘缓浠庡簳灞傝緭鍏ユ祦涓鍙栨暟鎹殑缂撳啿杈撳叆娴佸璞�
+ bin = new BufferedInputStream(bais);
+ //鎸囧畾杈撳嚭鐨勬枃浠�
+ File file = new File(filePath + fileName);
+ //鍒涘缓鍒版寚瀹氭枃浠剁殑杈撳嚭娴�
+ fout = new FileOutputStream(file);
+ //涓烘枃浠惰緭鍑烘祦瀵规帴缂撳啿杈撳嚭娴佸璞�
+ bout = new BufferedOutputStream(fout);
+
+ byte[] buffers = new byte[1024];
+ int len = bin.read(buffers);
+ while (len != -1) {
+ bout.write(buffers, 0, len);
+ len = bin.read(buffers);
+ }
+ //鍒锋柊姝よ緭鍑烘祦骞跺己鍒跺啓鍑烘墍鏈夌紦鍐茬殑杈撳嚭瀛楄妭锛屽繀椤昏繖琛屼唬鐮侊紝鍚﹀垯鏈夊彲鑳芥湁闂
+ bout.flush();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ bin.close();
+ fout.close();
+ bout.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/api/utils/ContextUtil.java b/src/main/java/com/fzzy/api/utils/ContextUtil.java
index 92e0c24..64e1766 100644
--- a/src/main/java/com/fzzy/api/utils/ContextUtil.java
+++ b/src/main/java/com/fzzy/api/utils/ContextUtil.java
@@ -2,6 +2,8 @@
import com.fzzy.api.Constant;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import java.util.Calendar;
@@ -22,6 +24,9 @@
return System.currentTimeMillis() + "";
}
+ public static String getTimeId(int random) {
+ return DateFormatUtils.format(new Date(), "yyyyMMddHHmmss") + RandomUtils.nextInt(random);
+ }
/**
* 鏍规嵁褰撳墠鏃堕棿鑾峰彇鍙湁 yyyy-MM-dd鐨勬椂闂�
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItem.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItem.java
new file mode 100644
index 0000000..2f7cd82
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItem.java
@@ -0,0 +1,113 @@
+package com.fzzy.async.whhpjl.entity;
+
+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: andy.jia
+ * @description:
+ * @version:
+ * @data:2020骞�4鏈�7鏃�
+ */
+@Data
+@Entity
+@Table(name = "D_CHECK_ITEM")
+public class Fz40WhjlCheckItem implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "CHECK_ID_", length = 40)
+ @PropertyDef(label = "妫�娴嬬紪鐮�")
+ private String checkId;
+
+ @Id
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Id
+ @Column(name = "STANDARD_ID_", length = 10)
+ @PropertyDef(label = "妫�娴嬮」缂栫爜")
+ private String standardId;
+
+ @Column(name = "STANDARD_NAME_", length = 50)
+ @PropertyDef(label = "鍖栭獙椤�")
+ private String standardName;
+
+ @Column(name = "UNIT_", length = 20)
+ @PropertyDef(label = "鍗曚綅")
+ private String unit;
+
+ @Column(name = "UPPER_LIMIT_")
+ @PropertyDef(label = "鏍囧噯浼愬��")
+ private Double upperLimit;
+
+ @Column(name = "OPERA_SYMBOL_", length = 4)
+ @PropertyDef(label = "杩愮畻绗﹀彿")
+ private String operaSymbol;
+
+ @Column(name = "RULE_NUM_")
+ @PropertyDef(label = "鎵ｉ噸绯绘暟")
+ private Double ruleNum;
+
+ @Column(name = "RULE_ADD_")
+ @PropertyDef(label = "澧為噸%")
+ private Double ruleAdd;
+
+ @Column(name = "RULE_ADD_END_")
+ @PropertyDef(label = "澧為噸涓婇檺%")
+ private Double ruleAddEnd;
+
+ @Column(name = "RULE_REDUCE_")
+ @PropertyDef(label = "鎵ｉ噸鍊�%")
+ private Double ruleReduce;
+
+ @Column(name = "VALUE_", length = 40)
+ @PropertyDef(label = "妫�娴嬪��")
+ private String value;
+
+ @Column(name = "RULE_PRICE_")
+ @PropertyDef(label = "鎵ｈ垂绯绘暟")
+ private Double rulePrice;
+
+ @Column(name = "RULE_REDUCE_PRICE_")
+ @PropertyDef(label = "鎵ｈ垂")
+ private Double ruleReducePrice;
+
+ @Column(name = "ADD_NUM_")
+ @PropertyDef(label = "澧為噸", description = "鍗曚綅锛歬G")
+ private Double addNum;
+
+ @Column(name = "DE_NUM_")
+ @PropertyDef(label = "鎵ｉ噸", description = "鍗曚綅锛歬G")
+ private Double deNum;
+
+ @Column(name = "ADD_PRICE_")
+ @PropertyDef(label = "澧炰环", description = "鍗曚綅锛氬厓")
+ private Double addPrice;
+
+ @Column(name = "DE_PRICE_")
+ @PropertyDef(label = "鎵ｄ环", description = "鍗曚綅锛氬厓")
+ private Double dePrice;
+
+ @Column(name = "RESULT_", length = 2)
+ @PropertyDef(label = "妫�楠岀粨鏋�", description = "0=涓嶅悎鏍� 1=鍚堟牸")
+ private String result;
+
+ @Column(name = "REMARKS_", length = 50)
+ @PropertyDef(label = "澶囨敞")
+ private String remarks;
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDd.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDd.java
new file mode 100644
index 0000000..8ca5e8e
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDd.java
@@ -0,0 +1,86 @@
+package com.fzzy.async.whhpjl.entity;
+
+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 Fz40WhjlCheckItemDd {
+
+
+ @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/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDm.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDm.java
new file mode 100644
index 0000000..4d0e19b
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemDm.java
@@ -0,0 +1,104 @@
+package com.fzzy.async.whhpjl.entity;
+
+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 Fz40WhjlCheckItemDm {
+
+ @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/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemSyy.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemSyy.java
new file mode 100644
index 0000000..7d08408
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemSyy.java
@@ -0,0 +1,98 @@
+package com.fzzy.async.whhpjl.entity;
+
+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 Fz40WhjlCheckItemSyy {
+
+
+ @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/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemXmf.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemXmf.java
new file mode 100644
index 0000000..38b5553
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlCheckItemXmf.java
@@ -0,0 +1,110 @@
+package com.fzzy.async.whhpjl.entity;
+
+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 Fz40WhjlCheckItemXmf {
+
+ @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/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlMQuality.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlMQuality.java
new file mode 100644
index 0000000..b999754
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlMQuality.java
@@ -0,0 +1,313 @@
+package com.fzzy.async.whhpjl.entity;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fzzy.api.Constant;
+import com.fzzy.otherview.whhpjl.dto.ShareApi2013Dd;
+import com.fzzy.otherview.whhpjl.dto.ShareApi2013Dm;
+import com.fzzy.otherview.whhpjl.dto.ShareApi2013Syy;
+import com.fzzy.otherview.whhpjl.dto.ShareApi2013Xmf;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 璐ㄩ噺绠＄悊锛�2023骞�5鏈�26鏃� 鏍规嵁鏂板浗绮浼樺寲璋冩暣
+ *
+ * @author chen
+ */
+@Data
+@Entity
+@Table(name = "D_M_QUALITY")
+public class Fz40WhjlMQuality implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "涓婚敭ID", description = "ZJ+妫�楠岀被鍒�+骞存湀鏃ユ椂鍒嗙")
+ private String id;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 50)
+ @PropertyDef(label = "浠撳簱缂栫爜")
+ private String depotId;
+
+ @Column(name = "FOOD_VARIETY_", length = 10)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
+
+ @Column(name = "FOOD_LEVEL_", length = 10)
+ @PropertyDef(label = "绮绛夌骇")
+ private String foodLevel;
+
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡")
+ @Column(name = "STORE_DATE_")
+ private Date storeDate;
+
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "妫�楠岀被鍒�", description = "01锛氬叆浠撻獙鏀� 02锛氬嚭浠撴楠� 03锛�3 鏈堟湯鏅04锛�9 鏈堟湯鏅 05锛氬叆浠撳垵妫� 06锛氭湀搴︽鏌� 07锛�3 鏈堟湯搴撳唴鏅煡 08锛�9 鏈堟湯搴撳唴鏅煡")
+ private String type;
+
+ @Column(name = "TIME_")
+ @PropertyDef(label = "妫�楠屾椂闂�")
+ private Date time;
+
+ @Column(name = "UNIT_", length = 50)
+ @PropertyDef(label = "妫�楠屽崟浣�")
+ private String unit;
+
+ @Column(name = "USER_", length = 50)
+ @PropertyDef(label = "妫�楠屼汉", description = "妫�楠屼汉鍛樺鍚嶏紝鑻ユ湁澶氫釜淇濈鍛�")
+ private String user;
+
+ @Column(name = "STANDARD_", length = 4)
+ @PropertyDef(label = "妫�楠屼緷鎹�", description = "1-鍥芥爣锛�0-鍏朵粬")
+ private String standard;
+
+
+ @PropertyDef(label = "鎸囨爣绫诲埆", description = "1: 璐ㄩ噺鎸囨爣妫�楠�2锛氬偍瀛樺搧璐ㄦ楠�3锛氶鍝佸畨鍏ㄦ楠� 濡傛灉鍚屾椂妫�楠屼簡澶氫釜锛岀敤#闅斿紑锛屼緥濡傦細1#2#3")
+ @Column(name = "zblb", length = 8)
+ private String zblb;
+
+ @Column(name = "RESULT_", length = 40)
+ @PropertyDef(label = "妫�楠岀粨璁�", description = "1銆佽川閲忔寚鏍囧～鍐�/杈炬爣/涓嶈揪鏍� 2銆佸偍瀛樺搧璐ㄦ寚鏍囧～鍐欌�滃疁瀛樷�濄�佽交搴︿笉瀹滃瓨鈥濄�佲�滈噸搴︿笉瀹滃瓨鈥�3銆侀鍝佸畨鍏ㄦ寚鏍囧～鍐欌�滃悎鏍尖�濄�佷笉鍚堟牸鈥� 澶氶」鎸囨爣鏃朵互#鍒嗛殧锛屼緥濡傦細杈炬爣|缁煎悎鍒ゅ畾#瀹滃瓨#鍚堟牸 ")
+ private String result;
+
+ @Column(name = "spaqzbsfhg", length = 40)
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸", description = "0-涓嶅悎鏍硷紝1-鍚堟牸")
+ private String spaqzbsfhg;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛惧彂鏃ユ湡")
+ @Column(name = "qfrq")
+ private Date qfrq;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶ュ憡鍑哄叿鏃堕棿")
+ @Column(name = "bgcjsj")
+ private Date bgcjsj;
+
+ @PropertyDef(label = "瀹℃牳浜哄鍚�")
+ @Column(name = "shrxm", length = 64)
+ private String shrxm;
+
+ @PropertyDef(label = "鎵︽牱鍗曠紪鍙�")
+ @Column(name = "qydbh", length = 64)
+ private String qydbh;
+
+ @Column(name = "CHECK_TIME_")
+ @PropertyDef(label = "鎵︽牱鏃堕棿", required = true)
+ private Date checkTime;
+
+ @Column(name = "CHECK_AREA_", length = 50)
+ @PropertyDef(label = "鎵︽牱鍖哄煙")
+ private String checkArea;
+
+ @Column(name = "CHECK_USER_", length = 50)
+ @PropertyDef(label = "鎵︽牱浜�", required = true)
+ private String checkUser;
+
+ @PropertyDef(label = "鐩戠潱浜哄鍚�")
+ @Column(name = "jdrxm", length = 64)
+ private String jdrxm;
+
+ @PropertyDef(label = "鏍峰搧缂栧彿")
+ @Column(name = "ypbh", length = 64)
+ private String ypbh;
+
+ @PropertyDef(label = "鏍峰搧鏁伴噺", required = true)
+ @Column(name = "ypsl", precision = 20, scale = 6)
+ private Double ypsl;
+
+ @PropertyDef(label = "浠ｈ〃鏁伴噺")
+ @Column(name = "dbsl", precision = 20, scale = 6)
+ private Double dbsl;
+
+ @PropertyDef(label = "鏍峰搧绛夌骇")
+ @Column(name = "ypdj", length = 2)
+ private String ypdj;
+
+ @Column(name = "NORMAL_YEAR_", length = 10)
+ @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺")
+ private String normalYear;
+
+ @Column(name = "REMARK_", length = 200)
+ @PropertyDef(label = "澶囨敞", description = "澶囨敞淇℃伅")
+ private String remark;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
+ private Date updateTime;
+
+
+ /**
+ * --------闄勪欢--------
+ **/
+ @Column(name = "FILE_ID_", length = 30)
+ @PropertyDef(label = "闄勪欢id")
+ private String fileId;
+
+ @Column(name = "FILE_NAME_", length = 50)
+ @PropertyDef(label = "闄勪欢鍚嶇О")
+ private String fileName;
+
+ @Column(name = "FILE_TIME_")
+ @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; //璐ㄦ鎶ュ憡鏂囦欢
+
+ @Column(name = "CREATE_DATE_", length = 40)
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private String createDate; //鍒涘缓鏃堕棿
+
+ @Column(name = "CREATE_BY_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createBy; //鍒涘缓浜�
+
+ @Column(name = "UPDATE_DATE_", length = 40)
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private String updateDate; //鏇存柊鏃堕棿
+
+ @Column(name = "UPDATE_BY_", length = 50)
+ @PropertyDef(label = "鏇存柊浜�")
+ private String updateBy; //鏇存柊浜�
+
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
index a47009a..ef7a889 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1107.java
@@ -8,7 +8,7 @@
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultGranary;
-import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1106Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1107;
import lombok.extern.slf4j.Slf4j;
@@ -27,7 +27,7 @@
@Component
public class Fz40ToWhjlSync1107 {
@Autowired
- private Fz40ToWhjlSync1106Rep fz40ToWhjlSync1106Rep;
+ private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -42,19 +42,19 @@
* @param end
*/
public void syncData(String kqdm, String deptId, Date start, Date end) {
- log.info("-------------1106鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ log.info("-------------1107鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1106);
+ apiLog.setInteId(Constant.API_CODE_1107);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40WhjlDefaultGranary> list = fz40ToWhjlSync1106Rep.listApi1106(deptId.substring(0, 4));
+ List<Fz40WhjlDefaultGranary> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
return;
@@ -92,7 +92,7 @@
infoData.setId(sysData.getAjdh());
infoData.setKqdm(kqdm);
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1106);
+ infoData.setInteId(WhjlConstant.API_CODE_1107);
infoData.setUpdateTime(new Date());
infoData.setDataId(sysData.getAjdh());
infoData.setRemarks("澶囨敞淇℃伅");
@@ -111,12 +111,12 @@
apiInfoDataRep.save(infoData);
- log.info("1106---寤掗棿-鍚屾鏁版嵁锛歿}", apiData.toString());
+ log.info("1107---寤掗棿-鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
- log.error("---1106寤掗棿-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
- apiLog.setResult("1106寤掗棿淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ log.error("---1107寤掗棿-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1107寤掗棿淇℃伅鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
}
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java
index beeeded..75fee47 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1108.java
@@ -8,7 +8,7 @@
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
-import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1107Rep;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1108Rep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1108;
import lombok.extern.slf4j.Slf4j;
@@ -28,7 +28,7 @@
public class Fz40ToWhjlSync1108 {
@Autowired
- private Fz40ToWhjlSync1107Rep fz40ToWhjlSync1107Rep;
+ private Fz40ToWhjlSync1108Rep fz40ToWhjlSync1108Rep;
@Autowired
private ApiLogRep apiLogRep;
@Autowired
@@ -43,19 +43,19 @@
* @param end
*/
public void syncData(String kqdm, String deptId, Date start, Date end) {
- log.info("-------------1107鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+ log.info("-------------1108鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
apiLog.setType(ApiLog.TYPE_SYNC);
apiLog.setKqdm(deptId);
apiLog.setUploadTime(new Date());
- apiLog.setInteId(Constant.API_CODE_1107);
+ apiLog.setInteId(Constant.API_CODE_1108);
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1107Rep.listApi1107(deptId.substring(0, 4));
+ List<Fz40WhjlDefaultDepot> list = fz40ToWhjlSync1108Rep.listApi1108(deptId.substring(0, 4));
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒板崟浣嶄俊鎭�------------------");
return;
@@ -63,6 +63,7 @@
List<ApiInfoData> apiInfoDataList;
WhjlApi1108 apiData;
for (Fz40WhjlDefaultDepot sysData : list) {
+
apiData = new WhjlApi1108();
apiData.setHwbh(sysData.getId()); //璐т綅缂栧彿
apiData.setJlqybh(""); //鍐涚伯浼佷笟缂栧彿
@@ -88,7 +89,7 @@
infoData.setId(sysData.getId());
infoData.setKqdm(kqdm);
infoData.setInteType(WhjlConstant.API_CATEGORY_11);
- infoData.setInteId(WhjlConstant.API_CODE_1107);
+ infoData.setInteId(WhjlConstant.API_CODE_1108);
infoData.setUpdateTime(new Date());
infoData.setDataId(sysData.getId());
infoData.setRemarks("澶囨敞淇℃伅");
@@ -107,12 +108,12 @@
apiInfoDataRep.save(infoData);
- log.info("1107---璐т綅-鍚屾鏁版嵁锛歿}", apiData.toString());
+ log.info("1108---璐т綅-鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
- log.error("---1107璐т綅-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
- apiLog.setResult("1107璐т綅淇℃伅鍚屾澶辫触锛�" + e.getMessage());
+ log.error("---1108璐т綅-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1108璐т綅淇℃伅鍚屾澶辫触锛�" + e.getMessage());
apiLogRep.save(apiLog);
}
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
index 9945fcb..23355e5 100644
--- a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1212.java
@@ -72,6 +72,11 @@
List<ApiInfoData> apiInfoDataList;
WhjlApi1212 apiData;
for (Fz40WhjlInoutRecord sysData : list) {
+ if(sysData.getRecordStatus().equals("DEL")) {
+ //濡傛灉鏄垹闄ょ姸鎬侊紝鍒欎笉杩涜鍚屾
+ log.info("1212---鍑哄叆搴撹褰�-鍚屾鏁版嵁锛歿}锛岀姸鎬佷负鍒犻櫎锛屼笉杩涜鍚屾", sysData.getId());
+ continue;
+ }
List<ApiInfoData> dept = apiInfoDataRep.getDataByDataId(sysData.getCompanyId());
WhjlApi1101 whjlApi1101 = JSONObject.parseObject(dept.get(0).getData(), WhjlApi1101.class);
List<ApiInfoData> deptArea = apiInfoDataRep.getDataByDataId(sysData.getDeptId());
@@ -85,7 +90,7 @@
apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[]{"yyyyMMdd"}));
if(sysData.getType().equals("IN")){
apiData.setCrklx("鍏ュ簱");
- apiData.setYwlx("鏃ュ父鍑哄叆搴�");//鍑哄叆搴撶被鍨�: 鏃ュ父鍑哄叆搴�/鏃ュ父鍑哄簱/搴旀�ュ叆搴�/搴旀�ュ嚭搴�/鐩樼偣鍏ュ簱/鐩樼偣鍑哄簱/杞粨鍏ュ簱/杞粨鍑哄簱
+ apiData.setYwlx("鏃ュ父鍏ュ簱");//鍑哄叆搴撶被鍨�: 鏃ュ父鍑哄叆搴�/鏃ュ父鍑哄簱/搴旀�ュ叆搴�/搴旀�ュ嚭搴�/鐩樼偣鍏ュ簱/鐩樼偣鍑哄簱/杞粨鍏ュ簱/杞粨鍑哄簱
}
if(sysData.getType().equals("OUT")){
apiData.setCrklx("鍑哄簱");
@@ -119,11 +124,10 @@
}
apiData.setHwbh(whjlApi1108.getHwbh());//璐т綅缂栧彿
apiData.setHwmc(whjlApi1108.getHwmc());//璐т綅鍚嶇О
- apiData.setAjbh(apiData.getHwbh().substring(0,28));//寤掗棿缂栧彿
- apiData.setAjmc(apiData.getHwmc());// TODO 寤掗棿鍚嶇О
+ apiData.setAjbh(whjlApi1108.getHwbh().substring(0,28));//寤掗棿缂栧彿
+ apiData.setAjmc(whjlApi1108.getHwmc());// TODO 寤掗棿鍚嶇О
- apiData.setKctzbh(sysData.getId().substring(2));//搴撳瓨鍙拌处ID
- apiData.setKctzcppcid(sysData.getId().substring(2));//搴撳瓨鍙拌处鎵规ID
+
// apiData.setPsmxid("");//閰嶉�佽溅杈嗘槑缁咺D
// apiData.setYjfamxid("");//搴旀�ユ柟妗堟槑缁咺D
@@ -132,29 +136,44 @@
if(lspz != null && lspz.size() > 0){
apiData.setLspzmc(lspz.get(0).getName());//鍝佺鍚嶇О
}
- if (sysData.getFoodVariety().equals("2")){
+ if (sysData.getFoodVariety().startsWith("2")){
+ apiData.setKctzbh("1234567891234567002");//搴撳瓨鍙拌处ID
+ apiData.setKctzcppcid("12312332132145002");//搴撳瓨鍙拌处鎵规ID
+ apiData.setJldwbm("12");//璁￠噺鍗曚綅缂栫爜
+ apiData.setJldwmc("鍗冨厠");//璁￠噺鍗曚綅鍚嶇О
+ apiData.setJsdwbm("21");//璁℃暟鍗曚綅缂栫爜
+ apiData.setJsdwmc("琚�");//璁℃暟鍗曚綅鍚嶇О
+
//灏忛害绮�
- apiData.setCpbh("FJL89570583ec0a2571");//浜у搧缂栧彿
- apiData.setCpmc("灏忛害绮�");//浜у搧缂栧彿
+ apiData.setCpbh("FJL4a971ea2d319e518");//浜у搧缂栧彿
+ apiData.setCpmc("绮捐嚧灏忛害绮�");//浜у搧缂栧彿
}
- if (sysData.getFoodVariety().equals("1")){
+ if (sysData.getFoodVariety().startsWith("1")){
+ apiData.setKctzbh("1234567891234567001");//搴撳瓨鍙拌处ID
+ apiData.setKctzcppcid("12312332132145001");//搴撳瓨鍙拌处鎵规ID
+ apiData.setJldwbm("12");//璁￠噺鍗曚綅缂栫爜
+ apiData.setJldwmc("鍗冨厠");//璁￠噺鍗曚綅鍚嶇О
+ apiData.setJsdwbm("21");//璁℃暟鍗曚綅缂栫爜
+ apiData.setJsdwmc("琚�");//璁℃暟鍗曚綅鍚嶇О
//澶х背
- apiData.setCpbh("FJLdf09130205a43278");//浜у搧缂栧彿
- apiData.setCpmc("澶х背");//浜у搧缂栧彿
+ apiData.setCpbh("FJL0b1fc3761a2c0a46");//浜у搧缂栧彿
+ apiData.setCpmc("闀挎睙缁垮湴绮崇背");//浜у搧缂栧彿
}
- if (sysData.getFoodVariety().equals("3")){
+ if (sysData.getFoodVariety().startsWith("3")){
+ apiData.setKctzbh("1234567891234567003");//搴撳瓨鍙拌处ID
+ apiData.setKctzcppcid("12312332132145003");//搴撳瓨鍙拌处鎵规ID
+ apiData.setJldwbm("13");//璁￠噺鍗曚綅缂栫爜
+ apiData.setJldwmc("鍗�");//璁￠噺鍗曚綅鍚嶇О
+ apiData.setJsdwbm("23");//璁℃暟鍗曚綅缂栫爜
+ apiData.setJsdwmc("鐡�");//璁℃暟鍗曚綅鍚嶇О
//椋熺敤娌�
- apiData.setCpbh("FJL3e7ba1605ebd5dec");//浜у搧缂栧彿
- apiData.setCpmc("椋熺敤娌�");//浜у搧缂栧彿
+ apiData.setCpbh("FJL60a5761059bf08df");//浜у搧缂栧彿
+ apiData.setCpmc("鑿滅苯娌�");//浜у搧鍚嶇О
}
- apiData.setJldwbm("12");//璁￠噺鍗曚綅缂栫爜
- apiData.setJldwmc("鍗冨厠");//璁￠噺鍗曚綅鍚嶇О
- apiData.setJsdwbm("21");//璁℃暟鍗曚綅缂栫爜
- apiData.setJsdwmc("琚�");//璁℃暟鍗曚綅鍚嶇О
// apiData.setCrklx("");//鍑哄叆搴撶被鍨�
@@ -179,7 +198,7 @@
// apiData.setSccj("");//鐢熶骇鍘傚
// apiData.setGg("");//瑙勬牸鍨嬪彿
// apiData.setCppc("");//浜у搧鎵规
-// apiData.setScrq(null);//鐢熶骇鏃ユ湡
+ apiData.setScrq(sysData.getRegisterTime());//鐢熶骇鏃ユ湡
// apiData.setBzq(null);//淇濊川鏈�
// apiData.setCkfs("");//鍑哄簱鏂瑰紡
apiData.setDjsj(sysData.getRegisterTime());//鐧昏鏃堕棿
@@ -224,8 +243,6 @@
infoData.setData(JSON.toJSONString(apiData));
apiInfoDataRep.save(infoData);
-
-
log.info("1212---鍑哄叆搴撹褰�-鍚屾鏁版嵁锛歿}", apiData.toString());
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1216.java b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1216.java
new file mode 100644
index 0000000..7964eed
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/impl/Fz40ToWhjlSync1216.java
@@ -0,0 +1,123 @@
+package com.fzzy.async.whhpjl.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlMQuality;
+import com.fzzy.async.whhpjl.repository.Fz40ToWhjlSync1216Rep;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.WhjlApi1216;
+import com.fzzy.otherview.whhpjl.dto.WhjlCheckItm;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 璐ㄦ鎶ュ憡
+ *
+ * @Author:YAN
+ */
+@Slf4j
+@Component
+public class Fz40ToWhjlSync1216 {
+
+ @Autowired
+ private Fz40ToWhjlSync1216Rep fz40ToWhjlSync1216Rep;
+ @Autowired
+ private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+
+ /**
+ * 璐ㄦ鎶ュ憡
+ *
+ * @param kqdm
+ * @param deptId
+ * @param start
+ * @param end
+ */
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
+ log.info("-------------1216鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
+
+ //鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
+ ApiLog apiLog = new ApiLog();
+ apiLog.setType(ApiLog.TYPE_SYNC);
+ apiLog.setKqdm(deptId);
+ apiLog.setUploadTime(new Date());
+ apiLog.setInteId("1216");
+ apiLog.setStatus(99);
+ apiLog.setId(ContextUtil.getUUID());
+ try {
+ List<Fz40WhjlMQuality> list = fz40ToWhjlSync1216Rep.listApi1216(deptId.substring(0, 4));
+ List<ApiInfoData> apiInfoDataList;
+ WhjlApi1216 apiData;
+ List<WhjlCheckItm> whjlCheckItmList = new ArrayList<>();
+ for (Fz40WhjlMQuality sysData : list) {
+ apiData = new WhjlApi1216();
+ //璁剧疆鏁版嵁
+ apiData.setJcbgbh(sysData.getId());//妫�娴嬫姤鍛婄紪鍙�
+ apiData.setCybh(sysData.getYpbh());//鏍峰搧缂栧彿
+ apiData.setJyca(null);//妫�楠屾柟妗� 搴撳唴鍖栭獙/濮旀墭鍖栭獙
+ apiData.setJybzid(null);//妫�楠屾爣鍑咺D -鍏变韩鎺ュ彛鑾峰彇
+ apiData.setYjbzmc(null);//妫�楠屾爣鍑嗗悕绉� -鍏变韩鎺ュ彛鑾峰彇
+ apiData.setJyjg(null);//妫�楠岀粨鏋� -鍚堟牸\涓嶅悎鏍�
+ apiData.setJysj(sysData.getTime());//妫�楠屾椂闂�
+ apiData.setJybglx(null);//妫�娴嬫姤鍛婄被鍨� -瀹氭湡妫�娴嬫姤鍛� 鍏ュ簱妫�楠屾姤鍛� 鍑哄簱妫�楠屾姤鍛� 绗笁鏂规娴嬫姤鍛� 绗笁鏂规娴嬫姤鍛� 绗笁鏂瑰師绮楠屾姤鍛� 鎴愬搧绮楠屾姤鍛� 渚涘簲浼佷笟鑷鎶ュ憡
+ apiData.setJyr(sysData.getUser());//妫�楠屼汉
+ apiData.setBz(sysData.getRemark());//澶囨敞
+
+
+ //todo 璐ㄦ鎶ュ憡鏄庣粏
+ apiData.setJcmx(whjlCheckItmList);//妫�娴嬫槑缁�
+
+
+ apiData.setJcbgwj(null);//妫�娴嬫姤鍛婃枃浠�
+
+
+
+ apiData.setBizId(sysData.getId());
+ apiData.setUpdateTime(new Date());
+
+ //鎸佷箙鍖栦繚瀛橈紝鍗曠嫭瀛樺叆闈炲浗鏍囨帴鍙ｈ〃
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(sysData.getId());
+ infoData.setKqdm(kqdm);
+ infoData.setInteType(WhjlConstant.API_CATEGORY_12);
+ infoData.setInteId(WhjlConstant.API_CODE_1216);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(sysData.getId());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ //璁剧疆鎿嶄綔鏍囧織
+ apiInfoDataList = apiInfoDataRep.getDataByDataId(infoData.getDataId());
+ if (null == apiInfoDataList || apiInfoDataList.isEmpty()) {
+ apiData.setCzbz(Constant.CZBZ_I);
+ infoData.setCzbz(Constant.CZBZ_I);
+ } else {
+ apiData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
+ }
+
+ infoData.setData(JSON.toJSONString(apiData));
+ apiInfoDataRep.save(infoData);
+
+
+ log.info("1216---鍑哄叆搴撹褰�-鍚屾鏁版嵁锛歿}", apiData.toString());
+
+ }
+ } catch (Exception e) {
+ log.error("---1216鍑哄叆搴撹褰�-鍚屾鏁版嵁鎵ц澶辫触----{}", e.getMessage());
+ apiLog.setResult("1216鍑哄叆搴撹褰曚俊鎭悓姝ュけ璐ワ細" + e.getMessage());
+ apiLogRep.save(apiLog);
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java
index 090b258..ed5560e 100644
--- a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1107Rep.java
@@ -13,7 +13,7 @@
*
* @Author:YAN
*/
-public interface Fz40ToWhjlSync1107Rep extends JpaRepository<Fz40WhjlDefaultDepot, String> {
+public interface Fz40ToWhjlSync1107Rep extends JpaRepository<Fz40WhjlDefaultGranary, String> {
/**
* 鑾峰彇璐т綅淇℃伅
@@ -21,5 +21,5 @@
* @return
*/
@Query("from Fz40WhjlDefaultDepot where companyId=:companyId ")
- List<Fz40WhjlDefaultDepot> listApi1107(@Param("companyId") String companyId);
+ List<Fz40WhjlDefaultGranary> listApi1107(@Param("companyId") String companyId);
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1108Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1108Rep.java
new file mode 100644
index 0000000..7d99415
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1108Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultDepot;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 璐т綅淇℃伅
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync1108Rep extends JpaRepository<Fz40WhjlDefaultDepot, String> {
+
+ /**
+ * 鑾峰彇璐т綅淇℃伅
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlDefaultDepot where companyId=:companyId ")
+ List<Fz40WhjlDefaultDepot> listApi1108(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1216Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1216Rep.java
new file mode 100644
index 0000000..5155335
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync1216Rep.java
@@ -0,0 +1,24 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlDefaultInoutRecord;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlMQuality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撹褰�
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync1216Rep extends JpaRepository<Fz40WhjlMQuality, String> {
+ /**
+ * 鍑哄叆搴撹褰�
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlMQuality where companyId=:companyId ")
+ List<Fz40WhjlMQuality> listApi1216(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DdRep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DdRep.java
new file mode 100644
index 0000000..406c8a3
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DdRep.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlCheckItemDd;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlMQuality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撹褰�
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync2013DdRep extends JpaRepository<Fz40WhjlCheckItemDd, String> {
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DmRep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DmRep.java
new file mode 100644
index 0000000..2d20b8f
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013DmRep.java
@@ -0,0 +1,18 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlCheckItemDm;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlMQuality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撹褰�
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync2013DmRep extends JpaRepository<Fz40WhjlCheckItemDm, String> {
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013Rep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013Rep.java
new file mode 100644
index 0000000..bec1cf5
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013Rep.java
@@ -0,0 +1,23 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlMQuality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撹褰�
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync2013Rep extends JpaRepository<Fz40WhjlMQuality, String> {
+ /**
+ * 鐪佺骇璐ㄦ鎶ュ憡
+ *
+ * @return
+ */
+ @Query("from Fz40WhjlMQuality where companyId=:companyId ")
+ List<Fz40WhjlMQuality> listApi2013(@Param("companyId") String companyId);
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013SyyRep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013SyyRep.java
new file mode 100644
index 0000000..1f13ad8
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013SyyRep.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlCheckItemDd;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlCheckItemSyy;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlMQuality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撹褰�
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync2013SyyRep extends JpaRepository<Fz40WhjlCheckItemSyy, String> {
+
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013XmfRep.java b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013XmfRep.java
new file mode 100644
index 0000000..7e99cc9
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/repository/Fz40ToWhjlSync2013XmfRep.java
@@ -0,0 +1,19 @@
+package com.fzzy.async.whhpjl.repository;
+
+import com.fzzy.async.whhpjl.entity.Fz40WhjlCheckItemDd;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlCheckItemXmf;
+import com.fzzy.async.whhpjl.entity.Fz40WhjlMQuality;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撹褰�
+ *
+ * @Author:YAN
+ */
+public interface Fz40ToWhjlSync2013XmfRep extends JpaRepository<Fz40WhjlCheckItemXmf, String> {
+
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
index 8d43e64..1e1bf40 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1112.view.xml
@@ -145,7 +145,6 @@
<Property name="label">瀵嗙爜</Property>
</PropertyDef>
<PropertyDef name="rstpdz">
- <Property name="dataType">Integer</Property>
<Property name="label">Rtsp鍦板潃</Property>
</PropertyDef>
<PropertyDef name="rtspdk">
@@ -347,7 +346,7 @@
<Property name="property">sbzt</Property>
</DataColumn>
<DataColumn name="ggxh">
- <Property name="property">ggxh</Property>
+ <Property name="property">ipdz</Property>
</DataColumn>
<DataColumn name="zzdw">
<Property name="property">zzdw</Property>
@@ -567,7 +566,6 @@
<AutoFormElement>
<Property name="name">jklx</Property>
<Property name="property">jklx</Property>
- <Property name="trigger">listDropType</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
index b7fe814..43b42af 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
@@ -699,6 +699,10 @@
<Property name="property">jlqymc</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn name="hwmc">
+ <Property name="property">hwmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn name="jgzdmc">
<Property name="property">jgzdmc</Property>
<Property name="align">center</Property>
@@ -735,6 +739,10 @@
<Property name="property">yscch</Property>
<Property name="align">center</Property>
</DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn>
<ClientEvent name="onRenderCell">arg.dom.innerHTML="<a href='javascript:;' class ='btn-s-default' onClick='edit()'>璇︽儏</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a class ='btn-s-warm' href='javascript:;' onClick='save()'>鏂板</a>";
arg.progressDefault= false;</ClientEvent>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
index 86220ac..6aaa1b6 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -282,6 +282,7 @@
public static String API_CODE_2010 = "2010";
public static String API_CODE_2011 = "2011";
public static String API_CODE_2012 = "2012";
+ public static String API_CODE_2013 = "2013";
/*----------鎺ュ彛璺緞----------*/
@@ -421,5 +422,6 @@
public static String API_CODE_SHARE_ZLJCBZ= "ZLJCBZ";
public static String API_CODE_SHARE_ZLJCXM= "ZLJCXM";
public static String API_CODE_SHARE_YJFAXX= "YJFAXX";
+ public static String API_CODE_SHARE_SZJZXBG= "SZJZXBG";
}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi2013.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi2013.view.xml
new file mode 100644
index 0000000..4f7b1b0
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi2013.view.xml
@@ -0,0 +1,1282 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlShareApi2013</Property>
+ <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></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="remark">
+ <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>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <Reference name="orgReportRiceList">
+ <Property name="parameter">$${this.orgReportRiceList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Dm</Property>
+ <Property name="dataType">[dtItemShareApi2013Dm]</Property>
+ </Reference>
+ <Reference name="orgReportNoodlesList">
+ <Property name="parameter">$${this.orgReportNoodlesList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Xmf</Property>
+ <Property name="dataType">[dtItemShareApi2013Xmf]</Property>
+ </Reference>
+ <Reference name="orgReportSoybeanList">
+ <Property name="parameter">$${this.orgReportSoybeanList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Dd</Property>
+ <Property name="dataType">[dtItemShareApi2013Dd]</Property>
+ </Reference>
+ <Reference name="orgReportOilList">
+ <Property name="parameter">$${this.orgReportOilList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Syy</Property>
+ <Property name="dataType">[dtItemShareApi2013Syy]</Property>
+ </Reference>
+ <PropertyDef name="fileId">
+ <Property></Property>
+ <Property name="label">闄勪欢id</Property>
+ </PropertyDef>
+ <PropertyDef name="fileName">
+ <Property></Property>
+ <Property name="label">闄勪欢鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="fileTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">闄勪欢涓婁紶鏃堕棿</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtItemShareApi2013Dm">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Dm</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="dtItemShareApi2013Xmf">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Xmf</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="ashContent">
+ <Property></Property>
+ <Property name="label">鐏板垎鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="fattyContent">
+ <Property></Property>
+ <Property name="label">鑴傝偑閰稿惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="processingAccuracy">
+ <Property></Property>
+ <Property name="label">鍔犲伐绮惧害</Property>
+ </PropertyDef>
+ <PropertyDef name="sandContent">
+ <Property></Property>
+ <Property name="label">鍚爞閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="colorOdor">
+ <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="waterContent">
+ <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="cadmium">
+ <Property></Property>
+ <Property name="label">闀�</Property>
+ </PropertyDef>
+ <PropertyDef name="benzoylPeroxide">
+ <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="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="dtItemShareApi2013Dd">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Dd</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="dtItemShareApi2013Syy">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Syy</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="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlShareApi2013PR2#listData</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="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">
+var select = view.get("#dgMain").get("selection");
+ view.get("#ajaxsysDataToDept").execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });</ClientEvent>
+ <Property name="caption">鍚屾鑷冲簱鍖�</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">鏇存柊璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+ view.get("#ajaxPull").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+ </ClientEvent>
+ <Property name="caption">鎵嬪姩鏇存柊</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <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>
+ <DataColumn name="lotNumber">
+ <Property name="property">lotNumber</Property>
+ </DataColumn>
+ <DataColumn name="specificationModel">
+ <Property name="property">specificationModel</Property>
+ </DataColumn>
+ <DataColumn name="cysm">
+ <Property name="property">cysm</Property>
+ </DataColumn>
+ <DataColumn name="registration">
+ <Property name="property">registration</Property>
+ </DataColumn>
+ <DataColumn name="inspectPlan">
+ <Property name="property">inspectPlan</Property>
+ </DataColumn>
+ <DataColumn name="productType">
+ <Property name="property">productType</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain" layout="regionPadding:10;padding:5">
+ <Property name="width">80%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">搴旀�ユ柟妗堜俊鎭�</Property>
+ <Property name="height">85%</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet>
+ <Property name="caption">鐪佽川妫�涓績鎶ュ憡</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelPosition">left</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">right</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">reportFile</Property>
+ <Property name="property">reportFile</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">remark</Property>
+ <Property name="property">remark</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">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportRiceList</Property>
+ <Property name="property">orgReportRiceList</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportNoodlesList</Property>
+ <Property name="property">orgReportNoodlesList</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportSoybeanList</Property>
+ <Property name="property">orgReportSoybeanList</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportOilList</Property>
+ <Property name="property">orgReportOilList</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">澶х背妫�楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail2">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportRiceList</Property>
+ <DataColumn name="qlyOrgReportRiceId">
+ <Property name="property">qlyOrgReportRiceId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="brokenRice">
+ <Property name="property">brokenRice</Property>
+ </DataColumn>
+ <DataColumn name="smallBrokenRice">
+ <Property name="property">smallBrokenRice</Property>
+ </DataColumn>
+ <DataColumn name="processingAccuracy">
+ <Property name="property">processingAccuracy</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ </DataColumn>
+ <DataColumn name="impuriryContent">
+ <Property name="property">impuriryContent</Property>
+ </DataColumn>
+ <DataColumn name="tastingValue">
+ <Property name="property">tastingValue</Property>
+ </DataColumn>
+ <DataColumn name="amyloseContent">
+ <Property name="property">amyloseContent</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ </DataColumn>
+ <DataColumn name="incompleteContent">
+ <Property name="property">incompleteContent</Property>
+ </DataColumn>
+ <DataColumn name="inorganicContent">
+ <Property name="property">inorganicContent</Property>
+ </DataColumn>
+ <DataColumn name="yellowRiceContent">
+ <Property name="property">yellowRiceContent</Property>
+ </DataColumn>
+ <DataColumn name="mixingRate">
+ <Property name="property">mixingRate</Property>
+ </DataColumn>
+ <DataColumn name="aflatioxin">
+ <Property name="property">aflatioxin</Property>
+ </DataColumn>
+ <DataColumn name="cadmium">
+ <Property name="property">cadmium</Property>
+ </DataColumn>
+ <DataColumn name="inorganicArsenic">
+ <Property name="property">inorganicArsenic</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">灏忛害绮夋楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail3">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportNoodlesList</Property>
+ <DataColumn name="qlyOrgReportNoodlesId">
+ <Property name="property">qlyOrgReportNoodlesId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="ashContent">
+ <Property name="property">ashContent</Property>
+ </DataColumn>
+ <DataColumn name="fattyContent">
+ <Property name="property">fattyContent</Property>
+ </DataColumn>
+ <DataColumn name="processingAccuracy">
+ <Property name="property">processingAccuracy</Property>
+ </DataColumn>
+ <DataColumn name="sandContent">
+ <Property name="property">sandContent</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ </DataColumn>
+ <DataColumn name="looksForm">
+ <Property name="property">looksForm</Property>
+ </DataColumn>
+ <DataColumn name="wetGluten">
+ <Property name="property">wetGluten</Property>
+ </DataColumn>
+ <DataColumn name="deoxynivalenol">
+ <Property name="property">deoxynivalenol</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ </DataColumn>
+ <DataColumn name="zearalenone">
+ <Property name="property">zearalenone</Property>
+ </DataColumn>
+ <DataColumn name="lead">
+ <Property name="property">lead</Property>
+ </DataColumn>
+ <DataColumn name="cadmium">
+ <Property name="property">cadmium</Property>
+ </DataColumn>
+ <DataColumn name="benzoylPeroxide">
+ <Property name="property">benzoylPeroxide</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ <DataColumn name="reportFile">
+ <Property name="property">reportFile</Property>
+ </DataColumn>
+ <DataColumn name="hfhljg">
+ <Property name="property">hfhljg</Property>
+ </DataColumn>
+ <DataColumn name="zfshljg">
+ <Property name="property">zfshljg</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">澶ц眴妫�楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail4">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportSoybeanList</Property>
+ <DataColumn name="qlyOrgReportSoybeanId">
+ <Property name="property">qlyOrgReportSoybeanId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="completeParticle">
+ <Property name="property">completeParticle</Property>
+ </DataColumn>
+ <DataColumn name="damageParticle">
+ <Property name="property">damageParticle</Property>
+ </DataColumn>
+ <DataColumn name="damageParticleHot">
+ <Property name="property">damageParticleHot</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ </DataColumn>
+ <DataColumn name="impurityContent">
+ <Property name="property">impurityContent</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisCamv">
+ <Property name="property">transgenosisCamv</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisNos">
+ <Property name="property">transgenosisNos</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisCoFour">
+ <Property name="property">transgenosisCoFour</Property>
+ </DataColumn>
+ <DataColumn name="lection">
+ <Property name="property">lection</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">椋熺敤娌规楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail5">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportOilList</Property>
+ <DataColumn name="qlyOrgReportOilId">
+ <Property name="property">qlyOrgReportOilId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="colorLustre">
+ <Property name="property">colorLustre</Property>
+ </DataColumn>
+ <DataColumn name="transparency">
+ <Property name="property">transparency</Property>
+ </DataColumn>
+ <DataColumn name="odorTaste">
+ <Property name="property">odorTaste</Property>
+ </DataColumn>
+ <DataColumn name="waterVolatileContent">
+ <Property name="property">waterVolatileContent</Property>
+ </DataColumn>
+ <DataColumn name="insolubleContent">
+ <Property name="property">insolubleContent</Property>
+ </DataColumn>
+ <DataColumn name="acidValue">
+ <Property name="property">acidValue</Property>
+ </DataColumn>
+ <DataColumn name="peroxideValue">
+ <Property name="property">peroxideValue</Property>
+ </DataColumn>
+ <DataColumn name="heatingTest">
+ <Property name="property">heatingTest</Property>
+ </DataColumn>
+ <DataColumn name="aflatioxin">
+ <Property name="property">aflatioxin</Property>
+ </DataColumn>
+ <DataColumn name="benzoPyrene">
+ <Property name="property">benzoPyrene</Property>
+ </DataColumn>
+ <DataColumn name="bha">
+ <Property name="property">bha</Property>
+ </DataColumn>
+ <DataColumn name="bht">
+ <Property name="property">bht</Property>
+ </DataColumn>
+ <DataColumn name="tbhq">
+ <Property name="property">tbhq</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlShareApi2013PR2#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlShareApi2013PR2#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPull">
+ <Property name="service">whjlShareApi2013PR2#pullData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxsysDataToDept">
+ <Property name="service">whjlShareApi2013PR2#sysDataToDept</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">鏇存柊璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi20132.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi20132.view.xml
new file mode 100644
index 0000000..3908cb3
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlShareApi20132.view.xml
@@ -0,0 +1,1330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlShareApi2013</Property>
+ <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></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="remark">
+ <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>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="czbz">
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdm">
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
+ </PropertyDef>
+ <Reference name="orgReportRiceList">
+ <Property name="parameter">$${this.orgReportRiceList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Dm</Property>
+ <Property name="dataType">[dtItemShareApi2013Dm]</Property>
+ </Reference>
+ <Reference name="orgReportNoodlesList">
+ <Property name="parameter">$${this.orgReportNoodlesList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Xmf</Property>
+ <Property name="dataType">[dtItemShareApi2013Xmf]</Property>
+ </Reference>
+ <Reference name="orgReportSoybeanList">
+ <Property name="parameter">$${this.orgReportSoybeanList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Dd</Property>
+ <Property name="dataType">[dtItemShareApi2013Dd]</Property>
+ </Reference>
+ <Reference name="orgReportOilList">
+ <Property name="parameter">$${this.orgReportOilList}</Property>
+ <Property name="dataProvider">whjlShareApi2013PR#listItemShareApi2013Syy</Property>
+ <Property name="dataType">[dtItemShareApi2013Syy]</Property>
+ </Reference>
+ <PropertyDef name="fileId">
+ <Property></Property>
+ <Property name="label">闄勪欢id</Property>
+ </PropertyDef>
+ <PropertyDef name="fileName">
+ <Property></Property>
+ <Property name="label">闄勪欢鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="fileTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">闄勪欢涓婁紶鏃堕棿</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtItemShareApi2013Dm">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Dm</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="dtItemShareApi2013Xmf">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Xmf</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="ashContent">
+ <Property></Property>
+ <Property name="label">鐏板垎鍚噺</Property>
+ </PropertyDef>
+ <PropertyDef name="fattyContent">
+ <Property></Property>
+ <Property name="label">鑴傝偑閰稿惈閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="processingAccuracy">
+ <Property></Property>
+ <Property name="label">鍔犲伐绮惧害</Property>
+ </PropertyDef>
+ <PropertyDef name="sandContent">
+ <Property></Property>
+ <Property name="label">鍚爞閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="colorOdor">
+ <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="waterContent">
+ <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="cadmium">
+ <Property></Property>
+ <Property name="label">闀�</Property>
+ </PropertyDef>
+ <PropertyDef name="benzoylPeroxide">
+ <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="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="dtItemShareApi2013Dd">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Dd</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="dtItemShareApi2013Syy">
+ <Property name="creationType">com.fzzy.otherview.whhpjl.dto.ShareApi2013Syy</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="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">whjlShareApi2013PR2#listData</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="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="exClassName">btn-warm</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.remove();
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
+}</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+ view.get("#ajaxPull").set("parameter",select).execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });
+ </ClientEvent>
+ <Property name="caption">鎵嬪姩鏇存柊</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ <Button layoutConstraint="right">
+ <ClientEvent name="onClick">//鏄剧ず璁板綍
+view.get("#iFrame").reload();
+view.get("#dialogLog").show();</ClientEvent>
+ <Property name="caption">鏇存柊璁板綍</Property>
+ <Property name="iconClass">fa fa-bars</Property>
+ <Property name="exClassName">btn-flush</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">
+var select = view.get("#dgMain").get("selection");
+ view.get("#ajaxsysDataToDept").execute(function(result){
+ view.get("#dsMain").flushAsync();
+ $notify(result);
+ });</ClientEvent>
+ <Property name="caption">鍚屾鑷冲簱鍖�</Property>
+ <Property name="iconClass">fa fa-hand-o-up</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ </Container>
+ <Container layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+if(data){
+ view.get("#dialogMain").show();
+}</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <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>
+ <DataColumn name="lotNumber">
+ <Property name="property">lotNumber</Property>
+ </DataColumn>
+ <DataColumn name="specificationModel">
+ <Property name="property">specificationModel</Property>
+ </DataColumn>
+ <DataColumn name="cysm">
+ <Property name="property">cysm</Property>
+ </DataColumn>
+ <DataColumn name="registration">
+ <Property name="property">registration</Property>
+ </DataColumn>
+ <DataColumn name="inspectPlan">
+ <Property name="property">inspectPlan</Property>
+ </DataColumn>
+ <DataColumn name="productType">
+ <Property name="property">productType</Property>
+ </DataColumn>
+ <DataColumn name="cyjs">
+ <Property name="property">cyjs</Property>
+ </DataColumn>
+ <DataColumn name="cysl">
+ <Property name="property">cysl</Property>
+ </DataColumn>
+ <DataColumn name="sampler">
+ <Property name="property">sampler</Property>
+ </DataColumn>
+ <DataColumn name="samplerTime">
+ <Property name="property">samplerTime</Property>
+ </DataColumn>
+ <DataColumn name="samplerArea">
+ <Property name="property">samplerArea</Property>
+ </DataColumn>
+ <DataColumn name="createTime">
+ <Property name="property">createTime</Property>
+ </DataColumn>
+ <DataColumn name="isActive">
+ <Property name="property">isActive</Property>
+ </DataColumn>
+ <DataColumn name="reportFile">
+ <Property name="property">reportFile</Property>
+ </DataColumn>
+ <DataColumn name="remark">
+ <Property name="property">remark</Property>
+ </DataColumn>
+ <DataColumn name="createDate">
+ <Property name="property">createDate</Property>
+ </DataColumn>
+ <DataColumn name="createBy">
+ <Property name="property">createBy</Property>
+ </DataColumn>
+ <DataColumn name="updateDate">
+ <Property name="property">updateDate</Property>
+ </DataColumn>
+ <DataColumn name="updateBy">
+ <Property name="property">updateBy</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ </DataColumn>
+ <DataColumn name="kqdm">
+ <Property name="property">kqdm</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain" layout="regionPadding:10;padding:5">
+ <Property name="width">80%</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Property name="caption">搴旀�ユ柟妗堜俊鎭�</Property>
+ <Property name="height">85%</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+view.get("#updateSave").execute(function(){
+ self.get("parent").hide();
+ view.get("#dsMain").flushAsync();
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+self.get("parent").hide();
+if(cur) cur.cancel();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <FieldSet>
+ <Property name="caption">鐪佽川妫�涓績鎶ュ憡</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelPosition">left</Property>
+ <Property name="labelSeparator">:</Property>
+ <Property name="labelAlign">right</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">reportFile</Property>
+ <Property name="property">reportFile</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">remark</Property>
+ <Property name="property">remark</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">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportRiceList</Property>
+ <Property name="property">orgReportRiceList</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportNoodlesList</Property>
+ <Property name="property">orgReportNoodlesList</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportSoybeanList</Property>
+ <Property name="property">orgReportSoybeanList</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">orgReportOilList</Property>
+ <Property name="property">orgReportOilList</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">澶х背妫�楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail2">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportRiceList</Property>
+ <DataColumn name="qlyOrgReportRiceId">
+ <Property name="property">qlyOrgReportRiceId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="brokenRice">
+ <Property name="property">brokenRice</Property>
+ </DataColumn>
+ <DataColumn name="smallBrokenRice">
+ <Property name="property">smallBrokenRice</Property>
+ </DataColumn>
+ <DataColumn name="processingAccuracy">
+ <Property name="property">processingAccuracy</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ </DataColumn>
+ <DataColumn name="impuriryContent">
+ <Property name="property">impuriryContent</Property>
+ </DataColumn>
+ <DataColumn name="tastingValue">
+ <Property name="property">tastingValue</Property>
+ </DataColumn>
+ <DataColumn name="amyloseContent">
+ <Property name="property">amyloseContent</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ </DataColumn>
+ <DataColumn name="incompleteContent">
+ <Property name="property">incompleteContent</Property>
+ </DataColumn>
+ <DataColumn name="inorganicContent">
+ <Property name="property">inorganicContent</Property>
+ </DataColumn>
+ <DataColumn name="yellowRiceContent">
+ <Property name="property">yellowRiceContent</Property>
+ </DataColumn>
+ <DataColumn name="mixingRate">
+ <Property name="property">mixingRate</Property>
+ </DataColumn>
+ <DataColumn name="aflatioxin">
+ <Property name="property">aflatioxin</Property>
+ </DataColumn>
+ <DataColumn name="cadmium">
+ <Property name="property">cadmium</Property>
+ </DataColumn>
+ <DataColumn name="inorganicArsenic">
+ <Property name="property">inorganicArsenic</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">灏忛害绮夋楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail3">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportNoodlesList</Property>
+ <DataColumn name="qlyOrgReportNoodlesId">
+ <Property name="property">qlyOrgReportNoodlesId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="ashContent">
+ <Property name="property">ashContent</Property>
+ </DataColumn>
+ <DataColumn name="fattyContent">
+ <Property name="property">fattyContent</Property>
+ </DataColumn>
+ <DataColumn name="processingAccuracy">
+ <Property name="property">processingAccuracy</Property>
+ </DataColumn>
+ <DataColumn name="sandContent">
+ <Property name="property">sandContent</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ </DataColumn>
+ <DataColumn name="looksForm">
+ <Property name="property">looksForm</Property>
+ </DataColumn>
+ <DataColumn name="wetGluten">
+ <Property name="property">wetGluten</Property>
+ </DataColumn>
+ <DataColumn name="deoxynivalenol">
+ <Property name="property">deoxynivalenol</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ </DataColumn>
+ <DataColumn name="zearalenone">
+ <Property name="property">zearalenone</Property>
+ </DataColumn>
+ <DataColumn name="lead">
+ <Property name="property">lead</Property>
+ </DataColumn>
+ <DataColumn name="cadmium">
+ <Property name="property">cadmium</Property>
+ </DataColumn>
+ <DataColumn name="benzoylPeroxide">
+ <Property name="property">benzoylPeroxide</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ <DataColumn name="reportFile">
+ <Property name="property">reportFile</Property>
+ </DataColumn>
+ <DataColumn name="hfhljg">
+ <Property name="property">hfhljg</Property>
+ </DataColumn>
+ <DataColumn name="zfshljg">
+ <Property name="property">zfshljg</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">澶ц眴妫�楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail4">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportSoybeanList</Property>
+ <DataColumn name="qlyOrgReportSoybeanId">
+ <Property name="property">qlyOrgReportSoybeanId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="completeParticle">
+ <Property name="property">completeParticle</Property>
+ </DataColumn>
+ <DataColumn name="damageParticle">
+ <Property name="property">damageParticle</Property>
+ </DataColumn>
+ <DataColumn name="damageParticleHot">
+ <Property name="property">damageParticleHot</Property>
+ </DataColumn>
+ <DataColumn name="waterContent">
+ <Property name="property">waterContent</Property>
+ </DataColumn>
+ <DataColumn name="colorOdor">
+ <Property name="property">colorOdor</Property>
+ </DataColumn>
+ <DataColumn name="impurityContent">
+ <Property name="property">impurityContent</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisCamv">
+ <Property name="property">transgenosisCamv</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisNos">
+ <Property name="property">transgenosisNos</Property>
+ </DataColumn>
+ <DataColumn name="transgenosisCoFour">
+ <Property name="property">transgenosisCoFour</Property>
+ </DataColumn>
+ <DataColumn name="lection">
+ <Property name="property">lection</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ <Panel layout="regionPadding:5">
+ <Property name="caption">椋熺敤娌规楠岀粨鏋�</Property>
+ <Property name="height">200</Property>
+ <Buttons/>
+ <Children>
+ <DataGrid id="dataGridDetail5">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">#.orgReportOilList</Property>
+ <DataColumn name="qlyOrgReportOilId">
+ <Property name="property">qlyOrgReportOilId</Property>
+ </DataColumn>
+ <DataColumn name="qlyOrgReportId">
+ <Property name="property">qlyOrgReportId</Property>
+ </DataColumn>
+ <DataColumn name="colorLustre">
+ <Property name="property">colorLustre</Property>
+ </DataColumn>
+ <DataColumn name="transparency">
+ <Property name="property">transparency</Property>
+ </DataColumn>
+ <DataColumn name="odorTaste">
+ <Property name="property">odorTaste</Property>
+ </DataColumn>
+ <DataColumn name="waterVolatileContent">
+ <Property name="property">waterVolatileContent</Property>
+ </DataColumn>
+ <DataColumn name="insolubleContent">
+ <Property name="property">insolubleContent</Property>
+ </DataColumn>
+ <DataColumn name="acidValue">
+ <Property name="property">acidValue</Property>
+ </DataColumn>
+ <DataColumn name="peroxideValue">
+ <Property name="property">peroxideValue</Property>
+ </DataColumn>
+ <DataColumn name="heatingTest">
+ <Property name="property">heatingTest</Property>
+ </DataColumn>
+ <DataColumn name="aflatioxin">
+ <Property name="property">aflatioxin</Property>
+ </DataColumn>
+ <DataColumn name="benzoPyrene">
+ <Property name="property">benzoPyrene</Property>
+ </DataColumn>
+ <DataColumn name="bha">
+ <Property name="property">bha</Property>
+ </DataColumn>
+ <DataColumn name="bht">
+ <Property name="property">bht</Property>
+ </DataColumn>
+ <DataColumn name="tbhq">
+ <Property name="property">tbhq</Property>
+ </DataColumn>
+ <DataColumn name="qualityResult">
+ <Property name="property">qualityResult</Property>
+ </DataColumn>
+ <DataColumn name="delectionPerson">
+ <Property name="property">delectionPerson</Property>
+ </DataColumn>
+ <DataColumn name="delectionStartTime">
+ <Property name="property">delectionStartTime</Property>
+ </DataColumn>
+ <DataColumn name="delectionEndTime">
+ <Property name="property">delectionEndTime</Property>
+ </DataColumn>
+ <DataColumn name="inspectionResult">
+ <Property name="property">inspectionResult</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ <Tools/>
+ </Panel>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="updateSave">
+ <Property name="dataResolver">whjlShareApi2013PR2#saveData</Property>
+ <UpdateItem>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="dataSet">dsMain</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">褰撳墠鏁版嵁鍒犻櫎鍚庢棤娉曟仮澶嶏紝璇风‘璁よ鍒犻櫎涔堬紵</Property>
+ <Property name="service">whjlShareApi2013PR2#delData</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPull">
+ <Property name="service">whjlShareApi2013PR2#pullData</Property>
+ </AjaxAction>
+ <Dialog id="dialogLog">
+ <Property name="width">90%</Property>
+ <Property name="height">90%</Property>
+ <Property name="caption">鏇存柊璁板綍</Property>
+ <Property name="iconClass">fa fa-sliders</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍏抽棴</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <Container>
+ <IFrame id="iFrame">
+ <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
+ <Property name="userData">
+ <Entity>
+ <Property name="deptId">deptId</Property>
+ </Entity>
+ </Property>
+ </IFrame>
+ </Container>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <ListDropDown id="listDropYN">
+ <Property name="items">鏄�,鍚�</Property>
+ </ListDropDown>
+ <AjaxAction id="ajaxsysDataToDept">
+ <Property name="service">whjlShareApi2013PR2#sysDataToDept</Property>
+ </AjaxAction>
+ </View>
+</ViewConfig>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dd.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dd.java
new file mode 100644
index 0000000..7e200af
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dd.java
@@ -0,0 +1,37 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍏变韩鎺ュ彛-鐪佽川妫�涓績鎶ュ憡-澶ц眴妫�楠岀粨鏋�
+ *
+ * @author czt
+ * @date 2023/12/11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ShareApi2013Dd implements Serializable {
+
+ private String qlyOrgReportSoybeanId; //澶ц眴璐ㄦ缁撴灉ID
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+ private String completeParticle; //瀹屾暣绮掔巼
+ private String damageParticle; //鎹熶激绮掔巼
+ private String damageParticleHot; //鐑崯浼ょ矑鐜�
+ private String waterContent; //姘村垎鍚噺
+ private String colorOdor; //鑹叉辰姘斿懗
+ private String impurityContent; //鏉傝川鍚噺
+ private String transgenosisCamv; //CAMV35S
+ private String transgenosisNos; //NOS
+ private String transgenosisCoFour; //CO4EPSPS
+ private String lection; //LECTION
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+ private String delectionPerson; //妫�楠屼汉
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+ private String inspectionResult; //妫�楠岀粨璁�
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dm.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dm.java
new file mode 100644
index 0000000..456af5f
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Dm.java
@@ -0,0 +1,41 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍏变韩鎺ュ彛-鐪佽川妫�涓績鎶ュ憡-澶х背妫�楠岀粨鏋�
+ *
+ * @author czt
+ * @date 2023/12/11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ShareApi2013Dm implements Serializable {
+
+ private String qlyOrgReportRiceId; //澶х背璐ㄦ缁撴灉ID
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+ private String brokenRice; //纰庣背鎬婚噺
+ private String smallBrokenRice; //灏忕绫冲惈閲�
+ private String processingAccuracy; //鍔犲伐绮惧害
+ private String colorOdor; //鑹叉辰姘斿懗
+ private String impuriryContent; //鏉傝川鍚噺
+ private String tastingValue; //鍝佸皾璇勫垎鍊�
+ private String amyloseContent; //鐩撮摼娣�绮夊惈閲�
+ private String waterContent; //姘村垎鍚噺
+ private String incompleteContent; //涓嶅畬鍠勭矑鍚噺
+ private String inorganicContent; //鏃犳満鏉傝川鍚噺
+ private String yellowRiceContent; //榛勭矑绫冲惈閲�
+ private String mixingRate; //浜掓贩鐜�
+ private String aflatioxin; //榛勬洸闇夋瘨绱�
+ private String cadmium; //闀�
+ private String inorganicArsenic; //鏃犳満鐮�
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+ private String delectionPerson; //妫�楠屼汉
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+ private String inspectionResult; //妫�楠岀粨璁�
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Syy.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Syy.java
new file mode 100644
index 0000000..9f4890d
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Syy.java
@@ -0,0 +1,40 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鍏变韩鎺ュ彛-鐪佽川妫�涓績鎶ュ憡-灏忛害绮夋楠岀粨鏋�
+ *
+ * @author czt
+ * @date 2023/12/11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ShareApi2013Syy implements Serializable {
+
+
+ private String qlyOrgReportOilId; //椋熺敤娌硅川妫�缁撴灉ID
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+ private String colorLustre; //鑹叉辰
+ private String transparency; //閫忔槑搴�
+ private String odorTaste; //姘斿懗婊嬪懗
+ private String waterVolatileContent; //姘村垎鍙婃尌鍙戠墿鍚噺
+ private String insolubleContent; //涓嶆憾鎬ф潅璐ㄥ惈閲�
+ private String acidValue; //閰镐环
+ private String peroxideValue; //杩囨哀鍖栧��
+ private String heatingTest; //鍔犵儹璇曢獙
+ private String aflatioxin; //榛勬洸闇夋瘨绱�
+ private String benzoPyrene; //鑻苟鑺�
+ private String bha; //BHA
+ private String bht; //BHT
+ private String tbhq; //TBHQ
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+ private String delectionPerson; //妫�楠屼汉
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+ private String inspectionResult; //妫�楠岀粨璁�
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Xmf.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Xmf.java
new file mode 100644
index 0000000..f240c5e
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/ShareApi2013Xmf.java
@@ -0,0 +1,43 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 鍏变韩鎺ュ彛-鐪佽川妫�涓績鎶ュ憡-灏忛害绮夋楠岀粨鏋�
+ *
+ * @author czt
+ * @date 2023/12/11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ShareApi2013Xmf implements Serializable {
+
+ private String qlyOrgReportNoodlesId; //灏忛害绮夎川妫�缁撴灉ID
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡绠＄悊id
+ private String ashContent; //鐏板垎鍚噺
+ private String fattyContent; //鑴傝偑閰稿惈閲�
+ private String processingAccuracy; //鍔犲伐绮惧害
+ private String sandContent; //鍚爞閲�
+ private String colorOdor; //鑹叉辰姘斿懗
+ private String looksForm; //澶栬褰㈡��
+ private String wetGluten; //婀块潰绛嬪惈閲�
+ private String deoxynivalenol; //鑴辨哀闆厫闀板垁鑿岀儻閱�
+ private String waterContent; //姘村垎鍚噺
+ private String zearalenone; //鐜夌背璧ら湁鐑叜
+ private String lead; //閾�
+ private String cadmium; //闀�
+ private String benzoylPeroxide; //杩囨哀鍖栬嫰鐢查叞
+ private String qualityResult; //璐ㄩ噺鍒ゅ畾
+ private String delectionPerson; //妫�楠屼汉
+ private String delectionStartTime; //妫�娴嬪紑濮嬫椂闂�
+ private String delectionEndTime; //妫�娴嬬粨鏉熸椂闂�
+ private String inspectionResult; //妫�楠岀粨璁�
+ private String reportFile; //鎶ュ憡鏂囦欢
+ private String hfhljg; //鐏板垎鍚噺缁撴灉
+ private String zfshljg; //鑴傝偑閰稿惈閲忕粨鏋�
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlShareApi2013.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlShareApi2013.java
new file mode 100644
index 0000000..b2395a2
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlShareApi2013.java
@@ -0,0 +1,79 @@
+package com.fzzy.otherview.whhpjl.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍏变韩鎺ュ彛-鐪佽川妫�涓績鎶ュ憡-璐ㄦ鎶ュ憡淇℃伅
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class WhjlShareApi2013 implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String qlyOrgReportId; //璐ㄦ鎶ュ憡id
+ private String orderId; //璁㈠崟琛↖D
+ private String sampleId; //鏍峰搧琛↖D
+ private String orgId; //鏈烘瀯琛↖D
+ private String qualityOrgId; //璐ㄦ鏈烘瀯缂栧彿
+ private String qualityOrgName; //璐ㄦ鏈烘瀯鍚嶇О
+ private String gysxydm; //渚涘簲鍟嗕俊鐢ㄤ唬鐮�
+ private String jlqybh; //鍐涚伯浼佷笟缂栧彿
+ private String jlqymc; //鍐涚伯浼佷笟鍚嶇О
+ private String kdbm; //搴撶偣缂栫爜
+ private String kdmc; //搴撶偣鍚嶇О
+ private String delectionType; //妫�娴嬫姤鍛婄被鍨�
+ private String deletctionNumber; //妫�娴嬫姤鍛婄紪鍙�
+ private String jlcpmc; //鍐涚伯浜у搧鍚嶇О
+ private String jllspz; //鍐涚伯绮鍝佺
+ private String lotNumber; //鎵瑰彿
+ private String specificationModel; //瑙勬牸鍨嬪彿
+ private String cysm; //鎶芥牱璇存槑
+ private String registration; //鐧昏鏃堕棿
+ private String inspectPlan; //妫�楠屾柟妗�
+ private String productType; //浜у搧绫诲瀷
+ private String cyjs; //鎶芥牱鍩烘暟
+ private String cysl; //鎶芥牱鏁伴噺
+ private String sampler; //鎶芥牱浜�
+ private String samplerTime; //鎶芥牱鏃堕棿
+ private String samplerArea; //鎶芥牱鍦扮偣
+ private String createTime; //鐢熶骇鏃ユ湡
+ private String isActive; //鏄惁鏈夋晥
+ private String reportFile; //璐ㄦ鎶ュ憡鏂囦欢
+ private String remark; //澶囨敞
+ private String createDate; //鍒涘缓鏃堕棿
+ private String createBy; //鍒涘缓浜�
+ private String updateDate; //鏇存柊鏃堕棿
+ private String updateBy; //鏇存柊浜�
+ private List<ShareApi2013Dm> orgReportRiceList; //澶х背妫�楠岀粨鏋�
+ private List<ShareApi2013Xmf> orgReportNoodlesList; //灏忛害绮夎川妫�缁撴灉
+ private List<ShareApi2013Dd> orgReportSoybeanList; //澶ц眴璐ㄦ缁撴灉
+ private List<ShareApi2013Syy> orgReportOilList; //椋熺敤娌硅川妫�缁撴灉
+
+ /**
+ * --------闄勪欢--------
+ **/
+ @PropertyDef(label = "闄勪欢id")
+ private String fileId;
+
+ @PropertyDef(label = "闄勪欢鍚嶇О")
+ private String fileName;
+
+ @PropertyDef(label = "闄勪欢涓婁紶鏃堕棿")
+ private Date fileTime;
+
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
+ private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+
+ private String czbz; //鎿嶄綔鏍囧織
+ private String kqdm; //搴撳尯浠ｇ爜
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR.java
new file mode 100644
index 0000000..37b605b
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR.java
@@ -0,0 +1,391 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.Base64Util;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.async.fzzy40.entity.Fz40Quality;
+import com.fzzy.async.whhpjl.entity.*;
+import com.fzzy.async.whhpjl.repository.*;
+import com.fzzy.data.ConfigData;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.*;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍏变韩鎺ュ彛-璁￠噺鍗曚綅
+ *
+ * @author czt
+ */
+@Component
+public class WhjlShareApi2013PR {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+ @Autowired
+ private ConfigData configData;
+ @Autowired
+ private Fz40ToWhjlSync2013Rep fz40ToWhjlSync2013Rep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013DmRep fz40ToWhjlSync2013DmRep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013DdRep fz40ToWhjlSync2013DdRep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013XmfRep fz40ToWhjlSync2013XmfRep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013SyyRep fz40ToWhjlSync2013SyyRep;
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlShareApi2013PR#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlShareApi2013> listData() {
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_2013);
+ if (null == result || result.isEmpty()) {
+ return null;
+ }
+ List<WhjlShareApi2013> list = new ArrayList<>();
+ WhjlShareApi2013 whjlShareApiData;
+ for (ApiInfoData infoData : result) {
+ whjlShareApiData = JSONObject.parseObject(infoData.getData(), WhjlShareApi2013.class);
+ whjlShareApiData.setKqdm(infoData.getKqdm());
+ whjlShareApiData.setCzbz(infoData.getCzbz());
+ whjlShareApiData.setUpdateTime(infoData.getUpdateTime());
+ list.add(whjlShareApiData);
+ }
+ return list;
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡澶х背妫�楠岀粨鏋�
+ * whjlShareApi2013PR#listItemShareApi2013Dm
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Dm> listItemShareApi2013Dm(String code) {
+ return JSON.parseArray(code, ShareApi2013Dm.class);
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡灏忛害绮夋楠岀粨鏋�
+ * whjlShareApi2013PR#listItemShareApi2013Xmf
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Xmf> listItemShareApi2013Xmf(String code) {
+ return JSON.parseArray(code, ShareApi2013Xmf.class);
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡澶ц眴妫�楠岀粨鏋�
+ * whjlShareApi2013PR#listItemShareApi2013Dd
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Dd> listItemShareApi2013Dd(String code) {
+ return JSON.parseArray(code, ShareApi2013Dd.class);
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡椋熺敤娌规楠岀粨鏋�
+ * whjlShareApi2013PR#listItemShareApi2013Syy
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Syy> listItemShareApi2013Syy(String code) {
+ return JSON.parseArray(code, ShareApi2013Syy.class);
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlShareApi2013PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlShareApi2013 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getQlyOrgReportId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_20);
+ infoData.setInteId(WhjlConstant.API_CODE_2013);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getQlyOrgReportId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlShareApi2013PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlShareApi2013 data) {
+ apiInfoDataRep.deleteById(data.getQlyOrgReportId());
+ return null;
+ }
+
+ /**
+ * 鏇存柊鏁版嵁
+ * whjlShareApi2013PR#pullData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pullData(List<WhjlShareApi2013> items) {
+
+
+ //鑾峰彇閰嶇疆淇℃伅
+ List<ApiConfs> apiConfs = apiCommonService.listCacheConf();
+ if (null == apiConfs || apiConfs.isEmpty()) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ ApiRemoteService apiService;
+ ApiParam param;
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ String result = "";
+ List<WhjlShareApi2013> list;
+ for (ApiConfs apiConf : apiConfs) {
+ apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) {
+ continue;
+ }
+ //灏佽鍙傛暟
+ param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_20, WhjlConstant.API_CODE_2013);
+ responseDto = apiService.pullData(param, apiConf);
+
+ if (responseDto.getSuccess() == 0) {
+ list = JSONObject.parseArray(responseDto.getData(), WhjlShareApi2013.class);
+ if(null != list && list.size() > 0){
+ for (WhjlShareApi2013 shareData : list) {
+ //淇濆瓨鏂囦欢
+ //璺緞
+ String basePath = configData.getImgPath() + "COMMON/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
+
+ //鏂囦欢id
+
+ if(StringUtils.isNotEmpty(shareData.getReportFile())){
+ String fileId = ContextUtil.getTimeId(1000);
+ String fileName = "闄勪欢"+ ".pdf";
+ Base64Util.saveBase64ToFile(shareData.getReportFile(),basePath + fileId + ".pdf");
+
+ shareData.setFileId(fileId);
+ shareData.setFileName(fileName);
+ shareData.setFileTime(new Date());
+
+// shareData.setReportFile(null);
+ }
+
+ shareData.setCzbz(Constant.CZBZ_U);
+
+// shareData.setYjfajgList(JSON.toJSONString(shareData.getYjfajg()));
+// shareData.setCzbz(Constant.CZBZ_U);
+ infoData = new ApiInfoData();
+ infoData.setId(shareData.getQlyOrgReportId());
+ infoData.setKqdm(apiConf.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_20);
+ infoData.setInteId(WhjlConstant.API_CODE_2013);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(shareData.getQlyOrgReportId());
+ infoData.setData(JSON.toJSONString(shareData));
+ infoData.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ }
+ result += responseDto.toString();
+ return result;
+ }
+ return null;
+ }
+
+ /**
+ * 鍚屾鑷冲簱鍖烘暟鎹簱
+ * whjlShareApi2013PR#sysData
+ *
+ * @return
+ */
+ @Expose
+ public String sysData() {
+ List<WhjlShareApi2013> list = listData();
+ //杞崲鎴愬簱鍖鸿蒋浠堕渶瑕佺殑鏍煎紡骞朵繚瀛�
+ Fz40Quality fz40Quality = null;
+ for (WhjlShareApi2013 whjlShareApi2013 : list) {
+ fz40Quality = new Fz40Quality();
+ }
+ return null;
+ }
+
+
+ public static void main(String[] args) {
+ // 1. 鎸囧畾鏂囦欢璺緞锛堟浛鎹负浣犵殑瀹為檯璺緞锛�
+ String filePath = "C:\\Users\\ws183\\Desktop\\b.txt";
+
+ // 2. 璇诲彇骞惰浆鎹㈡暟鎹�
+ List<WhjlShareApi2013> dataList = readJsonFileToList(filePath);
+
+ for (WhjlShareApi2013 data : dataList) {
+ //淇濆瓨鏂囦欢
+ String basePath = "D:/IGDS/FILE/" + "COMMON/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
+
+ String fileId = ContextUtil.getTimeId(1000);
+ String fileName = "闄勪欢"+ ".pdf";
+ Base64Util.base64StringToPDF(data.getReportFile(),basePath , fileId + ".pdf");
+
+ }
+ // 3. 鎵撳嵃缁撴灉
+ if (dataList != null) {
+ System.out.println("鎴愬姛璇诲彇 " + dataList.size() + " 鏉℃暟鎹細");
+ dataList.forEach(System.out::println);
+ }
+ }
+
+ private static List<WhjlShareApi2013> readJsonFileToList(String filePath) {
+ // 璇诲彇鏂囦欢鍐呭
+ String jsonContent = readFileContent(filePath);
+ if (jsonContent == null || jsonContent.trim().isEmpty()) {
+ return new ArrayList<>();
+ }
+
+ //瑙ｆ瀽JSON
+
+ List<WhjlShareApi2013> list = JSONObject.parseArray(jsonContent, WhjlShareApi2013.class);
+
+ return list;
+ }
+
+ private static String readFileContent(String filePath) {
+ StringBuilder content = new StringBuilder();
+ try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
+ String line;
+ while ((line = reader.readLine()) != null) {
+ content.append(line);
+ }
+ return content.toString();
+ } catch (IOException e) {
+ System.err.println("鏂囦欢璇诲彇澶辫触: " + e.getMessage());
+ return null;
+ }
+ }
+
+ /**
+ * 鍚屾鑷冲簱鍖烘暟鎹簱
+ * whjlShareApi2013PR#sysDataToDept
+ */
+ @Expose
+ public void sysDataToDept(){
+ //鑾峰彇鎵�鏈夋暟鎹�
+ List<WhjlShareApi2013> list = listData();
+ Fz40WhjlMQuality fz40WhjlMQuality = null;
+ for (WhjlShareApi2013 whjlShareApi2013 : list) {
+ fz40WhjlMQuality = new Fz40WhjlMQuality();
+ fz40WhjlMQuality.setProvReserve(Constant.YN_Y);
+ fz40WhjlMQuality.setId(whjlShareApi2013.getQlyOrgReportId());
+ String basePath = configData.getImgPath() + "COMMON/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
+
+ if(StringUtils.isNotEmpty(whjlShareApi2013.getReportFile())){
+
+ String fileId = ContextUtil.getTimeId(1000) + ".pdf";
+ String fileName = "闄勪欢"+ ".pdf";
+ Base64Util.base64StringToPDF(whjlShareApi2013.getReportFile(),basePath , fileId );
+
+
+ whjlShareApi2013.setFileId(fileId);
+ whjlShareApi2013.setFileName(fileName);
+ whjlShareApi2013.setFileTime(new Date());
+ whjlShareApi2013.setReportFile(null);
+ }
+ BeanUtils.copyProperties(whjlShareApi2013, fz40WhjlMQuality);
+ fz40ToWhjlSync2013Rep.save(fz40WhjlMQuality);
+ if(whjlShareApi2013.getOrgReportNoodlesList() != null){
+ List<ShareApi2013Xmf> orgReportNoodlesList = whjlShareApi2013.getOrgReportNoodlesList();
+ for (ShareApi2013Xmf shareApi2013Xmf : orgReportNoodlesList) {
+ Fz40WhjlCheckItemXmf fz40WhjlCheckItemXmf = new Fz40WhjlCheckItemXmf();
+ BeanUtils.copyProperties(shareApi2013Xmf,fz40WhjlCheckItemXmf);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemXmf.getQlyOrgReportNoodlesId())) continue;
+ fz40ToWhjlSync2013XmfRep.save(fz40WhjlCheckItemXmf);
+ }
+ }
+ if(whjlShareApi2013.getOrgReportSoybeanList() != null){
+ List<ShareApi2013Dd> orgReportSoybeanList = whjlShareApi2013.getOrgReportSoybeanList();
+ for (ShareApi2013Dd shareApi2013Dd : orgReportSoybeanList) {
+ Fz40WhjlCheckItemDd fz40WhjlCheckItemDd = new Fz40WhjlCheckItemDd();
+ BeanUtils.copyProperties(shareApi2013Dd,fz40WhjlCheckItemDd);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemDd.getQlyOrgReportSoybeanId())) continue;
+
+ fz40ToWhjlSync2013DdRep.save(fz40WhjlCheckItemDd);
+ }
+ }
+ if(whjlShareApi2013.getOrgReportRiceList() != null){
+ List<ShareApi2013Dm> orgReportRiceList = whjlShareApi2013.getOrgReportRiceList();
+ for (ShareApi2013Dm shareApi2013Dm : orgReportRiceList) {
+ Fz40WhjlCheckItemDm fz40WhjlCheckItemDm = new Fz40WhjlCheckItemDm();
+ BeanUtils.copyProperties(shareApi2013Dm,fz40WhjlCheckItemDm);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemDm.getQlyOrgReportRiceId())) continue;
+
+ fz40ToWhjlSync2013DmRep.save(fz40WhjlCheckItemDm);
+ }
+ }
+ if(whjlShareApi2013.getOrgReportOilList() != null){
+ List<ShareApi2013Syy> orgReportOilList = whjlShareApi2013.getOrgReportOilList();
+ for (ShareApi2013Syy shareApi2013Syy : orgReportOilList) {
+ Fz40WhjlCheckItemSyy fz40WhjlCheckItemSyy = new Fz40WhjlCheckItemSyy();
+ BeanUtils.copyProperties(shareApi2013Syy,fz40WhjlCheckItemSyy);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemSyy.getQlyOrgReportOilId())) continue;
+
+ fz40ToWhjlSync2013SyyRep.save(fz40WhjlCheckItemSyy);
+ }
+ }
+
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java
new file mode 100644
index 0000000..ba380e3
--- /dev/null
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlShareApi2013PR2.java
@@ -0,0 +1,327 @@
+package com.fzzy.otherview.whhpjl.pr;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.entity.ApiInfoData;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
+import com.fzzy.api.utils.Base64Util;
+import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.ApiInfoDataRep;
+import com.fzzy.async.whhpjl.entity.*;
+import com.fzzy.async.whhpjl.repository.*;
+import com.fzzy.data.ConfigData;
+import com.fzzy.otherview.whhpjl.WhjlConstant;
+import com.fzzy.otherview.whhpjl.dto.*;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鍏变韩鎺ュ彛-璁￠噺鍗曚綅
+ *
+ * @author czt
+ */
+@Component
+public class WhjlShareApi2013PR2 {
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
+ @Autowired
+ private ApiInfoDataRep apiInfoDataRep;
+ @Autowired
+ private ConfigData configData;
+ @Autowired
+ private Fz40ToWhjlSync2013Rep fz40ToWhjlSync2013Rep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013DmRep fz40ToWhjlSync2013DmRep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013DdRep fz40ToWhjlSync2013DdRep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013XmfRep fz40ToWhjlSync2013XmfRep;
+
+ @Autowired
+ private Fz40ToWhjlSync2013SyyRep fz40ToWhjlSync2013SyyRep;
+
+ private static final String DEPT_ID = "5327_001";
+
+
+ /**
+ * 鑾峰彇鍒楄〃淇℃伅
+ * whjlShareApi2013PR2#listData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<WhjlShareApi2013> listData() {
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_2013);
+ if (null == result || result.isEmpty()) {
+ return null;
+ }
+ List<WhjlShareApi2013> list = new ArrayList<>();
+ WhjlShareApi2013 whjlShareApiData;
+ for (ApiInfoData infoData : result) {
+ whjlShareApiData = JSONObject.parseObject(infoData.getData(), WhjlShareApi2013.class);
+ whjlShareApiData.setKqdm(infoData.getKqdm());
+ whjlShareApiData.setCzbz(infoData.getCzbz());
+ whjlShareApiData.setUpdateTime(infoData.getUpdateTime());
+ list.add(whjlShareApiData);
+ }
+ return list;
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡澶х背妫�楠岀粨鏋�
+ * whjlShareApi2013PR2#listItemShareApi2013Dm
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Dm> listItemShareApi2013Dm(String code) {
+ return JSON.parseArray(code, ShareApi2013Dm.class);
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡灏忛害绮夋楠岀粨鏋�
+ * whjlShareApi2013P2R#listItemShareApi2013Xmf
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Xmf> listItemShareApi2013Xmf(String code) {
+ return JSON.parseArray(code, ShareApi2013Xmf.class);
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡澶ц眴妫�楠岀粨鏋�
+ * whjlShareApi2013PR2#listItemShareApi2013Dd
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Dd> listItemShareApi2013Dd(String code) {
+ return JSON.parseArray(code, ShareApi2013Dd.class);
+ }
+
+ /**
+ * 鑾峰彇璐ㄦ鎶ュ憡椋熺敤娌规楠岀粨鏋�
+ * whjlShareApi2013PR2#listItemShareApi2013Syy
+ *
+ * @return
+ */
+ @DataProvider
+ public List<ShareApi2013Syy> listItemShareApi2013Syy(String code) {
+ return JSON.parseArray(code, ShareApi2013Syy.class);
+ }
+
+ /**
+ * 鏇存柊鎴栦慨鏀�
+ * whjlShareApi2012PR#saveData
+ *
+ * @param data
+ * @return
+ */
+ @DataResolver
+ public void saveData(WhjlShareApi2013 data) {
+ ApiInfoData infoData = new ApiInfoData();
+ infoData.setId(data.getQlyOrgReportId());
+ infoData.setKqdm(data.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_20);
+ infoData.setInteId(WhjlConstant.API_CODE_2013);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(data.getQlyOrgReportId());
+ infoData.setData(JSON.toJSONString(data));
+ infoData.setCzbz(data.getCzbz());
+ infoData.setRemarks("澶囨敞淇℃伅");
+
+ apiInfoDataRep.save(infoData);
+ }
+
+
+ /**
+ * 鍒犻櫎
+ * whjlShareApi2012PR#delData
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delData(WhjlShareApi2013 data) {
+ apiInfoDataRep.deleteById(data.getQlyOrgReportId());
+ return null;
+ }
+ /**
+ * 鏇存柊鏁版嵁
+ * whjlShareApi2013PR2#pullData
+ *
+ * @param items
+ * @return
+ */
+ @Expose
+ public String pullData(List<WhjlShareApi2013> items) {
+
+
+ //鑾峰彇閰嶇疆淇℃伅
+ List<ApiConfs> apiConfs = apiCommonService.listCacheConf();
+ if (null == apiConfs || apiConfs.isEmpty()) {
+ return "绯荤粺娌℃湁鑾峰彇鍒板簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+ }
+
+ ApiRemoteService apiService;
+ ApiParam param;
+ ResponseDto responseDto;
+ ApiInfoData infoData;
+ String result = "";
+ List<WhjlShareApi2013> list;
+ for (ApiConfs apiConf : apiConfs) {
+ apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
+ if (null == apiService) {
+ continue;
+ }
+ //灏佽鍙傛暟
+ param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_20, WhjlConstant.API_CODE_2013);
+ responseDto = apiService.pullData(param, apiConf);
+
+ if(null == responseDto){
+ return "鏇存柊澶辫触锛�";
+ }
+ if (responseDto.getSuccess() == 0) {
+ list = JSONObject.parseArray(responseDto.getData(), WhjlShareApi2013.class);
+ if(null != list && list.size() > 0){
+ for (WhjlShareApi2013 shareData : list) {
+ //淇濆瓨鏂囦欢
+ //璺緞
+ String basePath = configData.getImgPath() + "COMMON/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
+
+ //鏂囦欢id
+
+ if(StringUtils.isNotEmpty(shareData.getReportFile())){
+ String fileId = ContextUtil.getTimeId(1000);
+ String fileName = "闄勪欢"+ ".pdf";
+ Base64Util.saveBase64ToFile(shareData.getReportFile(),basePath + fileId + ".pdf");
+
+ shareData.setFileId(fileId);
+ shareData.setFileName(fileName);
+ shareData.setFileTime(new Date());
+
+// shareData.setReportFile(null);
+ }
+
+ shareData.setCzbz(Constant.CZBZ_U);
+
+// shareData.setYjfajgList(JSON.toJSONString(shareData.getYjfajg()));
+// shareData.setCzbz(Constant.CZBZ_U);
+ infoData = new ApiInfoData();
+ infoData.setId(shareData.getQlyOrgReportId());
+ infoData.setKqdm(apiConf.getKqdm());
+ infoData.setInteType(WhjlConstant.API_CATEGORY_20);
+ infoData.setInteId(WhjlConstant.API_CODE_2013);
+ infoData.setUpdateTime(new Date());
+ infoData.setDataId(shareData.getQlyOrgReportId());
+ infoData.setData(JSON.toJSONString(shareData));
+ infoData.setCzbz(Constant.CZBZ_U);
+ apiInfoDataRep.save(infoData);
+ }
+ }
+ }
+ result += responseDto.toString();
+ return result;
+ }
+ return null;
+ }
+
+ /**
+ * 鍚屾鑷冲簱鍖烘暟鎹簱
+ * whjlShareApi2013PR#sysDataToDept
+ */
+ @Expose
+ public void sysDataToDept(){
+ //鑾峰彇鎵�鏈夋暟鎹�
+ List<WhjlShareApi2013> list = listData();
+ if(null == list || list.isEmpty()){
+ return;
+ }
+ Fz40WhjlMQuality fz40WhjlMQuality = null;
+ for (WhjlShareApi2013 whjlShareApi2013 : list) {
+ fz40WhjlMQuality = new Fz40WhjlMQuality();
+ fz40WhjlMQuality.setProvReserve(Constant.YN_Y);
+ fz40WhjlMQuality.setId(whjlShareApi2013.getQlyOrgReportId());
+ String basePath = configData.getImgPath() + "COMMON/" + DateFormatUtils.format(new Date(), "yyyyMM") + "/";
+
+ if(StringUtils.isNotEmpty(whjlShareApi2013.getReportFile())){
+
+ String fileId = ContextUtil.getTimeId(1000) + ".pdf";
+ String fileName = "闄勪欢"+ ".pdf";
+ Base64Util.base64StringToPDF(whjlShareApi2013.getReportFile(),basePath , fileId );
+
+
+ whjlShareApi2013.setFileId(fileId);
+ whjlShareApi2013.setFileName(fileName);
+ whjlShareApi2013.setFileTime(new Date());
+ whjlShareApi2013.setReportFile(null);
+ }
+ BeanUtils.copyProperties(whjlShareApi2013, fz40WhjlMQuality);
+ fz40WhjlMQuality.setCompanyId(configData.getCompanyId());
+ fz40WhjlMQuality.setDeptId(DEPT_ID);
+ fz40ToWhjlSync2013Rep.save(fz40WhjlMQuality);
+ if(whjlShareApi2013.getOrgReportNoodlesList() != null){
+ List<ShareApi2013Xmf> orgReportNoodlesList = whjlShareApi2013.getOrgReportNoodlesList();
+ for (ShareApi2013Xmf shareApi2013Xmf : orgReportNoodlesList) {
+ Fz40WhjlCheckItemXmf fz40WhjlCheckItemXmf = new Fz40WhjlCheckItemXmf();
+ BeanUtils.copyProperties(shareApi2013Xmf,fz40WhjlCheckItemXmf);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemXmf.getQlyOrgReportNoodlesId())) continue;
+ fz40ToWhjlSync2013XmfRep.save(fz40WhjlCheckItemXmf);
+ }
+ }
+ if(whjlShareApi2013.getOrgReportSoybeanList() != null){
+ List<ShareApi2013Dd> orgReportSoybeanList = whjlShareApi2013.getOrgReportSoybeanList();
+ for (ShareApi2013Dd shareApi2013Dd : orgReportSoybeanList) {
+ Fz40WhjlCheckItemDd fz40WhjlCheckItemDd = new Fz40WhjlCheckItemDd();
+ BeanUtils.copyProperties(shareApi2013Dd,fz40WhjlCheckItemDd);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemDd.getQlyOrgReportSoybeanId())) continue;
+
+ fz40ToWhjlSync2013DdRep.save(fz40WhjlCheckItemDd);
+ }
+ }
+ if(whjlShareApi2013.getOrgReportRiceList() != null){
+ List<ShareApi2013Dm> orgReportRiceList = whjlShareApi2013.getOrgReportRiceList();
+ for (ShareApi2013Dm shareApi2013Dm : orgReportRiceList) {
+ Fz40WhjlCheckItemDm fz40WhjlCheckItemDm = new Fz40WhjlCheckItemDm();
+ BeanUtils.copyProperties(shareApi2013Dm,fz40WhjlCheckItemDm);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemDm.getQlyOrgReportRiceId())) continue;
+
+ fz40ToWhjlSync2013DmRep.save(fz40WhjlCheckItemDm);
+ }
+ }
+ if(whjlShareApi2013.getOrgReportOilList() != null){
+ List<ShareApi2013Syy> orgReportOilList = whjlShareApi2013.getOrgReportOilList();
+ for (ShareApi2013Syy shareApi2013Syy : orgReportOilList) {
+ Fz40WhjlCheckItemSyy fz40WhjlCheckItemSyy = new Fz40WhjlCheckItemSyy();
+ BeanUtils.copyProperties(shareApi2013Syy,fz40WhjlCheckItemSyy);
+ if(StringUtils.isEmpty(fz40WhjlCheckItemSyy.getQlyOrgReportOilId())) continue;
+
+ fz40ToWhjlSync2013SyyRep.save(fz40WhjlCheckItemSyy);
+ }
+ }
+
+ }
+ }
+}
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index 535a2bf..b3ba95b 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -305,6 +305,8 @@
return WhjlConstant.API_CODE_SHARE_ZLJCXM;
case "2012":
return WhjlConstant.API_CODE_SHARE_YJFAXX;
+ case "2013":
+ return WhjlConstant.API_CODE_SHARE_SZJZXBG;
default:
return inteId;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ac3ea88..6c0fa26 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -23,17 +23,18 @@
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_011_hmls?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娴烽棬绮绠＄悊鎵� 1
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_012_hsmy?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鎭掔敓绫充笟
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_201?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴� - 澶х背浠ｅ偍鎶氬窞甯�
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_900?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�-娼伯鍏徃
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢鍙板北
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢闊跺叧
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢寰愰椈
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5329?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢浣涘北绂呭煄鍖�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5348?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢姹曞ご娼崡
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5349_sx?useUnicode=true&useSSL=false&characterEncoding=utf-8 #闄曡タ鏌炴按鍘�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢涓滈儴绮补
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢娴蜂赴
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢娴蜂赴
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
@@ -48,12 +49,12 @@
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5322?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢寰愰椈
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
-# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
+ url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5348?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢姹曞ご娼崡
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5349?useUnicode=true&useSSL=false&characterEncoding=utf-8 #闄曡タ鏌炴按鍘�
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5352?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄鍐烽摼-澶╂鼎澧炲煄搴�
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5354?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢澧炲煄-涓滈儴绮补涓績搴�
- url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢娴蜂赴
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5362?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢娴蜂赴
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86a70b3..1224e3a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: pro
+ active: linux
application:
name: igds-api
main:
diff --git a/src/main/resources/templates/home/home-whjl.html b/src/main/resources/templates/home/home-whjl.html
index c3ecea2..c66da85 100644
--- a/src/main/resources/templates/home/home-whjl.html
+++ b/src/main/resources/templates/home/home-whjl.html
@@ -373,6 +373,9 @@
<dd>
<a lay-href="com.fzzy.otherview.whhpjl.WhjlShareApi2012.d">搴旀�ユ柟妗堜俊鎭�</a>
</dd>
+ <dd>
+ <a lay-href="com.fzzy.otherview.whhpjl.WhjlShareApi20132.d">鐪佽川妫�涓績鎶ュ憡</a>
+ </dd>
</dl>
</li>
</ul>
--
Gitblit v1.9.3