From e69345c81150863c4a716819984693fd0487b419 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 11:52:25 +0800
Subject: [PATCH] 客户问题优化调整6-出入库详单取消入库重量，监管下出入库报表查询数据一样问题
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java | 1
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 2
fzzy-igdss-web/src/main/resources/application-pro.yml | 50 ++++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 20 ------
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 14 ----
fzzy-igdss-web/src/main/resources/application-pro5372.yml | 50 ++++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 14 ----
8 files changed, 101 insertions(+), 52 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
index b96abdf..4625fdb 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
@@ -231,7 +231,7 @@
@TableField("complete_user")
private String completeUser;
- @Column(name = "remarks", columnDefinition = "varchar(100) COMMENT '澶囨敞璇存槑'")
+ @Column(name = "remarks", columnDefinition = "varchar(500) COMMENT '澶囨敞璇存槑'")
@TableField("remarks")
private String remarks;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
index 1db2bcc..fed06e6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -347,7 +347,7 @@
*/
public String checkRemarks(InoutRecord updateData, InoutRecord record) {
- String remarks = "[" + ContextUtil.getLoginUserName() + "]淇敼鏁版嵁锛�";
+ String remarks = "銆�" + ContextUtil.getLoginUserName() + "銆戜簬["+DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"]淇敼鏁版嵁锛�";
boolean updateTag = false;
//鏍￠獙浠撳簱淇℃伅
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index e99ea9c..77bd8f7 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -366,11 +366,6 @@
view.get("#btnDel").set("visible",false);
}

-if("OUT" == TYPE){
- view.get("#recordWeight").set("caption","鍑哄簱閲嶉噺");
-}else{
- view.get("#recordWeight").set("caption","鍏ュ簱閲嶉噺");
-}

