From eedeedc19682f082d8fbd8f04730a26da7642088 Mon Sep 17 00:00:00 2001
From: ws <ws@123.com>
Date: 星期一, 22 七月 2024 11:27:21 +0800
Subject: [PATCH] 武汉军粮-出入库接口

---
 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java  |    1 
 src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java  |   14 +
 src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java |    2 
 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml  |  476 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1215.view.xml  |   41 ++-
 5 files changed, 513 insertions(+), 21 deletions(-)

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 b11e45a..78f77bd 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1212.view.xml
@@ -133,6 +133,237 @@
         <Property name="label">璐ㄦ鎶ュ憡鏂囦欢</Property>
         <Property name="dataType">[dtZjbgwj]</Property>
       </PropertyDef>
+      <PropertyDef name="crkmxList">
+        <Property></Property>
+      </PropertyDef>
+      <PropertyDef name="zjbgwjList">
+        <Property></Property>
+      </PropertyDef>
+      <PropertyDef name="crkmxid">
+        <Property></Property>
+        <Property name="label">鍑哄叆搴撴槑缁咺D</Property>
+      </PropertyDef>
+      <PropertyDef name="ajbh">
+        <Property></Property>
+        <Property name="label">寤掗棿缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="ajmc">
+        <Property></Property>
+        <Property name="label">寤掗棿鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="hwbh">
+        <Property></Property>
+        <Property name="label">璐т綅缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="hwmc">
+        <Property></Property>
+        <Property name="label">璐т綅鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="kctzbh">
+        <Property></Property>
+        <Property name="label">搴撳瓨鍙板笎ID</Property>
+      </PropertyDef>
+      <PropertyDef name="kctzcppcid">
+        <Property></Property>
+        <Property name="label">搴撳瓨鍙板笎浜у搧鎵规ID</Property>
+      </PropertyDef>
+      <PropertyDef name="psmxid">
+        <Property></Property>
+        <Property name="label">閰嶉�佽溅杈嗘槑缁咺D</Property>
+      </PropertyDef>
+      <PropertyDef name="yjfamxid">
+        <Property></Property>
+        <Property name="label">搴旀�ユ柟妗堟槑缁咺D</Property>
+      </PropertyDef>
+      <PropertyDef name="lspzbm">
+        <Property></Property>
+        <Property name="label">鍝佺缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="lspzmc">
+        <Property></Property>
+        <Property name="label">鍝佺鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="cpbh">
+        <Property></Property>
+        <Property name="label">浜у搧缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="cpmc">
+        <Property></Property>
+        <Property name="label">浜у搧鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="jldwbm">
+        <Property></Property>
+        <Property name="label">璁¢噺鍗曚綅缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="jldwmc">
+        <Property></Property>
+        <Property name="label">璁¢噺鍗曚綅鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="jsdwbm">
+        <Property></Property>
+        <Property name="label">璁℃暟鍗曚綅缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="jsdwmc">
+        <Property></Property>
+        <Property name="label">璁℃暟鍗曚綅鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="crlx">
+        <Property></Property>
+        <Property name="label">鍑哄簱绫诲瀷</Property>
+      </PropertyDef>
+      <PropertyDef name="crksl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鍑哄叆搴撴暟閲�</Property>
+      </PropertyDef>
+      <PropertyDef name="crkzl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鍑哄叆搴撻噸閲�</Property>
+      </PropertyDef>
+      <PropertyDef name="qcsl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鏈熷垵鏁伴噺</Property>
+      </PropertyDef>
+      <PropertyDef name="qmsl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鏈熸湯鏁伴噺</Property>
+      </PropertyDef>
+      <PropertyDef name="qczl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鏈熷垵閲嶉噺</Property>
+      </PropertyDef>
+      <PropertyDef name="qmzl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鏈熸湭閲嶉噺</Property>
+      </PropertyDef>
+      <PropertyDef name="shsl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎹熻�楁暟閲�</Property>
+      </PropertyDef>
+      <PropertyDef name="shzl">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎹熻�楅噸閲�</Property>
+      </PropertyDef>
+      <PropertyDef name="ysyq">
+        <Property></Property>
+        <Property name="label">楠屾敹瑕佹眰</Property>
+      </PropertyDef>
+      <PropertyDef name="sfhx">
+        <Property></Property>
+        <Property name="label">鏄惁鏍搁攢</Property>
+      </PropertyDef>
+      <PropertyDef name="qkxm">
+        <Property></Property>
+        <Property name="label">娆犳椤圭洰</Property>
+      </PropertyDef>
+      <PropertyDef name="dj">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鍗曚环</Property>
+      </PropertyDef>
+      <PropertyDef name="je">
+        <Property name="dataType">Double</Property>
+        <Property name="label">閲戦</Property>
+      </PropertyDef>
+      <PropertyDef name="cpdj">
+        <Property></Property>
+        <Property name="label">绛夌骇</Property>
+      </PropertyDef>
+      <PropertyDef name="cd">
+        <Property></Property>
+        <Property name="label">浜у湴</Property>
+      </PropertyDef>
+      <PropertyDef name="sccj">
+        <Property></Property>
+        <Property name="label">鐢熶骇鍘傚</Property>
+      </PropertyDef>
+      <PropertyDef name="gg">
+        <Property></Property>
+        <Property name="label">瑙勬牸鍨嬪彿</Property>
+      </PropertyDef>
+      <PropertyDef name="cppc">
+        <Property></Property>
+        <Property name="label">浜у搧鎵规</Property>
+      </PropertyDef>
+      <PropertyDef name="scrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鐢熶骇鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="bzq">
+        <Property name="dataType">Double</Property>
+        <Property name="label">淇濊川鏈�</Property>
+      </PropertyDef>
+      <PropertyDef name="bzqjzrq">
+        <Property></Property>
+        <Property name="label">淇濊川鏈熸埅鑷虫棩鏈�</Property>
+      </PropertyDef>
+      <PropertyDef name="bgy">
+        <Property></Property>
+        <Property name="label">淇濈鍛�</Property>
+      </PropertyDef>
+      <PropertyDef name="ckfs">
+        <Property></Property>
+        <Property name="label">鍑哄簱鏂瑰紡</Property>
+      </PropertyDef>
+      <PropertyDef name="djsj">
+        <Property></Property>
+        <Property name="label">鐧昏鏃堕棿</Property>
+        <Property name="dataType">DateTime</Property>
+      </PropertyDef>
+      <PropertyDef name="zz">
+        <Property></Property>
+        <Property name="label">绔欓暱</Property>
+      </PropertyDef>
+      <PropertyDef name="jjy">
+        <Property></Property>
+        <Property name="label">璐ㄦ鍛�</Property>
+      </PropertyDef>
+      <PropertyDef name="sxh">
+        <Property></Property>
+        <Property name="label">椤哄簭鍙�</Property>
+      </PropertyDef>
+      <PropertyDef name="ddid">
+        <Property></Property>
+        <Property name="label">璁㈠崟ID</Property>
+      </PropertyDef>
+      <PropertyDef name="crktzdid">
+        <Property></Property>
+        <Property name="label">鍑哄叆搴撻�氱煡鍗旾D</Property>
+      </PropertyDef>
+      <PropertyDef name="crktzdmxid">
+        <Property></Property>
+        <Property name="label">鍑哄叆搴撻�氱煡鍗曟槑缁咺D</Property>
+      </PropertyDef>
+      <PropertyDef name="djr">
+        <Property></Property>
+        <Property name="label">鐧昏浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="ajmc">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="cpdj">
+        <Property/>
+        <Property name="label">绛夌骇</Property>
+      </PropertyDef>
+      <PropertyDef name="jybgwjid">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="jyrq">
+        <Property name="dataType">Date</Property>
+      </PropertyDef>
+      <PropertyDef name="jylx">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="wjlx">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="wjm">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="wjlj">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="wjdx">
+        <Property/>
+      </PropertyDef>
     </DataType>
     <DataType name="dtCrkmx">
       <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlInoutDel</Property>
