Merge remote-tracking branch 'origin/master'
夜笙歌
2 months ago
commit
47c734957e
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
@ -0,0 +1,38 @@
|
||||
package com.ruoyi.api.service.impl;
|
||||
|
||||
import com.ruoyi.api.domain.CheckTaskInfo;
|
||||
import com.ruoyi.api.mapper.ApiMapper;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.manage.domain.RecordInspection;
|
||||
import com.ruoyi.manage.mapper.RecordInspectionMapper;
|
||||
import com.ruoyi.manage.service.IRecordInspectionService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
@Component("TaskService")
|
||||
public class TaskService {
|
||||
|
||||
@Autowired
|
||||
private ApiMapper mapper;
|
||||
@Autowired
|
||||
private RecordInspectionMapper recordInspectionMapper;
|
||||
|
||||
//定时任务创建巡检单
|
||||
public void inspectionCreate(){
|
||||
System.out.println("创建成功");
|
||||
int number=recordInspectionMapper.countInsertRecordNumber();
|
||||
number++;
|
||||
RecordInspection recordInspection = new RecordInspection();
|
||||
recordInspection.setInspectionCode(DateUtils.parseDateToStr("yyyyMMdd",new Date())+"00"+number);
|
||||
System.out.println();
|
||||
//插入主表
|
||||
int insertNumber = recordInspectionMapper.insertRecordInspection(recordInspection);
|
||||
List<CheckTaskInfo> list = mapper.selectLocationFromLedger();
|
||||
mapper.insertCheckTask(Math.toIntExact(recordInspection.getInspectionId()), list);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
package com.ruoyi.manage.domain;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 轮挡入库记录对象 record_in
|
||||
*
|
||||
* @author wangh
|
||||
* @date 2024-01-17
|
||||
*/
|
||||
public class RecordInSort extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long objid;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "入库时间" , width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date createTime;
|
||||
/** 批次码 */
|
||||
@Excel(name = "批次码")
|
||||
private String batchCode;
|
||||
/** 数量 */
|
||||
@Excel(name = "数量")
|
||||
public int recordCount;
|
||||
|
||||
@Override
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
public void setObjid(Long objid)
|
||||
{
|
||||
this.objid = objid;
|
||||
}
|
||||
|
||||
public Long getObjid()
|
||||
{
|
||||
return objid;
|
||||
}
|
||||
|
||||
public void setBatchCode(String batchCode)
|
||||
{
|
||||
this.batchCode = batchCode;
|
||||
}
|
||||
|
||||
public String getBatchCode()
|
||||
{
|
||||
return batchCode;
|
||||
}
|
||||
|
||||
public int getRecordCount() {
|
||||
return recordCount;
|
||||
}
|
||||
|
||||
public void setRecordCount(int recordCount) {
|
||||
this.recordCount = recordCount;
|
||||
}
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
// .append("recordCount", getRecordCount())
|
||||
.append("batchCode", getBatchCode())
|
||||
// .append("remark", getRemark())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.toString();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package com.ruoyi.manage.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 轮挡出库记录对象 record_out
|
||||
*
|
||||
* @author wangh
|
||||
* @date 2024-01-18
|
||||
*/
|
||||
public class RecordOutSort extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 机位码 */
|
||||
@Excel(name = "机位码")
|
||||
private String locationCode;
|
||||
|
||||
/** 数量 */
|
||||
@Excel(name = "数量")
|
||||
public int recordCount;
|
||||
|
||||
public void setLocationCode(String locationCode)
|
||||
{
|
||||
this.locationCode = locationCode;
|
||||
}
|
||||
|
||||
public String getLocationCode()
|
||||
{
|
||||
return locationCode;
|
||||
}
|
||||
|
||||
public int getRecordCount() {
|
||||
return recordCount;
|
||||
}
|
||||
|
||||
public void setRecordCount(int recordCount) {
|
||||
this.recordCount = recordCount;
|
||||
}
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("locationCode", getLocationCode())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,143 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||
<head>
|
||||
<th:block th:include="include :: header('巡检历史图片列表')" />
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
<div class="container-div">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 search-collapse">
|
||||
<form id="formId">
|
||||
<div class="select-list">
|
||||
<ul>
|
||||
|
||||
<li>
|
||||
<label>机位码：</label>
|
||||
<input type="text" name="locationCode"/>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="btn-group-sm" id="toolbar" role="group">
|
||||
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="manage:record_inspection_img:add">-->
|
||||
<!-- <i class="fa fa-plus"></i> 添加-->
|
||||
<!-- </a>-->
|
||||
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="manage:record_inspection_img:edit">-->
|
||||
<!-- <i class="fa fa-edit"></i> 修改-->
|
||||
<!-- </a>-->
|
||||
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="manage:record_inspection_img:remove">-->
|
||||
<!-- <i class="fa fa-remove"></i> 删除-->
|
||||
<!-- </a>-->
|
||||
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="manage:record_inspection_img:export">-->
|
||||
<!-- <i class="fa fa-download"></i> 导出-->
|
||||
<!-- </a>-->
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<!-- <table id="bootstrap-table"></table>-->
|
||||
<table id="bootstrap-table" data-page-size="10"
|
||||
data-show-custom-view="true" data-custom-view="customViewFormatter"
|
||||
data-show-custom-view-button="true"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<template id="profileTemplate">
|
||||
<div class="col-sm-2">
|
||||
<div class="contact-box">
|
||||
<a onclick="$.modal.openTab('图片详情','manage/record_inspection_img/img/%locationCode%')">
|
||||
<div class="col-sm-12" >
|
||||
<div class="text-center">
|
||||
<img alt="image" class=" m-t-xs img-responsive col-sm-12" src="/img/folder.png"
|
||||
style="padding: 20%"/>
|
||||
<div class="m-t-xs font-bold">%locationCode%</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="col-sm-8">
|
||||
<h3><strong>%userCode%</strong></h3>
|
||||
<p><i class="fa fa-jpy"></i> %userBalance%</p>
|
||||
<address>
|
||||
<strong>RuoYi, Inc.</strong><br>
|
||||
E-mail: %userEmail%<br>
|
||||
<abbr title="Phone">Tel:</abbr> %userPhone%
|
||||
</address>
|
||||
</div>-->
|
||||
<div class="clearfix"></div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<th:block th:include="include :: footer" />
|
||||
<th:block th:include="include :: bootstrap-table-custom-view-js"/>
|
||||
<script th:inline="javascript">
|
||||
var editFlag = [[${@permission.hasPermi('manage:record_inspection_img:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('manage:record_inspection_img:remove')}]];
|
||||
var prefix = ctx + "manage/record_inspection_img";
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/locationList",
|
||||
createUrl: prefix + "/add",
|
||||
updateUrl: prefix + "/edit/{id}",
|
||||
removeUrl: prefix + "/remove",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "巡检历史图片",
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
// {
|
||||
// field: 'inspectionId',
|
||||
// title: '巡检id'
|
||||
// },
|
||||
// {
|
||||
// field: 'taskId',
|
||||
// title: '任务表id'
|
||||
// },
|
||||
{
|
||||
field: 'locationCode',
|
||||
title: '机位码'
|
||||
},
|
||||
/* {
|
||||
field: 'imgPath',
|
||||
title: '路径'
|
||||
},
|
||||
{
|
||||
field: 'createBy',
|
||||
title: '上传人'
|
||||
},
|
||||
{
|
||||
field: 'createTime',
|
||||
title: '上传时间'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
align: 'center',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.inspectionId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.inspectionId + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
}
|
||||
}*/]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
function customViewFormatter(data) {
|
||||
var template = $('#profileTemplate').html()
|
||||
var view = ''
|
||||
$.each(data, function (i, row) {
|
||||
view += template.replace('%locationCode%', row.locationCode)
|
||||
.replace("%locationCode%", row.locationCode);
|
||||
|
||||
})
|
||||
|
||||
return `<div class="row mx-0">${view}</div>`
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue