From 4aff6ce5a44047245f86e776d3b6b67314aed70e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 26 十二月 2025 14:55:17 +0800
Subject: [PATCH] 增加库区配置，合并通知单、及流程和设备配置
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml | 61 +++-----
fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html | 2
fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js | 12 -
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml | 224 ++++++++++++++++++++++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfManage.view.xml | 23 +++
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java | 4
fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html | 5
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeManage.view.xml | 23 +++
10 files changed, 309 insertions(+), 55 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
index 999e00d..d2f95d2 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Dept.java
@@ -29,6 +29,10 @@
@TableField("id")
private String id;
+ @Column(name = "parent_id", columnDefinition = "varchar(40) COMMENT '鏀跺偍鍏徃'")
+ @TableField("parent_id")
+ private String parentId;
+
@Column(name = "kqmc", columnDefinition = "varchar(256) COMMENT '搴撳尯鍚嶇О'")
@TableField("kqmc")
private String kqmc;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index 7ff3a60..d218b7a 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -87,7 +87,9 @@
return;
}
Dept dept = new Dept();
- dept.setId(sysDept.getDeptId() + "");
+ String deptId = sysDept.getDeptId() + "";
+ dept.setId(deptId);
+ dept.setParentId(deptId.substring(0, deptId.length() - 3));
dept.setKqmc(sysDept.getDeptName());
dept.setCompanyId(sysDept.getCompanyId());
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
new file mode 100644
index 0000000..e7007b1
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.igds.domain.Dept</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">搴撳尯缂栫爜</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="parentId">
+ <Property></Property>
+ <Property name="label">鏀跺偍鍏徃</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("companyPR#getData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">dwmc</Property>
+ </Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="kqmc">
+ <Property></Property>
+ <Property name="label">搴撳尯鍚嶇О</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdz">
+ <Property></Property>
+ <Property name="label">搴撳尯鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhdm">
+ <Property></Property>
+ <Property name="label">鍖哄垝浠ｇ爜</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhmc">
+ <Property></Property>
+ <Property name="label">鎵�鍦ㄥ尯鍘�</Property>
+ </PropertyDef>
+ <PropertyDef name="kqcq">
+ <Property></Property>
+ <Property name="label">搴撳尯浜ф潈</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-鑷湁</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-绉熻祦</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-鍏辨湁</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-娣峰悎</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9-鍏朵粬</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="yxcr">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈夋晥浠撳</Property>
+ <Property name="displayFormat">#0.000 鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="zdmj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗犲湴闈㈢Н</Property>
+ <Property name="displayFormat">#0.000 骞虫柟绫�</Property>
+ </PropertyDef>
+ <PropertyDef name="cfs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">浠撳簱鏁�</Property>
+ <Property name="displayFormat">#0 鏍�</Property>
+ </PropertyDef>
+ <PropertyDef name="jd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">缁忓害</Property>
+ </PropertyDef>
+ <PropertyDef name="wd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绾害</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="imgPath">
+ <Property></Property>
+ <Property name="label">鍥捐矾寰�</Property>
+ </PropertyDef>
+ <PropertyDef name="imgName">
+ <Property></Property>
+ <Property name="label">楦熺灠鍥�</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:10">
+ <ClientEvent name="onReady">
+
+/**
+* 鍑哄叆搴撻厤缃�
+*/
+inoutConf = function(){
+ var cur = view.get("#dgMain").get("selection");
+ if(cur){
+ var deptId = cur.get("id");
+ var url = "/com.fzzy.igds.inoutConfManage.d?deptId="+ deptId;
+ window.$openTab("鍑哄叆搴撻厤缃�", url);
+ }else{
+ $notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
+ }
+};
+
+/**
+* 鎶撴媿閰嶇疆
+*/
+snapConf = function(){
+ var cur = view.get("#dgMain").get("selection");
+ if(cur){
+ var deptId = cur.get("id");
+ var url = "/com.fzzy.igds.SnapConf.d?deptId="+ deptId;
+ window.$openTab("鎶撴媿閰嶇疆", url);
+ }else{
+ $notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
+ }
+};
+
+/**
+* 宸℃閰嶇疆
+*/
+patrolConf = function(){
+ var cur = view.get("#dgMain").get("selection");
+ if(cur){
+ var deptId = cur.get("id");
+ var url = "/com.fzzy.igds.PatrolConf.d?deptId="+ deptId;
+ window.$openTab("宸℃閰嶇疆", url);
+ }else{
+ $notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
+ }
+};
+
+//鎿嶄綔
+renderCell1 = function(arg,self){
+ var data = arg.data;
+ var htm = "<a onClick='inoutConf()' class='a-btn1'>鍑哄叆搴撻厤缃�</a>&nbsp;|&nbsp;<a onClick='snapConf()' class='a-btn2'>鎶撴媿閰嶇疆</a>&nbsp;|&nbsp;<a onClick='patrolConf()' class='a-btn4'>宸℃閰嶇疆</a>";
+ arg.dom.innerHTML = htm;
+};
+
</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataProvider">deptPR#getData</Property>
+ <Property name="dataType">[dtMain]</Property>
+ </DataSet>
+ <Container>
+ <Property name="className">c-param</Property>
+ <DataGrid id="dgMain" layoutConstraint="padding:8">
+ <ClientEvent name="onDataRowClick">view.get("#dgMain").set("selection",arg.data);</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="selectionMode">singleRow</Property>
+ <RowSelectorColumn/>
+ <RowNumColumn/>
+ <DataColumn name="parentId">
+ <Property name="property">parentId</Property>
+ <Property name="align">left</Property>
+ <Property name="width">360</Property>
+ </DataColumn>
+ <DataColumn name="kqmc">
+ <Property name="property">kqmc</Property>
+ <Property name="align">left</Property>
+ <Property name="width">380</Property>
+ </DataColumn>
+ <DataColumn name="xzqhmc">
+ <Property name="property">xzqhmc</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
+ <Property name="caption">閰嶇疆</Property>
+ <Property name="align">center</Property>
+ <Editor/>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
index 9ec2abe..b5a11cb 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
@@ -10,6 +10,16 @@
<Property name="label">搴撳尯缂栫爜</Property>
<Property name="readOnly">true</Property>
</PropertyDef>
+ <PropertyDef name="parentId">
+ <Property></Property>
+ <Property name="label">鏀跺偍鍏徃</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("companyPR#getData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">dwmc</Property>
+ </Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
@@ -30,7 +40,7 @@
</PropertyDef>
<PropertyDef name="xzqhmc">
<Property></Property>
- <Property name="label">鍖哄垝鍚嶇О</Property>
+ <Property name="label">鎵�鍦ㄥ尯鍘�</Property>
</PropertyDef>
<PropertyDef name="kqcq">
<Property></Property>
@@ -184,22 +194,16 @@
<Property name="property">kqmc</Property>
<Property name="align">left</Property>
</DataColumn>
+ <DataColumn name="parentId">
+ <Property name="property">parentId</Property>
+ <Property name="align">left</Property>
+ </DataColumn>
<DataColumn name="xzqhmc">
<Property name="property">xzqhmc</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="kqcq">
- <Property name="property">kqcq</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
<DataColumn name="yxcr">
<Property name="property">yxcr</Property>
- <Property name="align">center</Property>
- <Property name="width">180</Property>
- </DataColumn>
- <DataColumn name="zdmj">
- <Property name="property">zdmj</Property>
<Property name="align">center</Property>
<Property name="width">180</Property>
</DataColumn>
@@ -223,7 +227,7 @@
<Dialog id="dialogMain">
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">搴撳尯淇℃伅</Property>
- <Property name="width">70%</Property>
+ <Property name="width">65%</Property>
<Property name="closeable">false</Property>
<Buttons>
<Button id="btnOk">
@@ -267,13 +271,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">kqdz</Property>
- <Property name="property">kqdz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqcq</Property>
- <Property name="property">kqcq</Property>
+ <Property name="name">parentId</Property>
+ <Property name="property">parentId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -281,9 +280,9 @@
<Property name="property">yxcr</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">zdmj</Property>
- <Property name="property">zdmj</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">kqdz</Property>
+ <Property name="property">kqdz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -302,17 +301,14 @@
<Property name="property">xzqhdm</Property>
<Editor/>
</AutoFormElement>
- <Label>
- <Property name="text"></Property>
- </Label>
<AutoFormElement>
- <Property name="name">createBy</Property>
- <Property name="property">createBy</Property>
+ <Property name="name">zdmj</Property>
+ <Property name="property">zdmj</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">createTime</Property>
- <Property name="property">createTime</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -371,11 +367,6 @@
</Property>
<Property name="text">甯姪锛氱偣鍑诲潗鏍囦綅缃嬀鍙�</Property>
</Link>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Editor/>
- </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfManage.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfManage.view.xml
new file mode 100644
index 0000000..4f44f87
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutConfManage.view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model/>
+ <View layout="padding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <TabControl>
+ <IFrameTab>
+ <Property name="caption">娴佺▼閰嶇疆</Property>
+ <Property name="path">com.fzzy.igds.InoutSysConf.d</Property>
+ <Property name="width">200</Property>
+ <Property name="iconClass">fa fa-gavel</Property>
+ </IFrameTab>
+ <IFrameTab>
+ <Property name="caption">璁惧閰嶇疆</Property>
+ <Property name="path">com.fzzy.igds.InoutConf.d</Property>
+ <Property name="width">200</Property>
+ <Property name="iconClass">fa fa-shopping-cart</Property>
+ </IFrameTab>
+ </TabControl>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeManage.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeManage.view.xml
new file mode 100644
index 0000000..8c80547
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeManage.view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model/>
+ <View layout="padding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <TabControl>
+ <IFrameTab>
+ <Property name="caption">鍏ュ簱閫氱煡鍗�</Property>
+ <Property name="path">com.fzzy.igds.InoutNoticeIn.d</Property>
+ <Property name="width">200</Property>
+ <Property name="iconClass">fa fa-gavel</Property>
+ </IFrameTab>
+ <IFrameTab>
+ <Property name="caption">鍑哄簱閫氱煡鍗�</Property>
+ <Property name="path">com.fzzy.igds.InoutNoticeOut.d</Property>
+ <Property name="width">200</Property>
+ <Property name="iconClass">fa fa-shopping-cart</Property>
+ </IFrameTab>
+ </TabControl>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
index c7bb898..e86ed05 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
@@ -139,10 +139,10 @@
</Button>
<Button>
<ClientEvent name="onClick">
- var url = "/com.fzzy.igds.PatrolConf.d";
- window.$openTab("宸℃洿閰嶇疆", url);
+ var url = "/com.fzzy.igds.ConfByDept.d";
+ window.$openTab("搴撳尯閰嶇疆", url);
</ClientEvent>
- <Property name="caption">宸℃洿閰嶇疆</Property>
+ <Property name="caption">搴撳尯閰嶇疆</Property>
<Property name="exClassName">btn-q1</Property>
<Property name="iconClass">fa fa-plus-square</Property>
</Button>
diff --git a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
index fa56b5c..a06b09a 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
@@ -336,14 +336,6 @@
});
}
function openConf() {
- var url = ctx + "com.fzzy.igds.SnapConf.d";
- var options = {
- title: "鎶撴媿閰嶇疆",
- url: url,
- btn: 0,
- yes: function (index, layero) {
- $.modal.close(index);
- }
- };
- $.modal.openOptions(options);
+ var url = ctx + "com.fzzy.igds.ConfByDept.d";
+ $.modal.openTab("搴撳尯閰嶇疆", url);
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
index 3949fe4..9a4d36c 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo/eventInfo.html
@@ -51,11 +51,6 @@
</ul>
</div>
</form>
- <div class="btn-group-sm" role="group">
- <a class="btn btn-success">
- <i class="fa fa-plus"></i> 浜嬩欢閰嶇疆
- </a>
- </div>
</div>
<div class="col-sm-12 " style="padding-top: 10px;background: #FFFFFF;margin-top: 10px;">
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
index 7d31c5e..228da6f 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/snap/snapRecord/snapRecord.html
@@ -55,7 +55,7 @@
</form>
<div class="btn-group-sm" role="group">
<a class="btn btn-success" onclick="openConf()">
- <i class="fa fa-plus"></i> 鎶撴媿閰嶇疆
+ <i class="fa fa-plus"></i> 搴撳尯閰嶇疆
</a>
</div>
</div>
--
Gitblit v1.9.3