@@ -762,6 +993,251 @@
             <Property name="property">bz</Property>
             <Editor/>
           </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ddid</Property>
+            <Property name="property">ddid</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">crktzdid</Property>
+            <Property name="property">crktzdid</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">crktzdmxid</Property>
+            <Property name="property">crktzdmxid</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">djr</Property>
+            <Property name="property">djr</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">crkmxid</Property>
+            <Property name="property">crkmxid</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajbh</Property>
+            <Property name="property">ajbh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajmc</Property>
+            <Property name="property">ajmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">hwbh</Property>
+            <Property name="property">hwbh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">hwmc</Property>
+            <Property name="property">hwmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">kctzbh</Property>
+            <Property name="property">kctzbh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">kctzcppcid</Property>
+            <Property name="property">kctzcppcid</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">psmxid</Property>
+            <Property name="property">psmxid</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">yjfamxid</Property>
+            <Property name="property">yjfamxid</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">lspzbm</Property>
+            <Property name="property">lspzbm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">lspzmc</Property>
+            <Property name="property">lspzmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">cpbh</Property>
+            <Property name="property">cpbh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">cpmc</Property>
+            <Property name="property">cpmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jldwbm</Property>
+            <Property name="property">jldwbm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jldwmc</Property>
+            <Property name="property">jldwmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jsdwbm</Property>
+            <Property name="property">jsdwbm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jsdwmc</Property>
+            <Property name="property">jsdwmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">crlx</Property>
+            <Property name="property">crlx</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">crksl</Property>
+            <Property name="property">crksl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">crkzl</Property>
+            <Property name="property">crkzl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">qcsl</Property>
+            <Property name="property">qcsl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">qmsl</Property>
+            <Property name="property">qmsl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">qczl</Property>
+            <Property name="property">qczl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">qmzl</Property>
+            <Property name="property">qmzl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">shsl</Property>
+            <Property name="property">shsl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">shzl</Property>
+            <Property name="property">shzl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ysyq</Property>
+            <Property name="property">ysyq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sfhx</Property>
+            <Property name="property">sfhx</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">qkxm</Property>
+            <Property name="property">qkxm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">cpdj</Property>
+            <Property name="property">cpdj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">je</Property>
+            <Property name="property">je</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">cpdj</Property>
+            <Property name="property">cpdj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">cd</Property>
+            <Property name="property">cd</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sccj</Property>
+            <Property name="property">sccj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">gg</Property>
+            <Property name="property">gg</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">cppc</Property>
+            <Property name="property">cppc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">scrq</Property>
+            <Property name="property">scrq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">bzq</Property>
+            <Property name="property">bzq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">bzqjzrq</Property>
+            <Property name="property">bzqjzrq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">bgy</Property>
+            <Property name="property">bgy</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ckfs</Property>
+            <Property name="property">ckfs</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">djsj</Property>
+            <Property name="property">djsj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zz</Property>
+            <Property name="property">zz</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jjy</Property>
+            <Property name="property">jjy</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sxh</Property>
+            <Property name="property">sxh</Property>
+            <Editor/>
+          </AutoFormElement>
         </AutoForm>
         <Panel layout="regionPadding:5">
           <Property name="caption">璐ㄦ鎶ュ憡鏂囦欢</Property>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1215.view.xml b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1215.view.xml
