From 6d1c07c3f902e5630129163759eb46bbd7435ca5 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 26 一月 2024 19:21:45 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js | 31 +++----
src/main/java/com/zy/asrs/entity/WrkMastStaLog.java | 81 ++++++++++++++++++++
src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html | 53 +++++++++++-
src/main/webapp/static/js/wrkMastSta/wrkMastSta.js | 2
src/main/webapp/views/wrkMastSta/wrkMastSta.html | 51 +++++++++++-
src/main/resources/mapper/WrkMastMapper.xml | 2
6 files changed, 191 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java b/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
index f97480c..2075a92 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastStaLog.java
@@ -180,4 +180,85 @@
Synchro.Copy(source, this);
}
+ public Integer getStaEnd(Integer souSta) {
+ switch (souSta) {
+ case 100:
+ case 103:
+ case 106:
+ case 109:
+ case 112:
+ case 115:
+ return souSta + 1;
+ default:
+ return souSta;
+ }
+ }
+
+ public String getType$() {
+ if (Cools.isEmpty(this.type)) {
+ return "鏈煡";
+ }
+ switch (this.type) {
+ case 1:
+ return "闈炵┖";
+ case 2:
+ return "绌烘澘";
+ default:
+ return "鏈煡";
+ }
+ }
+
+ /**
+ * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
+ */
+ public String getWrkSts$() {
+ if (Cools.isEmpty(this.wrkSts)) {
+ try {
+ if (this.wrkSts==0){
+ return "鍒濆";
+ }
+ }catch (Exception e){
+ return "鏈煡";
+ }
+ return "鏈煡";
+ }
+ switch (this.wrkSts) {
+ case 0:
+ return "鍒濆";
+ case 1:
+ return "绛夊緟灏忚溅鍙�";
+ case 2:
+ return "绛夊緟灏忚溅鏀�";
+ case 3:
+ return "瀹屾垚";
+ default:
+ return "鏈煡";
+ }
+ }
+
+ /**
+ * 宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 3锛氬彇鏀� 5锛氭弧鍙� 6锛氭弧鏀�
+ */
+ public String getWrkType$() {
+ if (Cools.isEmpty(this.wrkType)) {
+ return "鏈煡";
+ }
+ switch (this.wrkType) {
+ case 1:
+ return "鍙犵洏";
+ case 2:
+ return "鎷嗙洏";
+ case 3:
+ return "鍙栨斁";
+ case 4:
+ return "琛岃蛋";
+ case 5:
+ return "婊″彇";
+ case 6:
+ return "婊℃斁";
+ default:
+ return "鏈煡";
+ }
+ }
+
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 698aaf6..de08a18 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -67,7 +67,7 @@
</select>
<select id="selectToBeCompleteData202" resultMap="BaseResultMap">
- select * from asr_wrk_mast where wrk_sts = 52 and io_type = 202 and wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
+ select * from asr_wrk_mast where wrk_sts = 52 and io_type = 202 and (wrk_no not in (select wrk_no from asr_bas_devp)) order by upd_mk,error_time,io_time,wrk_no
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
index dc164ea..5ecf639 100644
--- a/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
+++ b/src/main/webapp/static/js/wrkMastSta/wrkMastSta.js
@@ -28,7 +28,7 @@
,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�',hide: false}
,{field: 'staStart', align: 'center',title: '灏忚溅鎺ヨ揣浣嶇疆',hide: false}
,{field: 'staEnd', align: 'center',title: '灏忚溅鏀捐揣浣嶇疆',hide: false}
- ,{field: 'type$', align: 'center',title: '绫诲瀷',hide: false}
+ ,{field: 'type$', align: 'center',title: '璐х墿绫诲瀷',hide: false}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',hide: false}
,{field: 'lineNumber', align: 'center',title: '琛屽彿',hide: true}
,{field: 'wrkType$', align: 'center',title: '宸ヤ綔绫诲瀷',hide: false}
diff --git a/src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js b/src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js
index 063cda8..c299ce4 100644
--- a/src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js
+++ b/src/main/webapp/static/js/wrkMastStaLog/wrkMastStaLog.js
@@ -21,23 +21,22 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'wrkStart', align: 'center',title: '宸ヤ綔妗ｅ紑濮嬩綅缃�'}
- ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�'}
- ,{field: 'staStart', align: 'center',title: '灏忚溅鎺ヨ揣浣嶇疆'}
- ,{field: 'staEnd', align: 'center',title: '灏忚溅鏀捐揣浣嶇疆'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'type', align: 'center',title: '绫诲瀷 0:婊＄増 1:绌烘澘'}
- ,{field: 'wrkSts', align: 'center',title: '宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�'}
- ,{field: 'lineNumber', align: 'center',title: '琛屽彿'}
- ,{field: 'wrkType', align: 'center',title: '宸ヤ綔绫诲瀷 绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�'}
- ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿'}
- ,{field: 'wrkCrn', align: 'center',title: ''}
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: 'ID',hide: true}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',hide: false}
+ ,{field: 'wrkStart', align: 'center',title: '宸ヤ綔妗ｅ紑濮嬩綅缃�',hide: false}
+ ,{field: 'wrkEnd', align: 'center',title: '宸ヤ綔妗ｇ粨鏉熶綅缃�',hide: false}
+ ,{field: 'staStart', align: 'center',title: '灏忚溅鎺ヨ揣浣嶇疆',hide: false}
+ ,{field: 'staEnd', align: 'center',title: '灏忚溅鏀捐揣浣嶇疆',hide: false}
+ ,{field: 'type$', align: 'center',title: '璐х墿绫诲瀷',hide: false}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',hide: false}
+ ,{field: 'lineNumber', align: 'center',title: '琛屽彿',hide: true}
+ ,{field: 'wrkType$', align: 'center',title: '宸ヤ綔绫诲瀷',hide: false}
+ ,{field: 'bignTime$', align: 'center',title: '鏍囪鏃堕棿',hide: false}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿',hide: false}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/wrkMastSta/wrkMastSta.html b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
index c42881a..f16dfe1 100644
--- a/src/main/webapp/views/wrkMastSta/wrkMastSta.html
+++ b/src/main/webapp/views/wrkMastSta/wrkMastSta.html
@@ -17,9 +17,50 @@
<div class="layui-card-body">
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
+ </div>
+ </div>
+ <!-- 璐х墿绫诲瀷 -->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="type" id="type" class="layui-input" type="text" placeholder="璐х墿绫诲瀷" autocomplete="off">
+ <option style="display: none"></option>
+ <option value="1">1.闈炵┖</option>
+ <option value="2">2.绌烘澘</option>
+ </select>
+ </div>
+ </div>
+ <!-- 宸ヤ綔鐘舵�� -->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="wrk_sts" id="wrk_sts" class="layui-input" type="text" placeholder="宸ヤ綔鐘舵��" autocomplete="off">
+ <option style="display: none"></option>
+ <option value="0">0.鍒濆</option>
+ <option value="1">1.绛夊緟灏忚溅鍙�</option>
+ <option value="2">2.绛夊緟灏忚溅鏀�</option>
+ <option value="3">3.瀹屾垚</option>
+ </select>
+ </div>
+ </div>
+ <!-- 宸ヤ綔绫诲瀷 -->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="wrk_type" id="wrk_type" class="layui-input" type="text" placeholder="宸ヤ綔绫诲瀷" autocomplete="off">
+ <option style="display: none"></option>
+ <option value="1">鍙犵洏</option>
+ <option value="2">鎷嗙洏</option>
+ <option value="3">鍙栨斁</option>
+ <!-- <option value="2">2.琛岃蛋</option>-->
+ <option value="5">婊″彇</option>
+ <option value="6">婊℃斁</option>
+ </select>
</div>
</div>
<div class="layui-inline" style="width: 300px">
@@ -120,9 +161,9 @@
<!-- <input class="layui-input" name="type" placeholder="璇疯緭鍏ョ被鍨� 1:闈炵┖ 2:绌烘澘" lay-vertype="tips" lay-verify="required">-->
<!-- </div>-->
<!-- </div>-->
- <!-- 绫诲瀷 -->
+ <!-- 璐х墿绫诲瀷 -->
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">绫诲瀷锛�</label>
+ <label class="layui-form-label layui-form-required">璐х墿绫诲瀷锛�</label>
<div class="layui-input-inline">
<select name="type">
<option value="1">1.闈炵┖</option>
@@ -130,7 +171,7 @@
</select>
</div>
</div>
- <!-- 绫诲瀷 -->
+ <!-- 宸ヤ綔鐘舵�� -->
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">宸ヤ綔鐘舵�侊細</label>
<div class="layui-input-inline">
@@ -142,7 +183,7 @@
</select>
</div>
</div>
- <!-- 绫诲瀷 -->
+ <!-- 宸ヤ綔绫诲瀷 -->
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">宸ヤ綔绫诲瀷</label>
<div class="layui-input-inline">
diff --git a/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html b/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
index 0ea08c6..e88ae18 100644
--- a/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
+++ b/src/main/webapp/views/wrkMastStaLog/wrkMastStaLog.html
@@ -17,9 +17,50 @@
<div class="layui-card-body">
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="wrk_no" placeholder="宸ヤ綔鍙�" autocomplete="off">
+ </div>
+ </div>
+ <!-- 璐х墿绫诲瀷 -->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="type" id="type" class="layui-input" type="text" placeholder="璐х墿绫诲瀷" autocomplete="off">
+ <option style="display: none"></option>
+ <option value="1">1.闈炵┖</option>
+ <option value="2">2.绌烘澘</option>
+ </select>
+ </div>
+ </div>
+ <!-- 宸ヤ綔鐘舵�� -->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="wrk_sts" id="wrk_sts" class="layui-input" type="text" placeholder="宸ヤ綔鐘舵��" autocomplete="off">
+ <option style="display: none"></option>
+ <option value="0">0.鍒濆</option>
+ <option value="1">1.绛夊緟灏忚溅鍙�</option>
+ <option value="2">2.绛夊緟灏忚溅鏀�</option>
+ <option value="3">3.瀹屾垚</option>
+ </select>
+ </div>
+ </div>
+ <!-- 宸ヤ綔绫诲瀷 -->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="wrk_type" id="wrk_type" class="layui-input" type="text" placeholder="宸ヤ綔绫诲瀷" autocomplete="off">
+ <option style="display: none"></option>
+ <option value="1">鍙犵洏</option>
+ <option value="2">鎷嗙洏</option>
+ <option value="3">鍙栨斁</option>
+ <!-- <option value="2">2.琛岃蛋</option>-->
+ <option value="5">婊″彇</option>
+ <option value="6">婊℃斁</option>
+ </select>
</div>
</div>
<div class="layui-inline" style="width: 300px">
@@ -49,15 +90,15 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
+<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>-->
</div>
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>-->
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1