From 4e15712a9b23aaf1f28d1aaecc2eb55f852e93d8 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 23 九月 2023 08:57:33 +0800
Subject: [PATCH] 优化上海账面库存接口
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java | 6 +++++-
src/main/java/com/fzzy/api/view/Api1211.view.xml | 29 +++++++++++++++++++++++++++++
src/main/java/com/fzzy/api/entity/Api1211.java | 8 ++++++++
src/main/resources/application-dev.yml | 6 +++---
velocity.log | 1 +
src/main/resources/application.yml | 2 +-
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 8 +++++---
7 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1211.java b/src/main/java/com/fzzy/api/entity/Api1211.java
index ee2566f..fe9d9dd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1211.java
+++ b/src/main/java/com/fzzy/api/entity/Api1211.java
@@ -47,6 +47,14 @@
@Column(name = "kqdm", length = 21)
private String kqdm;
+ @PropertyDef(label = "璐т綅浠ｇ爜", description = "鐩墠涓婃捣浣跨敤")
+ @Column(name = "hwdm", length = 30)
+ private String hwdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜", description = "鐩墠涓婃捣浣跨敤")
+ @Column(name = "lsxzdm", length = 7)
+ private String lsxzdm;
+
@PropertyDef(label = "绮鍝佺浠ｇ爜",required=true)
@Column(name = "lspzdm", length = 7)
private String lspzdm;
diff --git a/src/main/java/com/fzzy/api/view/Api1211.view.xml b/src/main/java/com/fzzy/api/view/Api1211.view.xml
index e421c12..302d7d2 100644
--- a/src/main/java/com/fzzy/api/view/Api1211.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1211.view.xml
@@ -26,6 +26,19 @@
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
+ <PropertyDef name="hwdm">
+ <Property></Property>
+ <Property name="label">璐т綅浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="lsxzdm">
+ <Property></Property>
+ <Property name="label">绮鎬ц川浠ｇ爜</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("LSXZ")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="id">
<Property name="dataType">Integer</Property>
</PropertyDef>
@@ -332,6 +345,22 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lsxzdm</Property>
+ <Property name="property">lsxzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="text">璇存槑锛氫笂娴蜂娇鐢�(璐т綅浠ｇ爜銆佺伯椋熸�ц川浠ｇ爜)</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
+ <AutoFormElement>
<Property name="name">yf</Property>
<Property name="property">yf</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 8d978d9..f17b10e 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -659,10 +659,12 @@
api1211 = new SH2023Api1211();
BeanUtils.copyProperties(apiData, api1211);
- //TODO 璐т綅浠ｇ爜 绮鎬ц川浠ｇ爜 鏉ョ伯浠ｇ爜
-
-
+ api1211.setZglkdm(api1211.getKqdm());
api1211.setBjw(ShAreaBjw.getBjw(code));
+ api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
+ if(StringUtils.isEmpty(api1211.getLldm())){
+ api1211.setLldm("鏃�");
+ }
list.add(api1211);
}
return JSON.toJSONString(list);
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
index 44cda82..2af339b 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
@@ -28,6 +28,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "涓荤绮簱浠ｇ爜")
+ private String zglkdm;
+
@PropertyDef(label = "骞村害")
private String nd;
@@ -49,6 +52,7 @@
@PropertyDef(label = "鏈堢粨鏍囧織")
private Integer yjbz;
+ @JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "涓氬姟鏃ユ湡")
private Date ywrq;
@@ -69,6 +73,6 @@
private String pch;
@PropertyDef(label = "鏉ョ伯浠ｇ爜")
- private String lldm;
+ private String lldm = "鏃�";
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 40ca9c7..89e6b9b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@
#涓绘暟鎹簮
primary:
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娓彛鏂颁粨
@@ -30,9 +30,9 @@
#娆℃暟鎹簮
secondary:
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
- url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8 #涓婃捣鍢夊畾
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
-# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
# 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_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 566ba5b..a862643 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -32,6 +32,6 @@
igds:
default:
- companyId: 5503
+ companyId: 5326
file-path: C:/app/igds-api
img-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/velocity.log b/velocity.log
index e69de29..c7e7864 100644
--- a/velocity.log
+++ b/velocity.log
@@ -0,0 +1 @@
+2023-09-22 16:00:01,848 - ResourceManager : unable to find resource 'com/bstek/dorado/web/resolver/ErrorPage.html' in any resource loader.
--
Gitblit v1.9.3