wenjy
/
aucma-scada-management-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

已经完成

Browse Source 
修改完成
master
森屿海巷 4 years ago
parent 70df56ed99
commit a6c0b784b1
17 changed files with 76 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/basic/RecordErrorController.java
Unescape Escape View File

@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 异常记录Controller
*
* @author Frank zhou
* @date 2021-09-16
* @date 2021-09-18
*/
@Controller
@RequestMapping("/system/recorderror")

7
ruoyi-admin/src/main/resources/templates/system/basestoreinfo/basestoreinfo.html
Unescape Escape View File

@ -18,6 +18,13 @@
<label>仓库名称：</label>
<input type="text" name="storeName"/>
</li>
<li>
<label>仓库状态：</label>
<select name="storeStatus" th:with="type=${@dict.getType('warehouse_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</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-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

4
ruoyi-admin/src/main/resources/templates/system/recorderror/add.html
Unescape Escape View File

@ -46,7 +46,9 @@
<div class="form-group">
<label class="col-sm-3 control-label">库位区域：</label>
<div class="col-sm-8">
<input name="locationArea" class="form-control" type="text">
<select name="locationArea" class="form-control m-b" th:with="type=${@dict.getType('location_info')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">

4
ruoyi-admin/src/main/resources/templates/system/recorderror/edit.html
Unescape Escape View File

@ -47,7 +47,9 @@
<div class="form-group">
<label class="col-sm-3 control-label">库位区域：</label>
<div class="col-sm-8">
<input name="locationArea" th:field="*{locationArea}" class="form-control" type="text">
<select name="locationArea" class="form-control m-b" th:with="type=${@dict.getType('location_info')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{locationArea}"></option>
</select>
</div>
</div>
<div class="form-group">

49
ruoyi-admin/src/main/resources/templates/system/recorderror/recorderror.html
Unescape Escape View File

