From a9f37548e6b92aa2d5153d3c3c80fa9a5a1febac Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 四月 2024 20:42:03 +0800
Subject: [PATCH] 统一编码-优化库存接口和违规预警接口

---
 src/main/java/com/fzzy/api/view/Api1309.view.xml                   |    6 +++---
 src/main/java/com/fzzy/api/entity/Api1309.java                     |    4 ++--
 src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/fzzy/api/entity/Api1309.java b/src/main/java/com/fzzy/api/entity/Api1309.java
index 6582826..c0e5365 100644
--- a/src/main/java/com/fzzy/api/entity/Api1309.java
+++ b/src/main/java/com/fzzy/api/entity/Api1309.java
@@ -34,8 +34,8 @@
     private String yjxxdm;
 
     @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
-    @Column(name = "tydwbm", length = 20)
-    private String tydwbm;
+    @Column(name = "wgdwtybm", length = 20)
+    private String wgdwtybm;
 
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @PropertyDef(label = "棰勮鍙戝竷鏃堕棿" )
diff --git a/src/main/java/com/fzzy/api/view/Api1309.view.xml b/src/main/java/com/fzzy/api/view/Api1309.view.xml
index 1dffaac..16c4c5b 100644
--- a/src/main/java/com/fzzy/api/view/Api1309.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1309.view.xml
@@ -26,7 +26,7 @@
       <PropertyDef name="qydm">
         <Property name="label">杩濊鍗曚綅浠g爜</Property>
       </PropertyDef>
-      <PropertyDef name="tydwbm">
+      <PropertyDef name="wgdwtybm">
         <Property name="label">鍥藉缁熶竴鍗曚綅缂栫爜</Property>
       </PropertyDef>
       <PropertyDef name="wgxwr">
@@ -344,8 +344,8 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">tydwbm</Property>
-            <Property name="property">tydwbm</Property>
+            <Property name="name">wgdwtybm</Property>
+            <Property name="property">wgdwtybm</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 6444f65..4abbd74 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -520,6 +520,7 @@
         }
         if (Constant.API_CODE_1208.equals(inteId)) {
             Gd2022Api1208 api1208 = new Gd2022Api1208();
+            BeanUtils.copyProperties(data, api1208);
             //鍖呰鍌ㄧ伯鏄紝鏍告煡鍖呭瓨绮寘鏁�
             if(null == api1208.getBclbs()){
                 api1208.setBclbs(0);
@@ -537,7 +538,6 @@
                 String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
                 api1208.setTyhwbm(tyhwbm);
             }
-            BeanUtils.copyProperties(data, api1208);
             return JSON.toJSONString(api1208);
         }
         if (Constant.API_CODE_1209.equals(inteId)) {
@@ -704,9 +704,9 @@
         if (Constant.API_CODE_1309.equals(inteId)) {
             Api1309 apiData = (Api1309) data;
             //鏍¢獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
-            if(StringUtils.isEmpty(apiData.getTydwbm())){
+            if(StringUtils.isEmpty(apiData.getWgdwtybm())){
                 String tydwbm = apiCommonService.getTydwbm(apiData.getQydm());
-                apiData.setTydwbm(tydwbm);
+                apiData.setWgdwtybm(tydwbm);
             }
             apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
             return JSON.toJSONString(apiData);

--
Gitblit v1.9.3