index 824b203..500eb61 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1215.view.xml
+++ b/src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1215.view.xml
@@ -6,47 +6,47 @@
     <DataType name="dtMain">
       <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1215</Property>
       <PropertyDef name="cybh">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏍峰搧缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="jlqybh">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍐涚伯浼佷笟缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="jlqymc">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍐涚伯浼佷笟鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="jgzdbh">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍐涗緵绔欑偣缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="jgzdmc">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍐涗緵绔欑偣鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="zjjgbm">
-        <Property/>
+        <Property></Property>
         <Property name="label">璐ㄦ鏈烘瀯缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="zjjgmc">
-        <Property/>
+        <Property></Property>
         <Property name="label">璐ㄦ鏈烘瀯鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="jljgqybh">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍔犲伐浼佷笟缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="cpmc">
-        <Property/>
+        <Property></Property>
         <Property name="label">浜у搧鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="cppc">
-        <Property/>
+        <Property></Property>
         <Property name="label">浜у搧鎵规</Property>
       </PropertyDef>
       <PropertyDef name="cplx">
-        <Property/>
+        <Property></Property>
         <Property name="label">浜у搧绫诲瀷</Property>
       </PropertyDef>
       <PropertyDef name="scrq">
@@ -54,7 +54,7 @@
         <Property name="label">鐢熶骇鏃ユ湡</Property>
       </PropertyDef>
       <PropertyDef name="cysm">
