Limy
4 years ago
parent
2ccbcb42a7
commit
87b655ce8f
@ -0,0 +1,68 @@
|
||||
package com.ruoyi.web.controller.nanjing;
|
||||
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.nanjing.domain.ParaAllShow;
|
||||
import com.ruoyi.nanjing.domain.ProRpList;
|
||||
import com.ruoyi.nanjing.domain.TBdProductinfo;
|
||||
import com.ruoyi.nanjing.service.ITSyTracestateService;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Controller
|
||||
@RequestMapping("/nanjing/selectParaAll")
|
||||
public class SelectParaAllController extends BaseController {
|
||||
private String prefix = "nanjing/ParaAllShow";
|
||||
@Autowired
|
||||
private ITSyTracestateService tracestateService;
|
||||
|
||||
@RequiresPermissions("nanjing:ParaAllShow:view")
|
||||
@GetMapping()
|
||||
public String ProRpList(ModelMap map)
|
||||
{
|
||||
return prefix + "/ParaAllShow";
|
||||
}
|
||||
@RequiresPermissions("nanjing:ProRpList:list")
|
||||
@PostMapping("/paraAllShow")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(HttpServletRequest request)
|
||||
{
|
||||
String semiBarcode = request.getParameter("semiBarcode");
|
||||
Map map = new HashMap<String,Object>();
|
||||
map.put("beginTime",null);
|
||||
map.put("endTime",null);
|
||||
map.put("semiBarcode",semiBarcode);
|
||||
List<ProRpList> list = tracestateService.selectAllPara(map);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@RequiresPermissions("nanjing:ProRpList:export")
|
||||
@Log(title = "机种切换管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(ParaAllShow paraAllShow)
|
||||
{
|
||||
Map map = new HashMap<String,Object>();
|
||||
map.put("beginTime",null);
|
||||
map.put("endTime",null);
|
||||
map.put("semiBarcode",paraAllShow.getSemiBarcode());
|
||||
List<ProRpList> list = tracestateService.selectAllPara(map);
|
||||
ExcelUtil<ProRpList> util = new ExcelUtil<ProRpList>(ProRpList.class);
|
||||
return util.exportExcel(list, "ParaAllShow");
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,119 @@
|
||||
package com.ruoyi.web.controller.nanjing;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
import com.ruoyi.framework.util.ShiroUtils;
|
||||
import com.ruoyi.nanjing.domain.ProRpList;
|
||||
import com.ruoyi.nanjing.domain.TBdProductinfo;
|
||||
import com.ruoyi.nanjing.service.ITBdProductinfoService;
|
||||
import com.ruoyi.nanjing.service.ITBdProducttypeService;
|
||||
import com.ruoyi.nanjing.service.ITSyTracestateService;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.nanjing.domain.TRpProductchangeinfo;
|
||||
import com.ruoyi.nanjing.service.ITRpProductchangeinfoService;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
||||
/**
|
||||
* 时段统计
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-02-2
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/nanjing/selectProRpList")
|
||||
public class SelectProRpListController extends BaseController
|
||||
{
|
||||
private String prefix = "nanjing/ProRpList";
|
||||
|
||||
@Autowired
|
||||
private ITBdProductinfoService tBdProductinfoService;
|
||||
@Autowired
|
||||
private ITBdProducttypeService itBdProducttypeService;
|
||||
|
||||
@RequiresPermissions("nanjing:ProRpList:view")
|
||||
@GetMapping()
|
||||
public String ProRpList(ModelMap map)
|
||||
{
|
||||
List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo());
|
||||
map.addAttribute("list",tBdProductinfoList);
|
||||
return prefix + "/SelectProRpList";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询机种切换管理列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:ProRpList:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(ProRpList proRpList)
|
||||
{
|
||||
// startPage();
|
||||
Map map = new HashMap<String,Object>();
|
||||
map.put("beginTime",proRpList.getBeginTime());
|
||||
map.put("endTime",proRpList.getEndTime());
|
||||
map.put("productId",proRpList.getProductID());
|
||||
map.put("productType",proRpList.getProductType());
|
||||
map.put("state",proRpList.getState());
|
||||
map.put("semiBarcode",proRpList.getSemiBarcode());
|
||||
List<ProRpList> list = null;
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@PostMapping("/getData")
|
||||
@ResponseBody
|
||||
public TableDataInfo getData(ProRpList proRpList)
|
||||
{
|
||||
// startPage();
|
||||
List<ProRpList> list = new ArrayList<ProRpList>();
|
||||
if(proRpList.getBeginTime()==null||proRpList.getEndTime()==null)
|
||||
{
|
||||
return getDataTable(list);
|
||||
}
|
||||
Map map = new HashMap<String,Object>();
|
||||
map.put("beginTime",proRpList.getBeginTime());
|
||||
map.put("endTime",proRpList.getEndTime());
|
||||
map.put("productId",proRpList.getProductID());
|
||||
map.put("productType",proRpList.getProductType());
|
||||
map.put("state",proRpList.getState());
|
||||
map.put("semiBarcode",proRpList.getSemiBarcode());
|
||||
list = itBdProducttypeService.selectProLists(map);
|
||||
return getDataTable(list);
|
||||
}
|
||||
/**
|
||||
* 导出机种切换管理列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:ProRpList:export")
|
||||
@Log(title = "机种切换管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(ProRpList proRpList)
|
||||
{
|
||||
Map map = new HashMap<String,Object>();
|
||||
map.put("beginTime",proRpList.getBeginTime());
|
||||
map.put("endTime",proRpList.getEndTime());
|
||||
map.put("productId",proRpList.getProductID());
|
||||
map.put("productType",proRpList.getProductType());
|
||||
map.put("state",proRpList.getState());
|
||||
map.put("semiBarcode",proRpList.getSemiBarcode());
|
||||
List<ProRpList> list = itBdProducttypeService.selectProLists(map);
|
||||
ExcelUtil<ProRpList> util = new ExcelUtil<ProRpList>(ProRpList.class);
|
||||
return util.exportExcel(list, "ProRpList");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,145 @@
|
||||
<!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 class="required">产品码：</label>
|
||||
<input type="text" name="semiBarcode" id="semiBarcode" required/>
|
||||
</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>-->
|
||||
<a class="btn btn-info btn-rounded btn-sm" onclick="celexport()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table1"></table>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table2"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "nanjing/selectParaAll";
|
||||
$(function() {
|
||||
var formData = new FormData();
|
||||
formData.append("semiBarcode",$("#semiBarcode").val());
|
||||
$.ajax({
|
||||
type: "post",
|
||||
url: prefix + "/paraAllShow",
|
||||
data: formData,
|
||||
contentType: "application/json;charset=utf-8",
|
||||
dataType: "json",
|
||||
json: 'callback',
|
||||
processData: false,
|
||||
contentType: false,
|
||||
success: function (json) {
|
||||
var columnsArray2 = [];
|
||||
columnsArray2.push({field : "state", title : "产品码",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorName",title : "部件码",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorType",title : "工位代码",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorType",title : "记录时间",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorType",title : "参数名称",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorType",title : "实测值",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorType",title : "最小值",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorType",title : "最大值",colspan: 1,rowspan: 2});
|
||||
columnsArray2.push({field : "monitorType",title : "参数状态",colspan: 1,rowspan: 2});
|
||||
|
||||
var columnsArray1 = [];
|
||||
columnsArray1.push({field : "monitorType",title : "系统条码",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "产品码",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "机种类型",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "返修Y/N",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "合格状态",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "完成状态",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "当前工位",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "NG工位",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "标签Y/N",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "开始时间",colspan: 1,rowspan: 2});
|
||||
columnsArray1.push({field : "monitorType",title : "结束时间",colspan: 1,rowspan: 2});
|
||||
|
||||
$('#bootstrap-table1').bootstrapTable('destroy').bootstrapTable({
|
||||
id: "bootstrap-table1",
|
||||
data:json,
|
||||
toolbar: "#toolbar",
|
||||
singleSelect: false,
|
||||
clickToSelect: true,
|
||||
sortName: "recordTime",
|
||||
sortOrder: "desc",
|
||||
pageSize: 50,
|
||||
pageNumber: 1,
|
||||
pageList: "[10, 15,25, 50, 100, All]",
|
||||
showToggle: true,
|
||||
showRefresh: true,
|
||||
showColumns: true,
|
||||
search: false,
|
||||
pagination: true,
|
||||
showExport: false,//工具栏上显示导出按钮
|
||||
columns: columnsArray1
|
||||
});
|
||||
|
||||
$('#bootstrap-table2').bootstrapTable('destroy').bootstrapTable({
|
||||
id: "bootstrap-table2",
|
||||
data:json,
|
||||
toolbar: "#toolbar",
|
||||
singleSelect: false,
|
||||
clickToSelect: true,
|
||||
sortName: "recordTime",
|
||||
sortOrder: "desc",
|
||||
pageSize: 50,
|
||||
pageNumber: 1,
|
||||
pageList: "[10, 15,25, 50, All]",
|
||||
showToggle: true,
|
||||
showRefresh: true,
|
||||
showColumns: true,
|
||||
search: false,
|
||||
pagination: true,
|
||||
showExport: false,//工具栏上显示导出按钮
|
||||
columns: columnsArray2
|
||||
});
|
||||
},
|
||||
error: function () {
|
||||
alert("查询失败!");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function celexport(formId) {
|
||||
table.set();
|
||||
$.modal.confirm("确定导出所有" + table.options.modalName + "吗？", function() {
|
||||
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
|
||||
var params = $("#" + table.options.id).bootstrapTable('getOptions');
|
||||
var dataParam = $("#" + currentId).serializeArray();
|
||||
dataParam.push({ "name": "orderByColumn", "value": params.sortName });
|
||||
dataParam.push({ "name": "isAsc", "value": params.sortOrder });
|
||||
dataParam.push({"name":"semiBaarcode","value":$("#semiBarcode").val()});
|
||||
$.modal.loading("正在导出数据，请稍后...");
|
||||
$.post('nanjing/selectParaAll/export', dataParam, function(result) {
|
||||
if (result.code == web_status.SUCCESS) {
|
||||
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
|
||||
} else if (result.code == web_status.WARNING) {
|
||||
$.modal.alertWarning(result.msg)
|
||||
} else {
|
||||
$.modal.alertError(result.msg);
|
||||
}
|
||||
$.modal.closeLoading();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,119 @@
|
||||
<!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 class="select-time">
|
||||
<label class="is-required">时间区间： </label>
|
||||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime" required/>
|
||||
<span>-</span>
|
||||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime" required/>
|
||||
</li>
|
||||
<li>
|
||||
<label>机种信息：</label>
|
||||
<select name="productID">
|
||||
<option value="">所有</option>
|
||||
<option th:each="ls:${list}" th:value="${ls.productID}" th:text="${ls.productName}"></option>
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<label>状态：</label>
|
||||
<select name="state" th:with="type=${@dict.getType('proState')}">
|
||||
<option value="">全部</option>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<label>类型：</label>
|
||||
<select name="productType" th:with="type=${@dict.getType('productType')}">
|
||||
<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="semiBarcode"/>
|
||||
</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>
|
||||
<a class="btn btn-info btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:ProRpList:export"><i class="fa fa-download"></i> 导出</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-striped">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "nanjing/selectProRpList";
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/getData",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "ProRpList",
|
||||
pagination:false,
|
||||
pageSize:100,
|
||||
columns: [
|
||||
{
|
||||
field: 'barcode',
|
||||
title: '系统条码'
|
||||
},
|
||||
{
|
||||
field: 'productName',
|
||||
title: '机种名称'
|
||||
},
|
||||
{
|
||||
field: 'semiBarcode',
|
||||
title: '产品条码'
|
||||
},
|
||||
{
|
||||
field: 'state',
|
||||
title: '状态'
|
||||
},
|
||||
{
|
||||
field: 'currentStation',
|
||||
title: '当前工位'
|
||||
},
|
||||
{
|
||||
field: 'NGStation',
|
||||
title: 'NG工位'
|
||||
},
|
||||
{
|
||||
field: 'finishFlag',
|
||||
title: '完成标志'
|
||||
},
|
||||
{
|
||||
field: 'namePlateInfo',
|
||||
title: '标签Y/N'
|
||||
},
|
||||
{
|
||||
field: 'isDis',
|
||||
title: '返修Y/N'
|
||||
},
|
||||
{
|
||||
field: 'beginTime',
|
||||
title: '开始时间'
|
||||
},
|
||||
{
|
||||
field: 'endTime',
|
||||
title: '结束时间'
|
||||
},
|
||||
]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,230 @@
|
||||
package com.ruoyi.nanjing.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class ParaAllShow extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
// private ProParaInfo proParaInfo;
|
||||
// private ProRpList proRpList;
|
||||
|
||||
@Excel(name = "系统条码")
|
||||
private String barcode;
|
||||
@Excel(name = "机种名称")
|
||||
private String productName;
|
||||
@Excel(name = "产品条码")
|
||||
private String semiBarcode;
|
||||
@Excel(name = "状态")
|
||||
private String state;
|
||||
@Excel(name = "当前工位")
|
||||
private String currentStation;
|
||||
@Excel(name = "NG工位")
|
||||
private String NGStation;
|
||||
@Excel(name = "完成标志")
|
||||
private String finishFlag;
|
||||
@Excel(name = "标签Y/N")
|
||||
private String namePlateInfo;
|
||||
@Excel(name = "返修Y/N")
|
||||
private String isDis;
|
||||
@Excel(name = "开始时间" ,width = 30,dateFormat = "yyyy-MM-dd")
|
||||
private Date beginTime;
|
||||
@Excel(name = "结束时间",width = 30,dateFormat = "yyyy-MM-dd")
|
||||
private Date endTime;
|
||||
@Excel(name = "部件码")
|
||||
private String proBarcode;
|
||||
|
||||
// private String semiBarcode;
|
||||
@Excel(name = "部件码")
|
||||
private String stationCode;
|
||||
@Excel(name = "记录时间")
|
||||
private Date insertTime;
|
||||
@Excel(name = "参数名称")
|
||||
private String paraName;
|
||||
@Excel(name = "实测值")
|
||||
private String realVal;
|
||||
@Excel(name = "最小值")
|
||||
private String minVal;
|
||||
@Excel(name = "最大值")
|
||||
private String maxVal;
|
||||
@Excel(name = "参数状态")
|
||||
private String paraState;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ParaAllShow{" +
|
||||
"barcode='" + barcode + '\'' +
|
||||
", productName='" + productName + '\'' +
|
||||
", semiBarcode='" + semiBarcode + '\'' +
|
||||
", state='" + state + '\'' +
|
||||
", currentStation='" + currentStation + '\'' +
|
||||
", NGStation='" + NGStation + '\'' +
|
||||
", finishFlag='" + finishFlag + '\'' +
|
||||
", namePlateInfo='" + namePlateInfo + '\'' +
|
||||
", isDis='" + isDis + '\'' +
|
||||
", beginTime=" + beginTime +
|
||||
", endTime=" + endTime +
|
||||
", proBarcode='" + proBarcode + '\'' +
|
||||
", stationCode='" + stationCode + '\'' +
|
||||
", insertTime=" + insertTime +
|
||||
", paraName='" + paraName + '\'' +
|
||||
", realVal='" + realVal + '\'' +
|
||||
", minVal='" + minVal + '\'' +
|
||||
", maxVal='" + maxVal + '\'' +
|
||||
", paraState='" + paraState + '\'' +
|
||||
'}';
|
||||
}
|
||||
|
||||
public String getBarcode() {
|
||||
return barcode;
|
||||
}
|
||||
|
||||
public void setBarcode(String barcode) {
|
||||
this.barcode = barcode;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public String getSemiBarcode() {
|
||||
return semiBarcode;
|
||||
}
|
||||
|
||||
public void setSemiBarcode(String semiBarcode) {
|
||||
this.semiBarcode = semiBarcode;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public String getCurrentStation() {
|
||||
return currentStation;
|
||||
}
|
||||
|
||||
public void setCurrentStation(String currentStation) {
|
||||
this.currentStation = currentStation;
|
||||
}
|
||||
|
||||
public String getNGStation() {
|
||||
return NGStation;
|
||||
}
|
||||
|
||||
public void setNGStation(String NGStation) {
|
||||
this.NGStation = NGStation;
|
||||
}
|
||||
|
||||
public String getFinishFlag() {
|
||||
return finishFlag;
|
||||
}
|
||||
|
||||
public void setFinishFlag(String finishFlag) {
|
||||
this.finishFlag = finishFlag;
|
||||
}
|
||||
|
||||
public String getNamePlateInfo() {
|
||||
return namePlateInfo;
|
||||
}
|
||||
|
||||
public void setNamePlateInfo(String namePlateInfo) {
|
||||
this.namePlateInfo = namePlateInfo;
|
||||
}
|
||||
|
||||
public String getIsDis() {
|
||||
return isDis;
|
||||
}
|
||||
|
||||
public void setIsDis(String isDis) {
|
||||
this.isDis = isDis;
|
||||
}
|
||||
|
||||
public Date getBeginTime() {
|
||||
return beginTime;
|
||||
}
|
||||
|
||||
public void setBeginTime(Date beginTime) {
|
||||
this.beginTime = beginTime;
|
||||
}
|
||||
|
||||
public Date getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(Date endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public String getProBarcode() {
|
||||
return proBarcode;
|
||||
}
|
||||
|
||||
public void setProBarcode(String proBarcode) {
|
||||
this.proBarcode = proBarcode;
|
||||
}
|
||||
|
||||
public String getStationCode() {
|
||||
return stationCode;
|
||||
}
|
||||
|
||||
public void setStationCode(String stationCode) {
|
||||
this.stationCode = stationCode;
|
||||
}
|
||||
|
||||
public Date getInsertTime() {
|
||||
return insertTime;
|
||||
}
|
||||
|
||||
public void setInsertTime(Date insertTime) {
|
||||
this.insertTime = insertTime;
|
||||
}
|
||||
|
||||
public String getParaName() {
|
||||
return paraName;
|
||||
}
|
||||
|
||||
public void setParaName(String paraName) {
|
||||
this.paraName = paraName;
|
||||
}
|
||||
|
||||
public String getRealVal() {
|
||||
return realVal;
|
||||
}
|
||||
|
||||
public void setRealVal(String realVal) {
|
||||
this.realVal = realVal;
|
||||
}
|
||||
|
||||
public String getMinVal() {
|
||||
return minVal;
|
||||
}
|
||||
|
||||
public void setMinVal(String minVal) {
|
||||
this.minVal = minVal;
|
||||
}
|
||||
|
||||
public String getMaxVal() {
|
||||
return maxVal;
|
||||
}
|
||||
|
||||
public void setMaxVal(String maxVal) {
|
||||
this.maxVal = maxVal;
|
||||
}
|
||||
|
||||
public String getParaState() {
|
||||
return paraState;
|
||||
}
|
||||
|
||||
public void setParaState(String paraState) {
|
||||
this.paraState = paraState;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,114 @@
|
||||
package com.ruoyi.nanjing.domain;
|
||||
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class ProParaInfo extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private String proBarcode;
|
||||
|
||||
private String semiBarcode;
|
||||
|
||||
private String stationCode;
|
||||
|
||||
private Date insertTime;
|
||||
|
||||
private String paraName;
|
||||
|
||||
private String realVal;
|
||||
|
||||
private String minVal;
|
||||
|
||||
private String maxVal;
|
||||
|
||||
private String paraState;
|
||||
|
||||
public String getProBarcode() {
|
||||
return proBarcode;
|
||||
}
|
||||
|
||||
public void setProBarcode(String proBarcode) {
|
||||
this.proBarcode = proBarcode;
|
||||
}
|
||||
|
||||
public String getSemiBarcode() {
|
||||
return semiBarcode;
|
||||
}
|
||||
|
||||
public void setSemiBarcode(String semiBarcode) {
|
||||
this.semiBarcode = semiBarcode;
|
||||
}
|
||||
|
||||
public String getStationCode() {
|
||||
return stationCode;
|
||||
}
|
||||
|
||||
public void setStationCode(String stationCode) {
|
||||
this.stationCode = stationCode;
|
||||
}
|
||||
|
||||
public Date getInsertTime() {
|
||||
return insertTime;
|
||||
}
|
||||
|
||||
public void setInsertTime(Date insertTime) {
|
||||
this.insertTime = insertTime;
|
||||
}
|
||||
|
||||
public String getParaName() {
|
||||
return paraName;
|
||||
}
|
||||
|
||||
public void setParaName(String paraName) {
|
||||
this.paraName = paraName;
|
||||
}
|
||||
|
||||
public String getRealVal() {
|
||||
return realVal;
|
||||
}
|
||||
|
||||
public void setRealVal(String realVal) {
|
||||
this.realVal = realVal;
|
||||
}
|
||||
|
||||
public String getMinVal() {
|
||||
return minVal;
|
||||
}
|
||||
|
||||
public void setMinVal(String minVal) {
|
||||
this.minVal = minVal;
|
||||
}
|
||||
|
||||
public String getMaxVal() {
|
||||
return maxVal;
|
||||
}
|
||||
|
||||
public void setMaxVal(String maxVal) {
|
||||
this.maxVal = maxVal;
|
||||
}
|
||||
|
||||
public String getParaState() {
|
||||
return paraState;
|
||||
}
|
||||
|
||||
public void setParaState(String paraState) {
|
||||
this.paraState = paraState;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ProParaInfo{" +
|
||||
"proBarcode='" + proBarcode + '\'' +
|
||||
", semiBarcode='" + semiBarcode + '\'' +
|
||||
", stationCode='" + stationCode + '\'' +
|
||||
", insertTime=" + insertTime +
|
||||
", paraName='" + paraName + '\'' +
|
||||
", realVal='" + realVal + '\'' +
|
||||
", minVal='" + minVal + '\'' +
|
||||
", maxVal='" + maxVal + '\'' +
|
||||
", paraState='" + paraState + '\'' +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,160 @@
|
||||
package com.ruoyi.nanjing.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.util.Date;
|
||||
/**
|
||||
* 时段统计实体
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public class ProRpList extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
@Excel(name = "系统条码")
|
||||
private String barcode;
|
||||
@Excel(name = "机种名称")
|
||||
private String productName;
|
||||
@Excel(name = "产品条码")
|
||||
private String semiBarcode;
|
||||
@Excel(name = "状态")
|
||||
private String state;
|
||||
@Excel(name = "当前工位")
|
||||
private String currentStation;
|
||||
@Excel(name = "NG工位")
|
||||
private String NGStation;
|
||||
@Excel(name = "完成标志")
|
||||
private String finishFlag;
|
||||
@Excel(name = "标签Y/N")
|
||||
private String namePlateInfo;
|
||||
@Excel(name = "返修Y/N")
|
||||
private String isDis;
|
||||
@Excel(name = "开始时间" ,width = 30,dateFormat = "yyyy-MM-dd")
|
||||
private Date beginTime;
|
||||
@Excel(name = "结束时间",width = 30,dateFormat = "yyyy-MM-dd")
|
||||
private Date endTime;
|
||||
private String productID;
|
||||
private String productType;
|
||||
public String getProductID() {
|
||||
return productID;
|
||||
}
|
||||
|
||||
public void setProductID(String productID) {
|
||||
this.productID = productID;
|
||||
}
|
||||
|
||||
public String getProductType() {
|
||||
return productType;
|
||||
}
|
||||
|
||||
public void setProductType(String productType) {
|
||||
this.productType = productType;
|
||||
}
|
||||
|
||||
public String getBarcode() {
|
||||
return barcode;
|
||||
}
|
||||
|
||||
public void setBarcode(String barcode) {
|
||||
this.barcode = barcode;
|
||||
}
|
||||
|
||||
public String getProductName() {
|
||||
return productName;
|
||||
}
|
||||
|
||||
public void setProductName(String productName) {
|
||||
this.productName = productName;
|
||||
}
|
||||
|
||||
public String getSemiBarcode() {
|
||||
return semiBarcode;
|
||||
}
|
||||
|
||||
public void setSemiBarcode(String semiBarcode) {
|
||||
this.semiBarcode = semiBarcode;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public String getCurrentStation() {
|
||||
return currentStation;
|
||||
}
|
||||
|
||||
public void setCurrentStation(String currentStation) {
|
||||
this.currentStation = currentStation;
|
||||
}
|
||||
|
||||
public String getNGStation() {
|
||||
return NGStation;
|
||||
}
|
||||
|
||||
public void setNGStation(String NGStation) {
|
||||
this.NGStation = NGStation;
|
||||
}
|
||||
|
||||
public String getFinishFlag() {
|
||||
return finishFlag;
|
||||
}
|
||||
|
||||
public void setFinishFlag(String finishFlag) {
|
||||
this.finishFlag = finishFlag;
|
||||
}
|
||||
|
||||
public String getNamePlateInfo() {
|
||||
return namePlateInfo;
|
||||
}
|
||||
|
||||
public void setNamePlateInfo(String namePlateInfo) {
|
||||
this.namePlateInfo = namePlateInfo;
|
||||
}
|
||||
|
||||
public String getIsDis() {
|
||||
return isDis;
|
||||
}
|
||||
|
||||
public void setIsDis(String isDis) {
|
||||
this.isDis = isDis;
|
||||
}
|
||||
|
||||
public Date getBeginTime() {
|
||||
return beginTime;
|
||||
}
|
||||
|
||||
public void setBeginTime(Date beginTime) {
|
||||
this.beginTime = beginTime;
|
||||
}
|
||||
|
||||
public Date getEndTime() {
|
||||
return endTime;
|
||||
}
|
||||
|
||||
public void setEndTime(Date endTime) {
|
||||
this.endTime = endTime;
|
||||
}
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("barcode", getBarcode())
|
||||
.append("productName", getProductName())
|
||||
.append("semiBarcode", getSemiBarcode())
|
||||
.append("state", getState())
|
||||
.append("currentStation", getCurrentStation())
|
||||
.append("NGStation", getNGStation())
|
||||
.append("finishFlag", getFinishFlag())
|
||||
.append("namePlateInfo", getNamePlateInfo())
|
||||
.append("isDis", getIsDis())
|
||||
.append("beginTime", getBeginTime())
|
||||
.append("endTime", getEndTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue