wenjy
/
Web.RFIDMaterialTrackingSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 上料记录、下料记录修改

Browse Source
master
wenjy 2 years ago
parent 6ab2b1e4d5
commit 29c619d67e
5 changed files with 261 additions and 135 deletions
Show Stats Download Patch File Download Diff File

10
ruoyi-admin/src/main/resources/application-druid.yml
Unescape Escape View File

@ -5,14 +5,14 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
druid: druid:
# 主库数据源 # 主库数据源
# master:
# url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: root
master: master:
url: jdbc:mysql://172.21.29.56:6066/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: root password: root
# master:
# url: jdbc:mysql://172.21.29.56:6066/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: root
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

3
ruoyi-traceability/src/main/resources/mapper/traceability/ProDownrecordMapper.xml
Unescape Escape View File

@ -34,8 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="downMaterialId != null and downMaterialId != ''"> and downMaterialId = #{downMaterialId}</if> <if test="downMaterialId != null and downMaterialId != ''"> and downMaterialId = #{downMaterialId}</if>
<if test="isProduction != null "> and is_production = #{isProduction}</if> <if test="isProduction != null "> and is_production = #{isProduction}</if>
<if test="isFinish != null "> and is_Finish = #{isFinish}</if> <if test="isFinish != null "> and is_Finish = #{isFinish}</if>
<if test="beginTime != null and beginTime != ''"> and begin_Time &gt;= #{beginTime}</if> <if test="params.beginReadTime != null and params.beginReadTime != '' and params.endReadTime != null and params.endReadTime != ''"> and begin_Time between #{params.beginReadTime} and #{params.endReadTime}</if>
<if test="endTime != null and endTime != ''"> and end_Time &lt;= #{endTime}</if>
</where> </where>
</select> </select>

3
ruoyi-traceability/src/main/resources/mapper/traceability/ProUprecordMapper.xml
Unescape Escape View File

@ -33,8 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="eaValue != null "> and eaValue = #{eaValue}</if> <if test="eaValue != null "> and eaValue = #{eaValue}</if>
<if test="isProduction != null "> and is_production = #{isProduction}</if> <if test="isProduction != null "> and is_production = #{isProduction}</if>
<if test="isFinish != null "> and is_Finish = #{isFinish}</if> <if test="isFinish != null "> and is_Finish = #{isFinish}</if>
<if test="beginTime != null and beginTime != ''"> and begin_Time &gt;= #{beginTime}</if> <if test="params.beginReadTime != null and params.beginReadTime != '' and params.endReadTime != null and params.endReadTime != ''"> and begin_Time between #{params.beginReadTime} and #{params.endReadTime}</if>
<if test="endTime != null and endTime != ''"> and end_Time &lt;= #{endTime}</if>
</where> </where>
</select> </select>

120
ruoyi-traceability/src/main/resources/templates/traceability/downRecord/downRecord.html
Unescape Escape View File