-        <Property/>
+        <Property></Property>
         <Property name="label">鎶芥牱璇存槑</Property>
       </PropertyDef>
       <PropertyDef name="cysj">
@@ -62,11 +62,11 @@
         <Property name="label">鎶芥牱鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="cyr">
-        <Property/>
+        <Property></Property>
         <Property name="label">鎶芥牱浜�</Property>
       </PropertyDef>
       <PropertyDef name="cydd">
-        <Property/>
+        <Property></Property>
         <Property name="label">鎶芥牱鍦扮偣</Property>
       </PropertyDef>
       <PropertyDef name="djsj">
@@ -82,11 +82,11 @@
         <Property name="label">鎶芥牱鏁伴噺</Property>
       </PropertyDef>
       <PropertyDef name="sfyx">
-        <Property/>
+        <Property></Property>
         <Property name="label">鏄惁鏈夋晥</Property>
       </PropertyDef>
       <PropertyDef name="bz">
-        <Property/>
+        <Property></Property>
         <Property name="label">澶囨敞</Property>
       </PropertyDef>
       <PropertyDef name="bizId">
@@ -104,6 +104,10 @@
       <PropertyDef name="kqdm">
         <Property></Property>
         <Property name="label">搴撳尯浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="jybglx">
+        <Property/>
+        <Property name="label">妫�娴嬫姤鍛婄被鍨�</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam">
@@ -427,6 +431,11 @@
             <Property name="property">kqdm</Property>
             <Editor/>
           </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jybglx</Property>
+            <Property name="property">jybglx</Property>
+            <Editor/>
+          </AutoFormElement>
         </AutoForm>
       </Children>
       <Tools/>
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
index bd4ceb6..50128f3 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1212.java
@@ -64,7 +64,7 @@
 
     private String crkmxid;  //鍑哄叆搴撴槑缁咺D
     private String ajbh;  //寤掗棿缂栧彿
-    private String cfmc;  //寤掗棿鍚嶇О
+    private String ajmc ;  //寤掗棿鍚嶇О
     private String hwbh;  //璐т綅缂栧彿
     private String hwmc;  //璐т綅鍚嶇О
     private String kctzbh;  //搴撳瓨鍙板笎ID
@@ -93,7 +93,7 @@
     private String qkxm;  //娆犳椤圭洰
     private Double dj;  //鍗曚环
     private Double je;  //閲戦
-    private String dj1;  //绛夌骇
+    private String cpdj ;  //绛夌骇
     private String cd;  //浜у湴
     private String sccj;  //鐢熶骇鍘傚
     private String gg;  //瑙勬牸鍨嬪彿
@@ -105,11 +105,17 @@
     private String bzqjzrq;  //淇濊川鏈熸埅鑷虫棩鏈�
     private String bgy;  //淇濈鍛�
     private String ckfs;  //鍑哄簱鏂瑰紡
-    private String djsj;  //鐧昏鏃堕棿
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date djsj;  //鐧昏鏃堕棿
     private String zz;  //绔欓暱
     private String jjy;  //璐ㄦ鍛�
     private String sxh;  //椤哄簭鍙�
-//    private String bz;  //澶囨敞
+    //    private String bz;  //澶囨敞
+    private String ddid;  //璁㈠崟ID
+    private String crktzdid;  //鍑哄叆搴撻�氱煡鍗旾D
+    private String crktzdmxid;  //鍑哄叆搴撻�氱煡鍗曟槑缁咺D
+    private String djr;  //鐧昏浜�
+
 
     private String jybgwjid;  //妫�楠屾姤鍛婃枃浠秈d
     @JSONField(format = "yyyy-MM-dd")
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java
index fbbfb57..7eabfc4 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1215.java
@@ -45,6 +45,7 @@
     private Double cysl;//鎶芥牱鏁伴噺
     private String sfyx;//鏄惁鏈夋晥
     private String bz;//澶囨敞
+    private String jybglx;//妫�娴嬫姤鍛婄被鍨�
 
     //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
     @JSONField(serialize = false)
diff --git a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
index ec39b1e..5b4b79d 100644
--- a/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
+++ b/src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1212PR.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 /**
- * 鍚堝悓淇℃伅
+ * 鍑哄叆搴撹褰�
  *
  * @Author:YAN
  */

--
Gitblit v1.9.3