@ -18,56 +18,23 @@
<label>箱体编码：</label>
<input type="text" name="boxCode"/>
</li>
<!-- <li>
<label>门体/物料编码：</label>
<input type="text" name="materialCode"/>
</li>
<li>
<label>物料类型：</label>
<input type="text" name="materialType"/>
</li>
<li>
<label>仓库编码：</label>
<input type="text" name="storeCode"/>
</li>
<li>
<label>库位编码：</label>
<input type="text" name="locationCode"/>
</li>
<li>
<label>库位区域：</label>
<input type="text" name="locationArea"/>
</li>
<li>
<label>操作类型：</label>
<input type="text" name="operationType"/>
</li>-->
<li>
<label>任务类型：</label>
<input type="text" name="taskType"/>
<select name="locationArea" th:with="type=${@dict.getType('location_info')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<!-- <li>
<label>任务状态：</label>
<select name="taskStatus" th:with="type=${@dict.getType('task_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<!-- <li>
<label>返回标识：</label>
<input type="text" name="returnFlag"/>
</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>
<label>记录时间：</label>
<input type="text" class="time-input" placeholder="请选择记录时间" name="recordTime"/>
</li>-->
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -101,6 +68,7 @@
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('system:recorderror:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:recorderror:remove')}]];
var locationAreaDatas = [[${@dict.getType('location_info')}]];
var taskStatusDatas = [[${@dict.getType('task_status')}]];
var prefix = ctx + "system/recorderror";
@ -146,7 +114,10 @@
},
{
field: 'locationArea',
title: '库位区域'
title: '库位区域',
formatter: function(value, row, index) {
return $.table.selectDictLabel(locationAreaDatas, value);
}
},
{
field: 'operationType',

8
ruoyi-admin/src/main/resources/templates/system/recordinstore/add.html
Unescape Escape View File

@ -42,11 +42,9 @@
<div class="form-group">
<label class="col-sm-3 control-label">入库状态：</label>
<div class="col-sm-8">
<div class="radio-box">
<input type="radio" name="instoreStatus" value="">
<label th:for="instoreStatus" th:text="未知"></label>
</div>
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
<select name="operationType" class="form-control m-b" th:with="type=${@dict.getType('warehousing_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">

20
ruoyi-admin/src/main/resources/templates/system/recordinstore/recordinstore.html
Unescape Escape View File

@ -18,6 +18,20 @@
<label>物料类型：</label>
<input type="text" name="materialType"/>
</li>
<li>
<label>入库类型：</label>
<select name="operationType" th:with="type=${@dict.getType('warehousing_type')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>入库状态：</label>
<select name="instoreStatus" th:with="type=${@dict.getType('warehousing_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</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-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -51,6 +65,7 @@
var editFlag = [[${@permission.hasPermi('system:recordinstore:edit')}]];
var removeFlag = [[${@permission.hasPermi('system:recordinstore:remove')}]];
var operationTypeDatas = [[${@dict.getType('warehousing_type')}]];
var operationStstusDatas = [[${@dict.getType('warehousing_status')}]];
var prefix = ctx + "system/recordinstore";
$(function() {
@ -94,7 +109,10 @@
},
{
field: 'instoreStatus',
title: '入库状态'
title: '入库状态',
formatter: function(value, row, index) {
return $.table.selectDictLabel(operationStstusDatas, value);
}
},
{
field: 'beginTime',

14
ruoyi-admin/src/main/resources/templates/system/recordoutstore/recordoutstore.html
Unescape Escape View File

@ -18,6 +18,20 @@
<label>物料编码：</label>
<input type="text" name="materialCode"/>
</li>
<li>
<label>出库类型：</label>
<select name="operationType" th:with="type=${@dict.getType('issue_type')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>出库状态：</label>
<select name="outstoreStatus" th:with="type=${@dict.getType('outbound_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</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-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>

8
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordError.java
Unescape Escape View File

@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 异常记录对象 record_task
*
* @author Frank zhou
* @date 2021-09-16
* @date 2021-09-18
*/
public class RecordError extends BaseEntity
{
@ -65,17 +65,17 @@ public class RecordError extends BaseEntity
private String returnFlag;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date beginTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
/** 记录时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date recordTime;

2
ruoyi-system/src/main/java/com/ruoyi/system/domain/RecordInstore.java
Unescape Escape View File

@ -46,10 +46,12 @@ public class RecordInstore extends BaseEntity
/** 开始时间 */
@Excel(name = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String beginTime;
/** 结束时间 */
@Excel(name = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String endTime;
/** 记录时间 */

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/RecordErrorMapper.java
Unescape Escape View File

@ -7,7 +7,7 @@ import com.ruoyi.system.domain.RecordError;
* 异常记录Mapper接口
*
* @author Frank zhou
* @date 2021-09-16
* @date 2021-09-18
*/
public interface RecordErrorMapper
{

2
ruoyi-system/src/main/java/com/ruoyi/system/service/IRecordErrorService.java
Unescape Escape View File

@ -7,7 +7,7 @@ import com.ruoyi.system.domain.RecordError;
* 异常记录Service接口
*
* @author Frank zhou
* @date 2021-09-16
* @date 2021-09-18
*/
public interface IRecordErrorService
{

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordErrorServiceImpl.java
Unescape Escape View File

@ -12,7 +12,7 @@ import com.ruoyi.common.core.text.Convert;
* 异常记录Service业务层处理
*
* @author Frank zhou
* @date 2021-09-16
* @date 2021-09-18
*/
@Service
public class RecordErrorServiceImpl implements IRecordErrorService

1
ruoyi-system/src/main/resources/mapper/system/BaseStoreInfoMapper.xml
Unescape Escape View File

@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="storeCode != null and storeCode != ''"> and store_code like concat(concat('%', #{storeCode}), '%')</if>
<if test="storeName != null and storeName != ''"> and store_name like concat(concat('%', #{storeName}), '%')</if>
<if test="storeStatus != null"> and store_status = #{storeStatus} </if>
</where>
</select>

9
ruoyi-system/src/main/resources/mapper/system/RecordErrorMapper.xml
Unescape Escape View File

@ -31,18 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="taskCode != null and taskCode != ''"> and task_code like concat(concat('%', #{taskCode}), '%')</if>
<if test="boxCode != null and boxCode != ''"> and box_code like concat(concat('%', #{boxCode}), '%')</if>
<if test="materialCode != null and materialCode != ''"> and material_code = #{materialCode}</if>
<if test="materialType != null "> and material_type = #{materialType}</if>
<if test="storeCode != null and storeCode != ''"> and store_code = #{storeCode}</if>
<if test="locationCode != null and locationCode != ''"> and location_code = #{locationCode}</if>
<if test="locationArea != null and locationArea != ''"> and location_area = #{locationArea}</if>
<if test="operationType != null "> and operation_type = #{operationType}</if>
<if test="taskType != null "> and task_type = #{taskType}</if>
<if test="taskStatus != null "> and task_status = #{taskStatus}</if>
<if test="returnFlag != null and returnFlag != ''"> and return_flag = #{returnFlag}</if>
<if test="beginTime != null "> and begin_time = #{beginTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
<if test="recordTime != null "> and record_time = #{recordTime}</if>
</where>
</select>

3
ruoyi-system/src/main/resources/mapper/system/RecordInstoreMapper.xml
Unescape Escape View File

@ -26,6 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="materialCode != null and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
<if test="materialType != null and materialType != ''"> and material_type like concat(concat('%', #{materialType}), '%')</if>
<if test="operationType != null"> and operation_type =#{operationType} </if>
<if test="instoreStatus != null"> and instore_status =#{instoreStatus} </if>
</where>
</select>

3
ruoyi-system/src/main/resources/mapper/system/RecordOutstoreMapper.xml
Unescape Escape View File

@ -27,6 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="boxCode != null and boxCode != ''"> and box_code like concat(concat('%', #{boxCode}), '%')</if>
<if test="materialCode != null and materialCode != ''"> and material_code like concat(concat('%', #{materialCode}), '%')</if>
<if test="operationType != null"> and operation_type =#{operationType} </if>
<if test="outstoreStatus != null"> and outstore_status =#{outstoreStatus} </if>
</where>
</select>

Write Preview
Loading…
Cancel
Save