From 0329de5a2343a179be54a9c70844515db202a998 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 09:42:52 +0800
Subject: [PATCH] 细节调整1
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml | 2 +-
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 2 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 16 ++++++++--------
fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java | 4 ++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PledgeContract.java | 2 +-
fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PledgeContract.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PledgeContract.java
index c4e25cf..5c605cb 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PledgeContract.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PledgeContract.java
@@ -77,7 +77,7 @@
@TableField("depot_names")
private String depotNames;
- @Column(name = "status", columnDefinition = "varchar(2) COMMENT '璐ㄦ娂鐘舵�� Y 宸茶В鍘� N 鏈В鍘�'")
+ @Column(name = "status", columnDefinition = "varchar(2) COMMENT '璐ㄦ娂鐘舵�� Y 宸茶В鎶� N 鏈В鎶�'")
@TableField("status")
private String status = Constant.YN_N;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index 5ab8bac..a03f396 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -143,7 +143,7 @@
//鑾峰彇璐ㄦ娂鍚堝悓鏁版嵁
PledgeContract pledge = this.getPledgeByDepotId(data);
if (null != pledge && pledge.getStatus().equals(Constant.YN_N)) {
- return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｅ帇鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
+ return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｆ娂鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
}
}
@@ -197,9 +197,9 @@
/**
- * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘�
+ * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶�
* @param data 褰撳墠鏁版嵁
- * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘嬶紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鍘�
+ * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶硷紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鎶�
*/
private PledgeContract getPledgeByDepotId(InoutNoticeIn data) {
IgdsBaseParam param = new IgdsBaseParam();
@@ -315,13 +315,13 @@
*/
@Transactional(rollbackFor = Exception.class)
public BaseResp saveOrUpdateOut(InoutNoticeOut data) {
- //濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负搴撳尯閫氱煡鍗曪紝楠岃瘉浠撳簱鏄惁鏄湭瑙ｅ帇寰椾粨搴擄紝鏄垯涓嶅厑璁镐繚瀛�
+ //濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负搴撳尯閫氱煡鍗曪紝楠岃瘉浠撳簱鏄惁鏄湭瑙ｆ娂寰椾粨搴擄紝鏄垯涓嶅厑璁镐繚瀛�
if (InoutConstant.NOTICE_IN_TYPE_10.equals(data.getType())) {
- //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｅ帇锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨勬暟鎹�
+ //鍦ㄨ川鎶煎悎鍚屾壘鍒版湭瑙ｆ娂锛屼笖璐ㄦ娂浠撳簱鍖呭惈褰撳墠浠撳簱鐨勬暟鎹�
//鑾峰彇璐ㄦ娂鍚堝悓鏁版嵁
PledgeContract pledge = this.getPledgeByDepotIdOut(data);
if (null != pledge && pledge.getStatus().equals(Constant.YN_N)) {
- return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｅ帇鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
+ return BaseResp.error("褰撳墠浠撳簱鏈夋湭瑙ｆ娂鐨勮川鎶煎悎鍚岋紝璐ㄦ娂鍚堝悓=" + pledge.getName());
}
}
//濡傛灉鍑哄簱閫氱煡鍗曠被鍨嬩负鐩戠閫氱煡鍗�
@@ -384,9 +384,9 @@
}
/**
- * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘�
+ * 鍒ゆ柇褰撳墠浠撳簱鏄惁鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶�
* @param data 褰撳墠鏁版嵁
- * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鍘嬶紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鍘�
+ * @return true-鍦ㄨ川鎶煎悎鍚屼腑鏈В鎶硷紝false-鍦ㄨ川鎶煎悎鍚屼腑宸茶В鎶�
*/
private PledgeContract getPledgeByDepotIdOut(InoutNoticeOut data) {
IgdsBaseParam param = new IgdsBaseParam();
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index f0814cb..50d9c56 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -610,7 +610,7 @@
<Editor/>
</AutoFormElement>
<HtmlContainer layoutConstraint="colSpan:3">
- <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
+ <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍑哄簱浣滀笟銆�<br>
2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��<br>
3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
<Property name="exClassName">h-tip</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
index 496c380..dab6a1b 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
@@ -297,7 +297,7 @@
<HtmlContainer layoutConstraint="colSpan:3">
<Property name="content">1.褰撳墠鍗曟嵁浠呬綔涓哄綋鍓嶇郴缁熶笟鍔′俊鎭櫥璁颁娇鐢紝涓嶄綔涓哄疄闄呭弻鏂瑰悎绾︾害鏉熴��<br>
2.褰撳墠鍗曟嵁榛樿鏀寔涓�1涓悎绾﹀搴�1涓簱鍖猴紝濡傛灉鍚屾椂瀵瑰簲澶氫釜搴撳尯璇锋暟鎹櫥璁般��<br>
-3.璐ㄦ娂鐘舵�佸鏋�=瑙ｅ帇锛岀郴缁熷搴斿偓鍔炴彁閱掔瓑鍔熻兘鑷姩瀹屾垚銆�<br></Property>
+3.璐ㄦ娂鐘舵�佸鏋�=瑙ｆ娂锛岀郴缁熷搴斿偓鍔炴彁閱掔瓑鍔熻兘鑷姩瀹屾垚銆�<br></Property>
<Property name="exClassName">h-tip</Property>
<Property name="contentOverflow">hidden</Property>
</HtmlContainer>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java
index 758603f..2393f60 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContractPR.java
@@ -87,8 +87,8 @@
@DataProvider
public List<SysDictData> status() {
List<SysDictData> result = new ArrayList<>();
- result.add(new SysDictData("鏈В鍘�", Constant.YN_N));
- result.add(new SysDictData("宸茶В鍘�", Constant.YN_Y));
+ result.add(new SysDictData("鏈В鎶�", Constant.YN_N));
+ result.add(new SysDictData("宸茶В鎶�", Constant.YN_Y));
return result;
}
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
index 316af4c..de7df60 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml
@@ -517,7 +517,7 @@
<Editor/>
</AutoFormElement>
<HtmlContainer layoutConstraint="colSpan:3">
- <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�<br>
+ <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍑哄簱浣滀笟銆�<br>
2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��<br>
3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
<Property name="exClassName">h-tip</Property>
--
Gitblit v1.9.3