@ -2,22 +2,37 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('下料记录列表')" /> <th:block th:include="include :: header('下料记录列表')" />
<th:block th:include="include :: layout-latest-css" />
<th:block th:include="include :: ztree-css" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="ui-layout-west">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-grid"></i> 设备信息
</div>
<div class="box-tools pull-right">
<a type="button" class="btn btn-box-tool" href="#" onclick="deviceInfo()" title="设备信息"><i class="fa fa-edit"></i></a>
<button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i class="fa fa-chevron-up"></i></button>
<button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i class="fa fa-chevron-down"></i></button>
<button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新"><i class="fa fa-refresh"></i></button>
</div>
</div>
<div class="ui-layout-content">
<div id="tree" class="ztree"></div>
</div>
</div>
</div>
<div class="ui-layout-center">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<input id="resource" type="text" name="resource" hidden="true"/>
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li>
<label>资源编号：</label>
<input type="text" name="resource"/>
</li>
<li>
<label>位置编号：</label>
<input type="text" name="positionId"/>
</li>
<li> <li>
<label>rfid条码：</label> <label>rfid条码：</label>
<input type="text" name="rfidStr"/> <input type="text" name="rfidStr"/>
@ -26,10 +41,6 @@
<label>SFC编码：</label> <label>SFC编码：</label>
<input type="text" name="sfcStr"/> <input type="text" name="sfcStr"/>
</li> </li>
<li>
<label>涂布膜卷：</label>
<input type="text" name="downMaterialId"/>
</li>
<li> <li>
<label>是否生产：</label> <label>是否生产：</label>
<select name="isProduction" th:with="type=${@dict.getType('is_flag')}"> <select name="isProduction" th:with="type=${@dict.getType('is_flag')}">
@ -37,20 +48,11 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li class="select-time">
<label>是否完工：</label> <label>日 期 ：</label>
<select name="isFinish" th:with="type=${@dict.getType('is_flag')}"> <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="params[beginReadTime]"/>
<option value="">所有</option> <span>-</span>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endReadTime]"/>
</select>
</li>
<li>
<label>开始时间：</label>
<input type="text" class="time-input" placeholder="请选择开始时间" name="beginTime"/>
</li>
<li>
<label>结束时间：</label>
<input type="text" class="time-input" placeholder="请选择结束时间" name="endTime"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -80,7 +82,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: layout-latest-js" />
<th:block th:include="include :: ztree-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('traceability:downRecord:edit')}]]; var editFlag = [[${@permission.hasPermi('traceability:downRecord:edit')}]];
var removeFlag = [[${@permission.hasPermi('traceability:downRecord:remove')}]]; var removeFlag = [[${@permission.hasPermi('traceability:downRecord:remove')}]];
@ -89,6 +94,24 @@
var prefix = ctx + "traceability/downRecord"; var prefix = ctx + "traceability/downRecord";
$(function() { $(function() {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({ initClosed: panehHidden, west__size: 185 });
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win:$('.ui-layout-center'),
doc:$('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryReadList();
queryResourceTree();
});
function queryReadList() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
@ -106,7 +129,8 @@
}, },
{ {
field: 'machineId', field: 'machineId',
title: '设备编号' title: '设备编号',
visible: false
}, },
{ {
field: 'resource', field: 'resource',
@ -145,7 +169,8 @@
visible: false, visible: false,
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(isFinishDatas, value); return $.table.selectDictLabel(isFinishDatas, value);
} },
visible: false
}, },
{ {
field: 'recordTime', field: 'recordTime',
@ -171,7 +196,46 @@
}] }]
}; };
$.table.init(options); $.table.init(options);
}
function queryResourceTree()
{
var url = ctx + "traceability/deviceinfo/treeData";
var options = {
url: url,
expandLevel: 2,
onClick : zOnClick
};
$.tree.init(options);
function zOnClick(event, treeId, treeNode) {
$("#resource").val(treeNode.remark);
$.table.search();
}
}
$('#btnExpand').click(function() {
$._tree.expandAll(true);
$(this).hide();
$('#btnCollapse').show();
});
$('#btnCollapse').click(function() {
$._tree.expandAll(false);
$(this).hide();
$('#btnExpand').show();
}); });
$('#btnRefresh').click(function() {
queryReadList();
});
/* 设备信息 */
function deviceInfo() {
var url = ctx + "traceability/deviceinfo";
$.modal.openTab("设备信息", url);
}
</script> </script>
</body> </body>
</html> </html>

120
ruoyi-traceability/src/main/resources/templates/traceability/upRecord/upRecord.html
Unescape Escape View File

