From e7ab049344b954b044fc474992c378fcbbeeba33 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 08 二月 2026 19:08:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 14 -------
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 14 -------
fzzy-igdss-view/src/main/java/com/fzzy/igds/zy/InoutNoticeOut.view.xml | 2
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-web/src/main/resources/static/group/index.js | 25 +++++++-----
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 2
fzzy-igdss-web/src/main/resources/application-pro.yml | 4 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 6 +++
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 20 ----------
fzzy-igdss-web/src/main/resources/application.yml | 2
fzzy-igdss-web/src/main/resources/application-pro5372.yml | 4 +-
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java | 3 +
13 files changed, 32 insertions(+), 67 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/ExportService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
index b2a4ed9..0a6754e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
@@ -360,6 +360,9 @@
}
}
+ if(null != resultData.getFullWeight() && null != resultData.getEmptyWeight()){
+ resultData.setNetWeight(resultData.getFullWeight() - resultData.getEmptyWeight());
+ }
return resultData;
}
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 358b891..76dcd79 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
@@ -66,6 +66,9 @@
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
+ if (StringUtils.isNotBlank(param.getDeptId())) {
+ queryWrapper.eq("dept_id", param.getDeptId());
+ }
if (StringUtils.isNotBlank(param.getCustomerName())) {
queryWrapper.like("customer_name", param.getCustomerName());
}
@@ -262,6 +265,9 @@
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
+ if (StringUtils.isNotBlank(param.getDeptId())) {
+ queryWrapper.eq("dept_id", param.getDeptId());
+ }
if (StringUtils.isNotBlank(param.getCustomerName())) {
queryWrapper.like("customer_name", param.getCustomerName());
}
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-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 de7df60..f0d32bd 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
@@ -272,7 +272,7 @@
<Button>
<ClientEvent name="onClick">var data = view.get("#dsQuery.data");
if(data){
- view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
+ view.get("#dsMain").set("parameter",data).flushAsync();
}else{
view.get("#dsMain").flushAsync();
}</ClientEvent>
diff --git a/fzzy-igdss-web/src/main/resources/application-pro.yml b/fzzy-igdss-web/src/main/resources/application-pro.yml
index 4c6663d..0cff128 100644
--- a/fzzy-igdss-web/src/main/resources/application-pro.yml
+++ b/fzzy-igdss-web/src/main/resources/application-pro.yml
@@ -144,7 +144,7 @@
cipherKey:
session:
# Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
- expireTime: -1
+ expireTime: 43200
# 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
dbSyncPeriod: 1
# 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
@@ -164,4 +164,4 @@
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
excludes: /system/notice/*
# 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
\ No newline at end of file
+ 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 4c6663d..0cff128 100644
--- a/fzzy-igdss-web/src/main/resources/application-pro5372.yml
+++ b/fzzy-igdss-web/src/main/resources/application-pro5372.yml
@@ -144,7 +144,7 @@
cipherKey:
session:
# Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
- expireTime: -1
+ expireTime: 43200
# 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
dbSyncPeriod: 1
# 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
@@ -164,4 +164,4 @@
# 鎺掗櫎閾炬帴锛堝涓敤閫楀彿鍒嗛殧锛�
excludes: /system/notice/*
# 鍖归厤閾炬帴
- urlPatterns: /system/*,/monitor/*,/tool/*
\ No newline at end of file
+ urlPatterns: /system/*,/monitor/*,/tool/*
diff --git a/fzzy-igdss-web/src/main/resources/application.yml b/fzzy-igdss-web/src/main/resources/application.yml
index 1a6adb9..2ab0496 100644
--- a/fzzy-igdss-web/src/main/resources/application.yml
+++ b/fzzy-igdss-web/src/main/resources/application.yml
@@ -156,7 +156,7 @@
cipherKey:
session:
# Session瓒呮椂鏃堕棿锛�-1浠ｈ〃姘镐笉杩囨湡锛堥粯璁�30鍒嗛挓锛�
- expireTime: -1
+ expireTime: 43200
# 鍚屾session鍒版暟鎹簱鐨勫懆鏈燂紙榛樿1鍒嗛挓锛�
dbSyncPeriod: 1
# 鐩搁殧澶氫箙妫�鏌ヤ竴娆ession鐨勬湁鏁堟�э紝榛樿灏辨槸10鍒嗛挓
diff --git a/fzzy-igdss-web/src/main/resources/static/group/index.js b/fzzy-igdss-web/src/main/resources/static/group/index.js
index b654621..a5a3281 100644
--- a/fzzy-igdss-web/src/main/resources/static/group/index.js
+++ b/fzzy-igdss-web/src/main/resources/static/group/index.js
@@ -365,21 +365,24 @@
num7 = '杩戜竷澶╂暟閲�'+ item.warnNum7 + '涓�';
}
html += '<div class="panel-content-body-tr">';
- if (item.warnNum7 > 10) {
+ if (item.dailyTotal > 0) {
flag = true;
- html += '<span class="body-item sp" style="color: #bc2032;flex: 1.5;">' + item.deptName + '</span>';
- html += '<span class="body-item sp" style="color: #bc2032;">' + num1 + '</span>';
- html += '<span class="body-item sp" style="color: #bc2032;">' + num7 + '</span>';
- } else if (item.warnNum7 > 1 && item.warnNum7 < 10) {
- flag = true;
- html += '<span class="body-item sp" style="color: #f37b3d;flex: 1.5;">' + item.deptName + '</span>';
- html += '<span class="body-item sp" style="color: #f37b3d;">' + num1+ '</span>';
- html += '<span class="body-item sp" style="color: #f37b3d;">' + num7 + '</span>';
- }else {
+ }
+ // if (item.warnNum7 > 10) {
+ // flag = true;
+ // html += '<span class="body-item sp" style="color: #bc2032;flex: 1.5;">' + item.deptName + '</span>';
+ // html += '<span class="body-item sp" style="color: #bc2032;">' + num1 + '</span>';
+ // html += '<span class="body-item sp" style="color: #bc2032;">' + num7 + '</span>';
+ // } else if (item.warnNum7 > 1 && item.warnNum7 < 10) {
+ // flag = true;
+ // html += '<span class="body-item sp" style="color: #f37b3d;flex: 1.5;">' + item.deptName + '</span>';
+ // html += '<span class="body-item sp" style="color: #f37b3d;">' + num1+ '</span>';
+ // html += '<span class="body-item sp" style="color: #f37b3d;">' + num7 + '</span>';
+ // }else {
html += '<span class="body-item sp" style="flex: 1.5;">' + item.deptName + '</span>';
html += '<span class="body-item sp">' + num1 + '</span>';
html += '<span class="body-item sp">' + num7 + '</span>';
- }
+ // }
html += '</div>';
})
}
--
Gitblit v1.9.3