//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
@@ -701,15 +696,6 @@
<Property name="align">center</Property>
<Property name="width">100</Property>
</DataColumn>
- <DataColumn id="recordWeight">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- <Property name="visible">true</Property>
- <Property name="name">recordWeight</Property>
- </DataColumn>
<DataColumn name="progress">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
@@ -930,12 +916,6 @@
<AutoFormElement>
<Property name="name">settleWeight</Property>
<Property name="property">settleWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">recordWeight</Property>
- <Property name="property">recordWeight</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 61553d5..328379a 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -697,13 +697,6 @@
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍏ュ簱閲嶉噺</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
<Property name="property">completeTime</Property>
<Property name="align">center</Property>
<Property name="name">completeTime</Property>
@@ -769,13 +762,6 @@
<Property name="property">settleWeight</Property>
<Property name="caption">缁撶畻閲嶉噺</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍏ュ簱閲嶉噺</Property>
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
index ab5123b..9f8b018 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
@@ -77,6 +77,7 @@
result.put("createUser", ContextUtil.getLoginUserName());
result.put("createTime", new Date());
result.put("title", title);
+ result.put("type", type);
return result;
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 8f441da..696bc3e 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -689,13 +689,6 @@
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍑哄簱閲嶉噺</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
<Property name="property">completeTime</Property>
<Property name="align">center</Property>
<Property name="name">completeTime</Property>
@@ -761,13 +754,6 @@
<Property name="property">settleWeight</Property>
<Property name="caption">缁撶畻閲嶉噺</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">recordWeight</Property>
- <Property name="align">center</Property>
- <Property name="name">recordWeight</Property>
- <Property name="caption">鍑哄簱閲嶉噺</Property>
<Property name="width">100</Property>
</DataColumn>
<DataColumn>
diff --git a/fzzy-igdss-web/src/main/resources/application-pro.yml b/fzzy-igdss-web/src/main/resources/application-pro.yml
index 41e972a..0cff128 100644
--- a/fzzy-igdss-web/src/main/resources/application-pro.yml
+++ b/fzzy-igdss-web/src/main/resources/application-pro.yml
@@ -116,4 +116,52 @@
email: business@fzzygf.com
phone: 400-627-1116
website: http://www.fzzygf.com
- address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
\ No newline at end of file
+ address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+
+# Shiro
+shiro:
+ user:
+ # 鐧诲綍鍦板潃
+ loginUrl: /login
+ # 鏉冮檺璁よ瘉澶辫触鍦板潃
+ unauthorizedUrl: /unauth
+ # 棣栭〉鍦板潃
+ indexUrl: /index
+ # 楠岃瘉鐮佸紑鍏�
+ captchaEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+ cookie:
+ # 璁剧疆Cookie鐨勫煙鍚� 榛樿绌猴紝鍗冲綋鍓嶈闂殑鍩熷悕
+ domain:
+ # 璁剧疆cookie鐨勬湁鏁堣闂矾寰�
+ path: /
+ # 璁剧疆HttpOnly灞炴��
+ httpOnly: true
+ # 璁剧疆Cookie鐨勮繃鏈熸椂闂达紝澶╀负鍗曚綅
+ maxAge: 30
+ # 璁剧疆瀵嗛挜锛屽姟蹇呬繚鎸佸敮涓�鎬э紙鐢熸垚鏂瑰紡锛岀洿鎺ユ嫹璐濆埌main杩愯鍗冲彲锛塀ase64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded()) 锛堥粯璁ゅ惎鍔ㄧ敓鎴愰殢鏈虹閽ワ紝闅忔満绉橀挜浼氬鑷翠箣鍓嶅鎴风RememberMe Cookie鏃犳晥锛屽璁剧疆鍥哄畾绉橀挜RememberMe Cookie鍒欐湁鏁堬級
+ cipherKey:
+ session:
+ # Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
+ expireTime: 43200
+ # 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
+ dbSyncPeriod: 1
+ # 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
+ validationInterval: 10
+ # 鍚屼竴涓敤鎴锋渶澶т細璇濇暟锛屾瘮濡�2鐨勬剰鎬濇槸鍚屼竴涓处鍙峰厑璁告渶澶氬悓鏃朵袱涓汉鐧诲綍锛堥粯璁�-1涓嶉檺鍒讹級
+ maxSession: -1
+ # 韪㈠嚭涔嬪墠鐧诲綍鐨�/涔嬪悗鐧诲綍鐨勭敤鎴凤紝榛樿韪㈠嚭涔嬪墠鐧诲綍鐨勭敤鎴�
+ kickoutAfter: false
+ rememberMe:
+ # 鏄惁寮�鍚浣忔垜
+ enabled: true
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice/*
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
diff --git a/fzzy-igdss-web/src/main/resources/application-pro5372.yml b/fzzy-igdss-web/src/main/resources/application-pro5372.yml
index 41e972a..0cff128 100644
--- a/fzzy-igdss-web/src/main/resources/application-pro5372.yml
+++ b/fzzy-igdss-web/src/main/resources/application-pro5372.yml
@@ -116,4 +116,52 @@
email: business@fzzygf.com
phone: 400-627-1116
website: http://www.fzzygf.com
- address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
\ No newline at end of file
+ address: 閮戝窞甯傞珮鏂板尯闀挎た璺�11鍙锋渤鍗楃渷鍥藉澶у绉戞妧鍥鍖�1鍙锋ゼ
+
+# Shiro
+shiro:
+ user:
+ # 鐧诲綍鍦板潃
+ loginUrl: /login
+ # 鏉冮檺璁よ瘉澶辫触鍦板潃
+ unauthorizedUrl: /unauth
+ # 棣栭〉鍦板潃
+ indexUrl: /index
+ # 楠岃瘉鐮佸紑鍏�
+ captchaEnabled: true
+ # 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
+ captchaType: math
+ cookie:
+ # 璁剧疆Cookie鐨勫煙鍚� 榛樿绌猴紝鍗冲綋鍓嶈闂殑鍩熷悕
+ domain:
+ # 璁剧疆cookie鐨勬湁鏁堣闂矾寰�
+ path: /
+ # 璁剧疆HttpOnly灞炴��
+ httpOnly: true
+ # 璁剧疆Cookie鐨勮繃鏈熸椂闂达紝澶╀负鍗曚綅
+ maxAge: 30
+ # 璁剧疆瀵嗛挜锛屽姟蹇呬繚鎸佸敮涓�鎬э紙鐢熸垚鏂瑰紡锛岀洿鎺ユ嫹璐濆埌main杩愯鍗冲彲锛塀ase64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded()) 锛堥粯璁ゅ惎鍔ㄧ敓鎴愰殢鏈虹閽ワ紝闅忔満绉橀挜浼氬鑷翠箣鍓嶅鎴风RememberMe Cookie鏃犳晥锛屽璁剧疆鍥哄畾绉橀挜RememberMe Cookie鍒欐湁鏁堬級
+ cipherKey:
+ session:
+ # Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
+ expireTime: 43200
+ # 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
+ dbSyncPeriod: 1
+ # 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
+ validationInterval: 10
+ # 鍚屼竴涓敤鎴锋渶澶т細璇濇暟锛屾瘮濡�2鐨勬剰鎬濇槸鍚屼竴涓处鍙峰厑璁告渶澶氬悓鏃朵袱涓汉鐧诲綍锛堥粯璁�-1涓嶉檺鍒讹級
+ maxSession: -1
+ # 韪㈠嚭涔嬪墠鐧诲綍鐨�/涔嬪悗鐧诲綍鐨勭敤鎴凤紝榛樿韪㈠嚭涔嬪墠鐧诲綍鐨勭敤鎴�
+ kickoutAfter: false
+ rememberMe:
+ # 鏄惁寮�鍚浣忔垜
+ enabled: true
+
+# 闃叉XSS鏀诲嚮
+xss:
+ # 杩囨护寮�鍏�
+ enabled: true
+ # 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
+ excludes: /system/notice/*
+ # 鍖归厤閾炬帴
+ urlPatterns: /system/*,/monitor/*,/tool/*
--
Gitblit v1.9.3