@ -2,22 +2,37 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('上料记录列表')" /> <th:block th:include="include :: header('上料记录列表')" />
<th:block th:include="include :: layout-latest-css" />
<th:block th:include="include :: ztree-css" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="ui-layout-west">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-grid"></i> 设备信息
</div>
<div class="box-tools pull-right">
<a type="button" class="btn btn-box-tool" href="#" onclick="deviceInfo()" title="设备信息"><i class="fa fa-edit"></i></a>
<button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i class="fa fa-chevron-up"></i></button>
<button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i class="fa fa-chevron-down"></i></button>
<button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新"><i class="fa fa-refresh"></i></button>
</div>
</div>
<div class="ui-layout-content">
<div id="tree" class="ztree"></div>
</div>
</div>
</div>
<div class="ui-layout-center">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<input id="resource" type="text" name="resource" hidden="true"/>
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li>
<label>资源编号：</label>
<input type="text" name="resource"/>
</li>
<li>
<label>位置编号：</label>
<input type="text" name="positionId"/>
</li>
<li> <li>
<label>rfid条码：</label> <label>rfid条码：</label>
<input type="text" name="rfidStr"/> <input type="text" name="rfidStr"/>
@ -26,10 +41,6 @@
<label>SFC编码：</label> <label>SFC编码：</label>
<input type="text" name="sfcStr"/> <input type="text" name="sfcStr"/>
</li> </li>
<li>
<label>EA数量：</label>
<input type="text" name="eaValue"/>
</li>
<li> <li>
<label>是否生产：</label> <label>是否生产：</label>
<select name="isProduction" th:with="type=${@dict.getType('is_flag')}"> <select name="isProduction" th:with="type=${@dict.getType('is_flag')}">
@ -37,20 +48,11 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <li class="select-time">
<label>是否完工：</label> <label>日 期 ：</label>
<select name="isFinish" th:with="type=${@dict.getType('is_flag')}"> <input type="text" class="time-input" id="beginTime" placeholder="开始时间" name="params[beginReadTime]"/>
<option value="">所有</option> <span>-</span>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endReadTime]"/>
</select>
</li>
<li>
<label>开始时间：</label>
<input type="text" class="time-input" placeholder="请选择开始时间" name="beginTime"/>
</li>
<li>
<label>结束时间：</label>
<input type="text" class="time-input" placeholder="请选择结束时间" name="endTime"/>
</li> </li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -80,7 +82,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: layout-latest-js" />
<th:block th:include="include :: ztree-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('traceability:upRecord:edit')}]]; var editFlag = [[${@permission.hasPermi('traceability:upRecord:edit')}]];
var removeFlag = [[${@permission.hasPermi('traceability:upRecord:remove')}]]; var removeFlag = [[${@permission.hasPermi('traceability:upRecord:remove')}]];
@ -89,6 +94,24 @@
var prefix = ctx + "traceability/upRecord"; var prefix = ctx + "traceability/upRecord";
$(function() { $(function() {
var panehHidden = false;
if ($(this).width() < 769) {
panehHidden = true;
}
$('body').layout({ initClosed: panehHidden, west__size: 185 });
// 回到顶部绑定
if ($.fn.toTop !== undefined) {
var opt = {
win:$('.ui-layout-center'),
doc:$('.ui-layout-center')
};
$('#scroll-up').toTop(opt);
}
queryReadList();
queryResourceTree();
});
function queryReadList() {
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
@ -106,7 +129,8 @@
}, },
{ {
field: 'machineId', field: 'machineId',
title: '设备编号' title: '设备编号',
visible: false
}, },
{ {
field: 'resource', field: 'resource',
@ -140,7 +164,8 @@
title: '是否完工', title: '是否完工',
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.selectDictLabel(isFinishDatas, value); return $.table.selectDictLabel(isFinishDatas, value);
} },
visible: false
}, },
{ {
field: 'recordTime', field: 'recordTime',
@ -166,7 +191,46 @@
}] }]
}; };
$.table.init(options); $.table.init(options);
}
function queryResourceTree()
{
var url = ctx + "traceability/deviceinfo/treeData";
var options = {
url: url,
expandLevel: 2,
onClick : zOnClick
};
$.tree.init(options);
function zOnClick(event, treeId, treeNode) {
$("#resource").val(treeNode.remark);
$.table.search();
}
}
$('#btnExpand').click(function() {
$._tree.expandAll(true);
$(this).hide();
$('#btnCollapse').show();
});
$('#btnCollapse').click(function() {
$._tree.expandAll(false);
$(this).hide();
$('#btnExpand').show();
}); });
$('#btnRefresh').click(function() {
queryReadList();
});
/* 设备信息 */
function deviceInfo() {
var url = ctx + "traceability/deviceinfo";
$.modal.openTab("设备信息", url);
}
</script> </script>
</body> </body>
</html> </html>
Write Preview
Loading…
Cancel
Save