Limy
4 years ago
parent
93a8760564
commit
19ab861cd5
@ -0,0 +1,83 @@
|
||||
package com.ruoyi.web.controller.nanjing;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
import com.ruoyi.framework.util.ShiroUtils;
|
||||
import com.ruoyi.nanjing.domain.TBdProductinfo;
|
||||
import com.ruoyi.nanjing.service.ITBdProductinfoService;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 机种切换管理Controller
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-22
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/nanjing/SelectProductChangeInfo")
|
||||
public class SelectProductChangeInfoController extends BaseController
|
||||
{
|
||||
private String prefix = "nanjing/ProductChangeInfo";
|
||||
|
||||
@Autowired
|
||||
private ITBdProductinfoService tBdProductinfoService;
|
||||
@Autowired
|
||||
private ITRpProductchangeinfoService tRpProductchangeinfoService;
|
||||
|
||||
@RequiresPermissions("nanjing:SelectProductChangeInfo:view")
|
||||
@GetMapping()
|
||||
public String ProductChangeInfo(ModelMap map)
|
||||
{
|
||||
List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo());
|
||||
map.addAttribute("list",tBdProductinfoList);
|
||||
return prefix + "/SelectProductChangeInfo";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询机种切换管理列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:SelectProductChangeInfo:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(TRpProductchangeinfo tRpProductchangeinfo)
|
||||
{
|
||||
startPage();
|
||||
List<TRpProductchangeinfo> list = tRpProductchangeinfoService.selectChangeInfo(tRpProductchangeinfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出机种切换管理列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:SelectProductChangeInfo:export")
|
||||
@Log(title = "机种切换管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(TRpProductchangeinfo tRpProductchangeinfo)
|
||||
{
|
||||
List<TRpProductchangeinfo> list = tRpProductchangeinfoService.selectChangeInfo(tRpProductchangeinfo);
|
||||
ExcelUtil<TRpProductchangeinfo> util = new ExcelUtil<TRpProductchangeinfo>(TRpProductchangeinfo.class);
|
||||
return util.exportExcel(list, "SelectProductChangeInfo");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,71 @@
|
||||
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.TBdSubstation;
|
||||
import com.ruoyi.nanjing.domain.TRpWorktrayrealtimeinfo;
|
||||
import com.ruoyi.nanjing.service.ITBdSubstationService;
|
||||
import com.ruoyi.nanjing.service.ITRpWorktrayrealtimeinfoService;
|
||||
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.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 托盘管理Controller
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-28
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/nanjing/selectWorkTrayRealTimeInfo")
|
||||
public class SelectWorktrayrealtimeinfoController extends BaseController {
|
||||
private String prefix = "nanjing/WorkTrayRealTimeInfo";
|
||||
|
||||
@Autowired
|
||||
private ITRpWorktrayrealtimeinfoService tRpWorktrayrealtimeinfoService;
|
||||
@Autowired
|
||||
private ITBdSubstationService substationService;
|
||||
@RequiresPermissions("nanjing:selectWorkTrayRealTimeInfo:view")
|
||||
@GetMapping()
|
||||
public String WorkTrayRealTimeInfo(ModelMap map) {
|
||||
List<TBdSubstation> substations = substationService.selectTBdSubstationList(new TBdSubstation());
|
||||
map.addAttribute("list",substations);
|
||||
return prefix + "/SelectWorkTrayRealTimeInfo";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询托盘管理列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:selectWorkTrayRealTimeInfo:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) {
|
||||
startPage();
|
||||
List<TRpWorktrayrealtimeinfo> list = tRpWorktrayrealtimeinfoService.selectrealtimeinfoList(tRpWorktrayrealtimeinfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出托盘管理列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:selectWorkTrayRealTimeInfo:export")
|
||||
@Log(title = "托盘管理", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(TRpWorktrayrealtimeinfo tRpWorktrayrealtimeinfo) {
|
||||
List<TRpWorktrayrealtimeinfo> list = tRpWorktrayrealtimeinfoService.selectrealtimeinfoList(tRpWorktrayrealtimeinfo);
|
||||
ExcelUtil<TRpWorktrayrealtimeinfo> util = new ExcelUtil<TRpWorktrayrealtimeinfo>(TRpWorktrayrealtimeinfo.class);
|
||||
return util.exportExcel(list, "WorkTrayRealTimeInfo");
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,126 @@
|
||||
package com.ruoyi.web.controller.nanjing;
|
||||
|
||||
import java.util.List;
|
||||
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.TRpBarcoderelationship;
|
||||
import com.ruoyi.nanjing.service.ITRpBarcoderelationshipService;
|
||||
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;
|
||||
|
||||
/**
|
||||
* BarcodeRelationShipController
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/nanjing/BarcodeRelationShip")
|
||||
public class TRpBarcoderelationshipController extends BaseController
|
||||
{
|
||||
private String prefix = "nanjing/BarcodeRelationShip";
|
||||
|
||||
@Autowired
|
||||
private ITRpBarcoderelationshipService tRpBarcoderelationshipService;
|
||||
|
||||
@RequiresPermissions("nanjing:BarcodeRelationShip:view")
|
||||
@GetMapping()
|
||||
public String BarcodeRelationShip()
|
||||
{
|
||||
return prefix + "/BarcodeRelationShip";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询BarcodeRelationShip列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:BarcodeRelationShip:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(TRpBarcoderelationship tRpBarcoderelationship)
|
||||
{
|
||||
startPage();
|
||||
List<TRpBarcoderelationship> list = tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出BarcodeRelationShip列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:BarcodeRelationShip:export")
|
||||
@Log(title = "BarcodeRelationShip", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(TRpBarcoderelationship tRpBarcoderelationship)
|
||||
{
|
||||
List<TRpBarcoderelationship> list = tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship);
|
||||
ExcelUtil<TRpBarcoderelationship> util = new ExcelUtil<TRpBarcoderelationship>(TRpBarcoderelationship.class);
|
||||
return util.exportExcel(list, "BarcodeRelationShip");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增BarcodeRelationShip
|
||||
*/
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
{
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增保存BarcodeRelationShip
|
||||
*/
|
||||
@RequiresPermissions("nanjing:BarcodeRelationShip:add")
|
||||
@Log(title = "BarcodeRelationShip", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ResponseBody
|
||||
public AjaxResult addSave(TRpBarcoderelationship tRpBarcoderelationship)
|
||||
{
|
||||
return toAjax(tRpBarcoderelationshipService.insertTRpBarcoderelationship(tRpBarcoderelationship));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改BarcodeRelationShip
|
||||
*/
|
||||
@GetMapping("/edit/{ID}")
|
||||
public String edit(@PathVariable("ID") Long ID, ModelMap mmap)
|
||||
{
|
||||
TRpBarcoderelationship tRpBarcoderelationship = tRpBarcoderelationshipService.selectTRpBarcoderelationshipById(ID);
|
||||
mmap.put("tRpBarcoderelationship", tRpBarcoderelationship);
|
||||
return prefix + "/edit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改保存BarcodeRelationShip
|
||||
*/
|
||||
@RequiresPermissions("nanjing:BarcodeRelationShip:edit")
|
||||
@Log(title = "BarcodeRelationShip", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/edit")
|
||||
@ResponseBody
|
||||
public AjaxResult editSave(TRpBarcoderelationship tRpBarcoderelationship)
|
||||
{
|
||||
return toAjax(tRpBarcoderelationshipService.updateTRpBarcoderelationship(tRpBarcoderelationship));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除BarcodeRelationShip
|
||||
*/
|
||||
@RequiresPermissions("nanjing:BarcodeRelationShip:remove")
|
||||
@Log(title = "BarcodeRelationShip", businessType = BusinessType.DELETE)
|
||||
@PostMapping( "/remove")
|
||||
@ResponseBody
|
||||
public AjaxResult remove(String ids)
|
||||
{
|
||||
return toAjax(tRpBarcoderelationshipService.deleteTRpBarcoderelationshipByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
package com.ruoyi.web.controller.nanjing;
|
||||
|
||||
import java.util.List;
|
||||
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.TSyTracestate;
|
||||
import com.ruoyi.nanjing.service.ITSyTracestateService;
|
||||
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;
|
||||
|
||||
/**
|
||||
* traceStateController
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/nanjing/TraceState")
|
||||
public class TSyTracestateController extends BaseController
|
||||
{
|
||||
private String prefix = "nanjing/TraceState";
|
||||
|
||||
@Autowired
|
||||
private ITSyTracestateService tSyTracestateService;
|
||||
|
||||
@RequiresPermissions("nanjing:TraceState:view")
|
||||
@GetMapping()
|
||||
public String TraceState()
|
||||
{
|
||||
return prefix + "/TraceState";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询traceState列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:TraceState:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(TSyTracestate tSyTracestate)
|
||||
{
|
||||
startPage();
|
||||
List<TSyTracestate> list = tSyTracestateService.selectTSyTracestateList(tSyTracestate);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出traceState列表
|
||||
*/
|
||||
@RequiresPermissions("nanjing:TraceState:export")
|
||||
@Log(title = "traceState", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(TSyTracestate tSyTracestate)
|
||||
{
|
||||
List<TSyTracestate> list = tSyTracestateService.selectTSyTracestateList(tSyTracestate);
|
||||
ExcelUtil<TSyTracestate> util = new ExcelUtil<TSyTracestate>(TSyTracestate.class);
|
||||
return util.exportExcel(list, "TraceState");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增traceState
|
||||
*/
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
{
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增保存traceState
|
||||
*/
|
||||
@RequiresPermissions("nanjing:TraceState:add")
|
||||
@Log(title = "traceState", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ResponseBody
|
||||
public AjaxResult addSave(TSyTracestate tSyTracestate)
|
||||
{
|
||||
return toAjax(tSyTracestateService.insertTSyTracestate(tSyTracestate));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改traceState
|
||||
*/
|
||||
@GetMapping("/edit/{barcode}")
|
||||
public String edit(@PathVariable("barcode") String barcode, ModelMap mmap)
|
||||
{
|
||||
TSyTracestate tSyTracestate = tSyTracestateService.selectTSyTracestateById(barcode);
|
||||
mmap.put("tSyTracestate", tSyTracestate);
|
||||
return prefix + "/edit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改保存traceState
|
||||
*/
|
||||
@RequiresPermissions("nanjing:TraceState:edit")
|
||||
@Log(title = "traceState", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/edit")
|
||||
@ResponseBody
|
||||
public AjaxResult editSave(TSyTracestate tSyTracestate)
|
||||
{
|
||||
return toAjax(tSyTracestateService.updateTSyTracestate(tSyTracestate));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除traceState
|
||||
*/
|
||||
@RequiresPermissions("nanjing:TraceState:remove")
|
||||
@Log(title = "traceState", businessType = BusinessType.DELETE)
|
||||
@PostMapping( "/remove")
|
||||
@ResponseBody
|
||||
public AjaxResult remove(String ids)
|
||||
{
|
||||
return toAjax(tSyTracestateService.deleteTSyTracestateByIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
<!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>-->
|
||||
<!-- <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>-->
|
||||
<!-- <select name="machine" th:with="type=${@dict.getType('ifLable')}">-->
|
||||
<!-- <option value="">所有</option>-->
|
||||
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
|
||||
<!-- </select>-->
|
||||
<!-- </li>-->
|
||||
<li class="select-time">
|
||||
<label>时间区间： </label>
|
||||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
|
||||
<span>-</span>
|
||||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
|
||||
</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>
|
||||
<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="nanjingProductChangeInfo: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/SelectProductChangeInfo";
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/list",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "机种更换信息查询",
|
||||
columns: [
|
||||
{
|
||||
field: 'id',
|
||||
title: 'id'
|
||||
},
|
||||
{
|
||||
field: 'tBdProductinfo.productName',
|
||||
title: '机种名称',
|
||||
},
|
||||
{
|
||||
field: 'personInCharge',
|
||||
title: '生产负责人'
|
||||
},
|
||||
{
|
||||
field: 'beginTime',
|
||||
title: '开始时间'
|
||||
},
|
||||
{
|
||||
field: 'endTime',
|
||||
title: '结束时间'
|
||||
},
|
||||
{
|
||||
field:'user.userName',
|
||||
title:'操作人'
|
||||
}
|
||||
]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,182 @@
|
||||
<!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('traceState列表')" />
|
||||
</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>
|
||||
<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="nanjing:TraceState:add">
|
||||
<i class="fa fa-plus"></i> 添加
|
||||
</a>
|
||||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="nanjing:TraceState:edit">
|
||||
<i class="fa fa-edit"></i> 修改
|
||||
</a>
|
||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="nanjing:TraceState:remove">
|
||||
<i class="fa fa-remove"></i> 删除
|
||||
</a>
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:TraceState:export">
|
||||
<i class="fa fa-download"></i> 导出
|
||||
</a>
|
||||
</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 editFlag = [[${@permission.hasPermi('nanjing:TraceState:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('nanjing:TraceState:remove')}]];
|
||||
var isDisDatas = [[${@dict.getType('isDis')}]];
|
||||
var stateDatas = [[${@dict.getType('proState')}]];
|
||||
var prefix = ctx + "nanjing/TraceState";
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/list",
|
||||
createUrl: prefix + "/add",
|
||||
updateUrl: prefix + "/edit/{id}",
|
||||
removeUrl: prefix + "/remove",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "traceState",
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
field: 'barcode',
|
||||
title: 'null',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'productID',
|
||||
title: '产品ID'
|
||||
},
|
||||
{
|
||||
field: 'beginTime',
|
||||
title: '开始时间'
|
||||
},
|
||||
{
|
||||
field: 'endTime',
|
||||
title: '结束时间'
|
||||
},
|
||||
{
|
||||
field: 'shiftID',
|
||||
title: '班次ID'
|
||||
},
|
||||
{
|
||||
field: 'groupID',
|
||||
title: '班组ID'
|
||||
},
|
||||
{
|
||||
field: 'shiftNo',
|
||||
title: '班次号'
|
||||
},
|
||||
{
|
||||
field: 'semibarcodeA',
|
||||
title: '条码A'
|
||||
},
|
||||
{
|
||||
field: 'semibarcodeB',
|
||||
title: '条码B'
|
||||
},
|
||||
{
|
||||
field: 'semibarcodeC',
|
||||
title: '条码C'
|
||||
},
|
||||
{
|
||||
field: 'productBarcode',
|
||||
title: '产品码'
|
||||
},
|
||||
{
|
||||
field: 'semiBarcode2',
|
||||
title: 'SemiBarcode2'
|
||||
},
|
||||
{
|
||||
field: 'shellbarcode',
|
||||
title: 'shellbarcode'
|
||||
},
|
||||
{
|
||||
field: 'nameplateInfo',
|
||||
title: 'NameplateInfo'
|
||||
},
|
||||
{
|
||||
field: 'markRecord',
|
||||
title: 'MarkRecord'
|
||||
},
|
||||
{
|
||||
field: 'attr1',
|
||||
title: '属性1'
|
||||
},
|
||||
{
|
||||
field: 'attr2',
|
||||
title: '属性2'
|
||||
},
|
||||
{
|
||||
field: 'isDis',
|
||||
title: '拆解状态',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.selectDictLabel(isDisDatas, value);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'disChecker',
|
||||
title: '拆解操作人'
|
||||
},
|
||||
{
|
||||
field: 'disTime',
|
||||
title: '拆解时间'
|
||||
},
|
||||
{
|
||||
field: 'state',
|
||||
title: '合格状态',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.selectDictLabel(stateDatas, value);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'currentStationID',
|
||||
title: '当前工位'
|
||||
},
|
||||
{
|
||||
field: 'nGStationID',
|
||||
title: 'NG工位'
|
||||
},
|
||||
{
|
||||
field: 'finishFlag',
|
||||
title: '完成状态'
|
||||
},
|
||||
{
|
||||
field: 'd9Remark',
|
||||
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.barcode + '\')"><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.barcode + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,25 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('新增traceState')" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-TraceState-add">
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "nanjing/TraceState"
|
||||
$("#form-TraceState-add").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/add", $('#form-TraceState-add').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,26 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
|
||||
<head>
|
||||
<th:block th:include="include :: header('修改traceState')" />
|
||||
</head>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-TraceState-edit" th:object="${tSyTracestate}">
|
||||
<input name="barcode" th:field="*{barcode}" type="hidden">
|
||||
</form>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "nanjing/TraceState";
|
||||
$("#form-TraceState-edit").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/edit", $('#form-TraceState-edit').serialize());
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,122 @@
|
||||
package com.ruoyi.nanjing.domain;
|
||||
|
||||
import java.util.Date;
|
||||
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;
|
||||
|
||||
/**
|
||||
* BarcodeRelationShip对象 T_RP_BarcodeRelationShip
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public class TRpBarcoderelationship extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
private Long ID;
|
||||
|
||||
/** Semi */
|
||||
@Excel(name = "Semi")
|
||||
private String semiBarcode;
|
||||
|
||||
/** 产品条码 */
|
||||
@Excel(name = "产品条码")
|
||||
private String productBarcode;
|
||||
|
||||
/** 支线条码 */
|
||||
@Excel(name = "支线条码")
|
||||
private String semibarcodeLine;
|
||||
|
||||
/** 所属支线ID */
|
||||
@Excel(name = "所属支线ID")
|
||||
private Long lineID;
|
||||
|
||||
/** 是否生效 */
|
||||
@Excel(name = "是否生效")
|
||||
private String stateFlag;
|
||||
|
||||
/** 记录时间 */
|
||||
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date insertTime;
|
||||
|
||||
public void setID(Long ID)
|
||||
{
|
||||
this.ID = ID;
|
||||
}
|
||||
|
||||
public Long getID()
|
||||
{
|
||||
return ID;
|
||||
}
|
||||
public void setSemiBarcode(String semiBarcode)
|
||||
{
|
||||
this.semiBarcode = semiBarcode;
|
||||
}
|
||||
|
||||
public String getSemiBarcode()
|
||||
{
|
||||
return semiBarcode;
|
||||
}
|
||||
public void setProductBarcode(String productBarcode)
|
||||
{
|
||||
this.productBarcode = productBarcode;
|
||||
}
|
||||
|
||||
public String getProductBarcode()
|
||||
{
|
||||
return productBarcode;
|
||||
}
|
||||
public void setSemibarcodeLine(String semibarcodeLine)
|
||||
{
|
||||
this.semibarcodeLine = semibarcodeLine;
|
||||
}
|
||||
|
||||
public String getSemibarcodeLine()
|
||||
{
|
||||
return semibarcodeLine;
|
||||
}
|
||||
public void setLineID(Long lineID)
|
||||
{
|
||||
this.lineID = lineID;
|
||||
}
|
||||
|
||||
public Long getLineID()
|
||||
{
|
||||
return lineID;
|
||||
}
|
||||
public void setStateFlag(String stateFlag)
|
||||
{
|
||||
this.stateFlag = stateFlag;
|
||||
}
|
||||
|
||||
public String getStateFlag()
|
||||
{
|
||||
return stateFlag;
|
||||
}
|
||||
public void setInsertTime(Date insertTime)
|
||||
{
|
||||
this.insertTime = insertTime;
|
||||
}
|
||||
|
||||
public Date getInsertTime()
|
||||
{
|
||||
return insertTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("ID", getID())
|
||||
.append("semiBarcode", getSemiBarcode())
|
||||
.append("productBarcode", getProductBarcode())
|
||||
.append("semibarcodeLine", getSemibarcodeLine())
|
||||
.append("lineID", getLineID())
|
||||
.append("stateFlag", getStateFlag())
|
||||
.append("insertTime", getInsertTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,346 @@
|
||||
package com.ruoyi.nanjing.domain;
|
||||
|
||||
import java.util.Date;
|
||||
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;
|
||||
|
||||
/**
|
||||
* ParameterList对象 T_RP_StationPara_OP10
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public class TRpStationpara extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
private Long id;
|
||||
|
||||
/** 系统条码 */
|
||||
@Excel(name = "系统条码")
|
||||
private String barcode;
|
||||
|
||||
/** SemiBarcode */
|
||||
@Excel(name = "SemiBarcode")
|
||||
private String semiBarcode;
|
||||
|
||||
/** ScanBarcode */
|
||||
@Excel(name = "ScanBarcode")
|
||||
private String scanBarcode;
|
||||
|
||||
/** rfid */
|
||||
@Excel(name = "rfid")
|
||||
private String rfidNO;
|
||||
|
||||
/** 班次 */
|
||||
@Excel(name = "班次")
|
||||
private String shiftNo;
|
||||
|
||||
/** 工位ID */
|
||||
@Excel(name = "工位ID")
|
||||
private String stationID;
|
||||
|
||||
/** 机台ID */
|
||||
@Excel(name = "机台ID")
|
||||
private String machineID;
|
||||
|
||||
/** MaskID */
|
||||
@Excel(name = "MaskID")
|
||||
private String maskID;
|
||||
|
||||
/** 记录时间 */
|
||||
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date insertTime;
|
||||
|
||||
/** 上传标志 */
|
||||
@Excel(name = "上传标志")
|
||||
private String uploadFlag;
|
||||
|
||||
/** 结束标志 */
|
||||
@Excel(name = "结束标志")
|
||||
private String finalFlag;
|
||||
|
||||
/** 状态 */
|
||||
@Excel(name = "状态")
|
||||
private String state;
|
||||
|
||||
/** 参数1 */
|
||||
@Excel(name = "参数1")
|
||||
private String para1;
|
||||
|
||||
/** 参数1最小值 */
|
||||
@Excel(name = "参数1最小值")
|
||||
private String para1Min;
|
||||
|
||||
/** 参数1最大值 */
|
||||
@Excel(name = "参数1最大值")
|
||||
private String para1Max;
|
||||
|
||||
/** 参数1状态 */
|
||||
@Excel(name = "参数1状态")
|
||||
private String para1State;
|
||||
|
||||
/** 参数1保留 */
|
||||
@Excel(name = "参数1保留")
|
||||
private String para1Reserve;
|
||||
|
||||
/** 参数2 */
|
||||
@Excel(name = "参数2")
|
||||
private String para2;
|
||||
|
||||
/** 参数2最小值 */
|
||||
@Excel(name = "参数2最小值")
|
||||
private String para2Min;
|
||||
|
||||
/** 参数2最大值 */
|
||||
@Excel(name = "参数2最大值")
|
||||
private String para2Max;
|
||||
|
||||
/** 参数2状态 */
|
||||
@Excel(name = "参数2状态")
|
||||
private String para2State;
|
||||
|
||||
/** 参数2保留 */
|
||||
@Excel(name = "参数2保留")
|
||||
private String para2Reserve;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setBarcode(String barcode)
|
||||
{
|
||||
this.barcode = barcode;
|
||||
}
|
||||
|
||||
public String getBarcode()
|
||||
{
|
||||
return barcode;
|
||||
}
|
||||
public void setSemiBarcode(String semiBarcode)
|
||||
{
|
||||
this.semiBarcode = semiBarcode;
|
||||
}
|
||||
|
||||
public String getSemiBarcode()
|
||||
{
|
||||
return semiBarcode;
|
||||
}
|
||||
public void setScanBarcode(String scanBarcode)
|
||||
{
|
||||
this.scanBarcode = scanBarcode;
|
||||
}
|
||||
|
||||
public String getScanBarcode()
|
||||
{
|
||||
return scanBarcode;
|
||||
}
|
||||
public void setRfidNO(String rfidNO)
|
||||
{
|
||||
this.rfidNO = rfidNO;
|
||||
}
|
||||
|
||||
public String getRfidNO()
|
||||
{
|
||||
return rfidNO;
|
||||
}
|
||||
public void setShiftNo(String shiftNo)
|
||||
{
|
||||
this.shiftNo = shiftNo;
|
||||
}
|
||||
|
||||
public String getShiftNo()
|
||||
{
|
||||
return shiftNo;
|
||||
}
|
||||
public void setStationID(String stationID)
|
||||
{
|
||||
this.stationID = stationID;
|
||||
}
|
||||
|
||||
public String getStationID()
|
||||
{
|
||||
return stationID;
|
||||
}
|
||||
public void setMachineID(String machineID)
|
||||
{
|
||||
this.machineID = machineID;
|
||||
}
|
||||
|
||||
public String getMachineID()
|
||||
{
|
||||
return machineID;
|
||||
}
|
||||
public void setMaskID(String maskID)
|
||||
{
|
||||
this.maskID = maskID;
|
||||
}
|
||||
|
||||
public String getMaskID()
|
||||
{
|
||||
return maskID;
|
||||
}
|
||||
public void setInsertTime(Date insertTime)
|
||||
{
|
||||
this.insertTime = insertTime;
|
||||
}
|
||||
|
||||
public Date getInsertTime()
|
||||
{
|
||||
return insertTime;
|
||||
}
|
||||
public void setUploadFlag(String uploadFlag)
|
||||
{
|
||||
this.uploadFlag = uploadFlag;
|
||||
}
|
||||
|
||||
public String getUploadFlag()
|
||||
{
|
||||
return uploadFlag;
|
||||
}
|
||||
public void setFinalFlag(String finalFlag)
|
||||
{
|
||||
this.finalFlag = finalFlag;
|
||||
}
|
||||
|
||||
public String getFinalFlag()
|
||||
{
|
||||
return finalFlag;
|
||||
}
|
||||
public void setState(String state)
|
||||
{
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public String getState()
|
||||
{
|
||||
return state;
|
||||
}
|
||||
public void setPara1(String para1)
|
||||
{
|
||||
this.para1 = para1;
|
||||
}
|
||||
|
||||
public String getPara1()
|
||||
{
|
||||
return para1;
|
||||
}
|
||||
public void setPara1Min(String para1Min)
|
||||
{
|
||||
this.para1Min = para1Min;
|
||||
}
|
||||
|
||||
public String getPara1Min()
|
||||
{
|
||||
return para1Min;
|
||||
}
|
||||
public void setPara1Max(String para1Max)
|
||||
{
|
||||
this.para1Max = para1Max;
|
||||
}
|
||||
|
||||
public String getPara1Max()
|
||||
{
|
||||
return para1Max;
|
||||
}
|
||||
public void setPara1State(String para1State)
|
||||
{
|
||||
this.para1State = para1State;
|
||||
}
|
||||
|
||||
public String getPara1State()
|
||||
{
|
||||
return para1State;
|
||||
}
|
||||
public void setPara1Reserve(String para1Reserve)
|
||||
{
|
||||
this.para1Reserve = para1Reserve;
|
||||
}
|
||||
|
||||
public String getPara1Reserve()
|
||||
{
|
||||
return para1Reserve;
|
||||
}
|
||||
public void setPara2(String para2)
|
||||
{
|
||||
this.para2 = para2;
|
||||
}
|
||||
|
||||
public String getPara2()
|
||||
{
|
||||
return para2;
|
||||
}
|
||||
public void setPara2Min(String para2Min)
|
||||
{
|
||||
this.para2Min = para2Min;
|
||||
}
|
||||
|
||||
public String getPara2Min()
|
||||
{
|
||||
return para2Min;
|
||||
}
|
||||
public void setPara2Max(String para2Max)
|
||||
{
|
||||
this.para2Max = para2Max;
|
||||
}
|
||||
|
||||
public String getPara2Max()
|
||||
{
|
||||
return para2Max;
|
||||
}
|
||||
public void setPara2State(String para2State)
|
||||
{
|
||||
this.para2State = para2State;
|
||||
}
|
||||
|
||||
public String getPara2State()
|
||||
{
|
||||
return para2State;
|
||||
}
|
||||
public void setPara2Reserve(String para2Reserve)
|
||||
{
|
||||
this.para2Reserve = para2Reserve;
|
||||
}
|
||||
|
||||
public String getPara2Reserve()
|
||||
{
|
||||
return para2Reserve;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("barcode", getBarcode())
|
||||
.append("semiBarcode", getSemiBarcode())
|
||||
.append("scanBarcode", getScanBarcode())
|
||||
.append("rfidNO", getRfidNO())
|
||||
.append("shiftNo", getShiftNo())
|
||||
.append("stationID", getStationID())
|
||||
.append("machineID", getMachineID())
|
||||
.append("maskID", getMaskID())
|
||||
.append("insertTime", getInsertTime())
|
||||
.append("uploadFlag", getUploadFlag())
|
||||
.append("finalFlag", getFinalFlag())
|
||||
.append("state", getState())
|
||||
.append("para1", getPara1())
|
||||
.append("para1Min", getPara1Min())
|
||||
.append("para1Max", getPara1Max())
|
||||
.append("para1State", getPara1State())
|
||||
.append("para1Reserve", getPara1Reserve())
|
||||
.append("para2", getPara2())
|
||||
.append("para2Min", getPara2Min())
|
||||
.append("para2Max", getPara2Max())
|
||||
.append("para2State", getPara2State())
|
||||
.append("para2Reserve", getPara2Reserve())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,375 @@
|
||||
package com.ruoyi.nanjing.domain;
|
||||
|
||||
import java.util.Date;
|
||||
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;
|
||||
|
||||
/**
|
||||
* traceState对象 T_SY_TraceState
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public class TSyTracestate extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** null */
|
||||
@Excel(name = "null")
|
||||
private String barcode;
|
||||
|
||||
/** 产品ID */
|
||||
@Excel(name = "产品ID")
|
||||
private String productID;
|
||||
|
||||
/** 开始时间 */
|
||||
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date beginTime;
|
||||
|
||||
/** 结束时间 */
|
||||
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date endTime;
|
||||
|
||||
/** 班次ID */
|
||||
@Excel(name = "班次ID")
|
||||
private String shiftID;
|
||||
|
||||
/** 班组ID */
|
||||
@Excel(name = "班组ID")
|
||||
private String groupID;
|
||||
|
||||
/** 班次号 */
|
||||
@Excel(name = "班次号")
|
||||
private String shiftNo;
|
||||
|
||||
/** 条码A */
|
||||
@Excel(name = "条码A")
|
||||
private String semibarcodeA;
|
||||
|
||||
/** 条码B */
|
||||
@Excel(name = "条码B")
|
||||
private String semibarcodeB;
|
||||
|
||||
/** 条码C */
|
||||
@Excel(name = "条码C")
|
||||
private String semibarcodeC;
|
||||
|
||||
/** 产品码 */
|
||||
@Excel(name = "产品码")
|
||||
private String productBarcode;
|
||||
|
||||
/** SemiBarcode2 */
|
||||
@Excel(name = "SemiBarcode2")
|
||||
private String semiBarcode2;
|
||||
|
||||
/** shellbarcode */
|
||||
@Excel(name = "shellbarcode")
|
||||
private String shellbarcode;
|
||||
|
||||
/** NameplateInfo */
|
||||
@Excel(name = "NameplateInfo")
|
||||
private String nameplateInfo;
|
||||
|
||||
/** MarkRecord */
|
||||
@Excel(name = "MarkRecord")
|
||||
private String markRecord;
|
||||
|
||||
/** 属性1 */
|
||||
@Excel(name = "属性1")
|
||||
private String attr1;
|
||||
|
||||
/** 属性2 */
|
||||
@Excel(name = "属性2")
|
||||
private String attr2;
|
||||
|
||||
/** 拆解状态 */
|
||||
@Excel(name = "拆解状态")
|
||||
private String isDis;
|
||||
|
||||
/** 拆解操作人 */
|
||||
@Excel(name = "拆解操作人")
|
||||
private String disChecker;
|
||||
|
||||
/** 拆解时间 */
|
||||
@Excel(name = "拆解时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date disTime;
|
||||
|
||||
/** 合格状态 */
|
||||
@Excel(name = "合格状态")
|
||||
private String state;
|
||||
|
||||
/** 当前工位 */
|
||||
@Excel(name = "当前工位")
|
||||
private String currentStationID;
|
||||
|
||||
/** NG工位 */
|
||||
@Excel(name = "NG工位")
|
||||
private String nGStationID;
|
||||
|
||||
/** 完成状态 */
|
||||
@Excel(name = "完成状态")
|
||||
private String finishFlag;
|
||||
|
||||
/** 不合格原因 */
|
||||
@Excel(name = "不合格原因")
|
||||
private String d9Remark;
|
||||
|
||||
public void setBarcode(String barcode)
|
||||
{
|
||||
this.barcode = barcode;
|
||||
}
|
||||
|
||||
public String getBarcode()
|
||||
{
|
||||
return barcode;
|
||||
}
|
||||
public void setProductID(String productID)
|
||||
{
|
||||
this.productID = productID;
|
||||
}
|
||||
|
||||
public String getProductID()
|
||||
{
|
||||
return productID;
|
||||
}
|
||||
public void setBeginTime(Date beginTime)
|
||||
{
|
||||
this.beginTime = beginTime;
|
||||
}
|
||||
|
||||
public Date getBeginTime()
|
||||
{
|
||||
return beginTime;
|
||||
}
|
||||
public void setEndTime(Date endTime)
|
||||
{
|
||||
this.endTime = endTime;
|
||||
}
|
||||
|
||||
public Date getEndTime()
|
||||
{
|
||||
return endTime;
|
||||
}
|
||||
public void setShiftID(String shiftID)
|
||||
{
|
||||
this.shiftID = shiftID;
|
||||
}
|
||||
|
||||
public String getShiftID()
|
||||
{
|
||||
return shiftID;
|
||||
}
|
||||
public void setGroupID(String groupID)
|
||||
{
|
||||
this.groupID = groupID;
|
||||
}
|
||||
|
||||
public String getGroupID()
|
||||
{
|
||||
return groupID;
|
||||
}
|
||||
public void setShiftNo(String shiftNo)
|
||||
{
|
||||
this.shiftNo = shiftNo;
|
||||
}
|
||||
|
||||
public String getShiftNo()
|
||||
{
|
||||
return shiftNo;
|
||||
}
|
||||
public void setSemibarcodeA(String semibarcodeA)
|
||||
{
|
||||
this.semibarcodeA = semibarcodeA;
|
||||
}
|
||||
|
||||
public String getSemibarcodeA()
|
||||
{
|
||||
return semibarcodeA;
|
||||
}
|
||||
public void setSemibarcodeB(String semibarcodeB)
|
||||
{
|
||||
this.semibarcodeB = semibarcodeB;
|
||||
}
|
||||
|
||||
public String getSemibarcodeB()
|
||||
{
|
||||
return semibarcodeB;
|
||||
}
|
||||
public void setSemibarcodeC(String semibarcodeC)
|
||||
{
|
||||
this.semibarcodeC = semibarcodeC;
|
||||
}
|
||||
|
||||
public String getSemibarcodeC()
|
||||
{
|
||||
return semibarcodeC;
|
||||
}
|
||||
public void setProductBarcode(String productBarcode)
|
||||
{
|
||||
this.productBarcode = productBarcode;
|
||||
}
|
||||
|
||||
public String getProductBarcode()
|
||||
{
|
||||
return productBarcode;
|
||||
}
|
||||
public void setSemiBarcode2(String semiBarcode2)
|
||||
{
|
||||
this.semiBarcode2 = semiBarcode2;
|
||||
}
|
||||
|
||||
public String getSemiBarcode2()
|
||||
{
|
||||
return semiBarcode2;
|
||||
}
|
||||
public void setShellbarcode(String shellbarcode)
|
||||
{
|
||||
this.shellbarcode = shellbarcode;
|
||||
}
|
||||
|
||||
public String getShellbarcode()
|
||||
{
|
||||
return shellbarcode;
|
||||
}
|
||||
public void setNameplateInfo(String nameplateInfo)
|
||||
{
|
||||
this.nameplateInfo = nameplateInfo;
|
||||
}
|
||||
|
||||
public String getNameplateInfo()
|
||||
{
|
||||
return nameplateInfo;
|
||||
}
|
||||
public void setMarkRecord(String markRecord)
|
||||
{
|
||||
this.markRecord = markRecord;
|
||||
}
|
||||
|
||||
public String getMarkRecord()
|
||||
{
|
||||
return markRecord;
|
||||
}
|
||||
public void setAttr1(String attr1)
|
||||
{
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr1()
|
||||
{
|
||||
return attr1;
|
||||
}
|
||||
public void setAttr2(String attr2)
|
||||
{
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public String getAttr2()
|
||||
{
|
||||
return attr2;
|
||||
}
|
||||
public void setIsDis(String isDis)
|
||||
{
|
||||
this.isDis = isDis;
|
||||
}
|
||||
|
||||
public String getIsDis()
|
||||
{
|
||||
return isDis;
|
||||
}
|
||||
public void setDisChecker(String disChecker)
|
||||
{
|
||||
this.disChecker = disChecker;
|
||||
}
|
||||
|
||||
public String getDisChecker()
|
||||
{
|
||||
return disChecker;
|
||||
}
|
||||
public void setDisTime(Date disTime)
|
||||
{
|
||||
this.disTime = disTime;
|
||||
}
|
||||
|
||||
public Date getDisTime()
|
||||
{
|
||||
return disTime;
|
||||
}
|
||||
public void setState(String state)
|
||||
{
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public String getState()
|
||||
{
|
||||
return state;
|
||||
}
|
||||
public void setCurrentStationID(String currentStationID)
|
||||
{
|
||||
this.currentStationID = currentStationID;
|
||||
}
|
||||
|
||||
public String getCurrentStationID()
|
||||
{
|
||||
return currentStationID;
|
||||
}
|
||||
public void setnGStationID(String nGStationID)
|
||||
{
|
||||
this.nGStationID = nGStationID;
|
||||
}
|
||||
|
||||
public String getnGStationID()
|
||||
{
|
||||
return nGStationID;
|
||||
}
|
||||
public void setFinishFlag(String finishFlag)
|
||||
{
|
||||
this.finishFlag = finishFlag;
|
||||
}
|
||||
|
||||
public String getFinishFlag()
|
||||
{
|
||||
return finishFlag;
|
||||
}
|
||||
public void setD9Remark(String d9Remark)
|
||||
{
|
||||
this.d9Remark = d9Remark;
|
||||
}
|
||||
|
||||
public String getD9Remark()
|
||||
{
|
||||
return d9Remark;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("barcode", getBarcode())
|
||||
.append("productID", getProductID())
|
||||
.append("beginTime", getBeginTime())
|
||||
.append("endTime", getEndTime())
|
||||
.append("shiftID", getShiftID())
|
||||
.append("groupID", getGroupID())
|
||||
.append("shiftNo", getShiftNo())
|
||||
.append("semibarcodeA", getSemibarcodeA())
|
||||
.append("semibarcodeB", getSemibarcodeB())
|
||||
.append("semibarcodeC", getSemibarcodeC())
|
||||
.append("productBarcode", getProductBarcode())
|
||||
.append("semiBarcode2", getSemiBarcode2())
|
||||
.append("shellbarcode", getShellbarcode())
|
||||
.append("nameplateInfo", getNameplateInfo())
|
||||
.append("markRecord", getMarkRecord())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("isDis", getIsDis())
|
||||
.append("disChecker", getDisChecker())
|
||||
.append("disTime", getDisTime())
|
||||
.append("state", getState())
|
||||
.append("currentStationID", getCurrentStationID())
|
||||
.append("nGStationID", getnGStationID())
|
||||
.append("finishFlag", getFinishFlag())
|
||||
.append("d9Remark", getD9Remark())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.nanjing.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.nanjing.domain.TRpBarcoderelationship;
|
||||
|
||||
/**
|
||||
* BarcodeRelationShipMapper接口
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public interface TRpBarcoderelationshipMapper
|
||||
{
|
||||
/**
|
||||
* 查询BarcodeRelationShip
|
||||
*
|
||||
* @param ID BarcodeRelationShipID
|
||||
* @return BarcodeRelationShip
|
||||
*/
|
||||
public TRpBarcoderelationship selectTRpBarcoderelationshipById(Long ID);
|
||||
|
||||
/**
|
||||
* 查询BarcodeRelationShip列表
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return BarcodeRelationShip集合
|
||||
*/
|
||||
public List<TRpBarcoderelationship> selectTRpBarcoderelationshipList(TRpBarcoderelationship tRpBarcoderelationship);
|
||||
|
||||
/**
|
||||
* 新增BarcodeRelationShip
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship);
|
||||
|
||||
/**
|
||||
* 修改BarcodeRelationShip
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship);
|
||||
|
||||
/**
|
||||
* 删除BarcodeRelationShip
|
||||
*
|
||||
* @param ID BarcodeRelationShipID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTRpBarcoderelationshipById(Long ID);
|
||||
|
||||
/**
|
||||
* 批量删除BarcodeRelationShip
|
||||
*
|
||||
* @param IDs 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTRpBarcoderelationshipByIds(String[] IDs);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.nanjing.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.nanjing.domain.TSyTracestate;
|
||||
|
||||
/**
|
||||
* traceStateMapper接口
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public interface TSyTracestateMapper
|
||||
{
|
||||
/**
|
||||
* 查询traceState
|
||||
*
|
||||
* @param barcode traceStateID
|
||||
* @return traceState
|
||||
*/
|
||||
public TSyTracestate selectTSyTracestateById(String barcode);
|
||||
|
||||
/**
|
||||
* 查询traceState列表
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return traceState集合
|
||||
*/
|
||||
public List<TSyTracestate> selectTSyTracestateList(TSyTracestate tSyTracestate);
|
||||
|
||||
/**
|
||||
* 新增traceState
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertTSyTracestate(TSyTracestate tSyTracestate);
|
||||
|
||||
/**
|
||||
* 修改traceState
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateTSyTracestate(TSyTracestate tSyTracestate);
|
||||
|
||||
/**
|
||||
* 删除traceState
|
||||
*
|
||||
* @param barcode traceStateID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTSyTracestateById(String barcode);
|
||||
|
||||
/**
|
||||
* 批量删除traceState
|
||||
*
|
||||
* @param barcodes 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTSyTracestateByIds(String[] barcodes);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.nanjing.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.nanjing.domain.TRpBarcoderelationship;
|
||||
|
||||
/**
|
||||
* BarcodeRelationShipService接口
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public interface ITRpBarcoderelationshipService
|
||||
{
|
||||
/**
|
||||
* 查询BarcodeRelationShip
|
||||
*
|
||||
* @param ID BarcodeRelationShipID
|
||||
* @return BarcodeRelationShip
|
||||
*/
|
||||
public TRpBarcoderelationship selectTRpBarcoderelationshipById(Long ID);
|
||||
|
||||
/**
|
||||
* 查询BarcodeRelationShip列表
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return BarcodeRelationShip集合
|
||||
*/
|
||||
public List<TRpBarcoderelationship> selectTRpBarcoderelationshipList(TRpBarcoderelationship tRpBarcoderelationship);
|
||||
|
||||
/**
|
||||
* 新增BarcodeRelationShip
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship);
|
||||
|
||||
/**
|
||||
* 修改BarcodeRelationShip
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship);
|
||||
|
||||
/**
|
||||
* 批量删除BarcodeRelationShip
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTRpBarcoderelationshipByIds(String ids);
|
||||
|
||||
/**
|
||||
* 删除BarcodeRelationShip信息
|
||||
*
|
||||
* @param ID BarcodeRelationShipID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTRpBarcoderelationshipById(Long ID);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.nanjing.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.nanjing.domain.TSyTracestate;
|
||||
|
||||
/**
|
||||
* traceStateService接口
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
public interface ITSyTracestateService
|
||||
{
|
||||
/**
|
||||
* 查询traceState
|
||||
*
|
||||
* @param barcode traceStateID
|
||||
* @return traceState
|
||||
*/
|
||||
public TSyTracestate selectTSyTracestateById(String barcode);
|
||||
|
||||
/**
|
||||
* 查询traceState列表
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return traceState集合
|
||||
*/
|
||||
public List<TSyTracestate> selectTSyTracestateList(TSyTracestate tSyTracestate);
|
||||
|
||||
/**
|
||||
* 新增traceState
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertTSyTracestate(TSyTracestate tSyTracestate);
|
||||
|
||||
/**
|
||||
* 修改traceState
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return 结果
|
||||
*/
|
||||
public int updateTSyTracestate(TSyTracestate tSyTracestate);
|
||||
|
||||
/**
|
||||
* 批量删除traceState
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTSyTracestateByIds(String ids);
|
||||
|
||||
/**
|
||||
* 删除traceState信息
|
||||
*
|
||||
* @param barcode traceStateID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTSyTracestateById(String barcode);
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
package com.ruoyi.nanjing.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.nanjing.mapper.TRpBarcoderelationshipMapper;
|
||||
import com.ruoyi.nanjing.domain.TRpBarcoderelationship;
|
||||
import com.ruoyi.nanjing.service.ITRpBarcoderelationshipService;
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
|
||||
/**
|
||||
* BarcodeRelationShipService业务层处理
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
@Service
|
||||
public class TRpBarcoderelationshipServiceImpl implements ITRpBarcoderelationshipService
|
||||
{
|
||||
@Autowired
|
||||
private TRpBarcoderelationshipMapper tRpBarcoderelationshipMapper;
|
||||
|
||||
/**
|
||||
* 查询BarcodeRelationShip
|
||||
*
|
||||
* @param ID BarcodeRelationShipID
|
||||
* @return BarcodeRelationShip
|
||||
*/
|
||||
@Override
|
||||
public TRpBarcoderelationship selectTRpBarcoderelationshipById(Long ID)
|
||||
{
|
||||
return tRpBarcoderelationshipMapper.selectTRpBarcoderelationshipById(ID);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询BarcodeRelationShip列表
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return BarcodeRelationShip
|
||||
*/
|
||||
@Override
|
||||
public List<TRpBarcoderelationship> selectTRpBarcoderelationshipList(TRpBarcoderelationship tRpBarcoderelationship)
|
||||
{
|
||||
return tRpBarcoderelationshipMapper.selectTRpBarcoderelationshipList(tRpBarcoderelationship);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增BarcodeRelationShip
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship)
|
||||
{
|
||||
return tRpBarcoderelationshipMapper.insertTRpBarcoderelationship(tRpBarcoderelationship);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改BarcodeRelationShip
|
||||
*
|
||||
* @param tRpBarcoderelationship BarcodeRelationShip
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateTRpBarcoderelationship(TRpBarcoderelationship tRpBarcoderelationship)
|
||||
{
|
||||
return tRpBarcoderelationshipMapper.updateTRpBarcoderelationship(tRpBarcoderelationship);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除BarcodeRelationShip对象
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteTRpBarcoderelationshipByIds(String ids)
|
||||
{
|
||||
return tRpBarcoderelationshipMapper.deleteTRpBarcoderelationshipByIds(Convert.toStrArray(ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除BarcodeRelationShip信息
|
||||
*
|
||||
* @param ID BarcodeRelationShipID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteTRpBarcoderelationshipById(Long ID)
|
||||
{
|
||||
return tRpBarcoderelationshipMapper.deleteTRpBarcoderelationshipById(ID);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
package com.ruoyi.nanjing.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.nanjing.mapper.TSyTracestateMapper;
|
||||
import com.ruoyi.nanjing.domain.TSyTracestate;
|
||||
import com.ruoyi.nanjing.service.ITSyTracestateService;
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
|
||||
/**
|
||||
* traceStateService业务层处理
|
||||
*
|
||||
* @author limy
|
||||
* @date 2021-01-29
|
||||
*/
|
||||
@Service
|
||||
public class TSyTracestateServiceImpl implements ITSyTracestateService
|
||||
{
|
||||
@Autowired
|
||||
private TSyTracestateMapper tSyTracestateMapper;
|
||||
|
||||
/**
|
||||
* 查询traceState
|
||||
*
|
||||
* @param barcode traceStateID
|
||||
* @return traceState
|
||||
*/
|
||||
@Override
|
||||
public TSyTracestate selectTSyTracestateById(String barcode)
|
||||
{
|
||||
return tSyTracestateMapper.selectTSyTracestateById(barcode);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询traceState列表
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return traceState
|
||||
*/
|
||||
@Override
|
||||
public List<TSyTracestate> selectTSyTracestateList(TSyTracestate tSyTracestate)
|
||||
{
|
||||
return tSyTracestateMapper.selectTSyTracestateList(tSyTracestate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增traceState
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertTSyTracestate(TSyTracestate tSyTracestate)
|
||||
{
|
||||
return tSyTracestateMapper.insertTSyTracestate(tSyTracestate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改traceState
|
||||
*
|
||||
* @param tSyTracestate traceState
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateTSyTracestate(TSyTracestate tSyTracestate)
|
||||
{
|
||||
return tSyTracestateMapper.updateTSyTracestate(tSyTracestate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除traceState对象
|
||||
*
|
||||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteTSyTracestateByIds(String ids)
|
||||
{
|
||||
return tSyTracestateMapper.deleteTSyTracestateByIds(Convert.toStrArray(ids));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除traceState信息
|
||||
*
|
||||
* @param barcode traceStateID
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteTSyTracestateById(String barcode)
|
||||
{
|
||||
return tSyTracestateMapper.deleteTSyTracestateById(barcode);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,84 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.nanjing.mapper.TRpBarcoderelationshipMapper">
|
||||
|
||||
<resultMap type="TRpBarcoderelationship" id="TRpBarcoderelationshipResult">
|
||||
<result property="ID" column="ID" />
|
||||
<result property="semiBarcode" column="SemiBarcode" />
|
||||
<result property="productBarcode" column="ProductBarcode" />
|
||||
<result property="semibarcodeLine" column="SemiBarcode_Line" />
|
||||
<result property="lineID" column="LineID" />
|
||||
<result property="stateFlag" column="StateFlag" />
|
||||
<result property="insertTime" column="InsertTime" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectTRpBarcoderelationshipVo">
|
||||
select ID, SemiBarcode, ProductBarcode, SemiBarcode_Line, LineID, StateFlag, InsertTime from T_RP_BarcodeRelationShip
|
||||
</sql>
|
||||
|
||||
<select id="selectTRpBarcoderelationshipList" parameterType="TRpBarcoderelationship" resultMap="TRpBarcoderelationshipResult">
|
||||
<include refid="selectTRpBarcoderelationshipVo"/>
|
||||
<where>
|
||||
<if test="semiBarcode != null and semiBarcode != ''"> and SemiBarcode = #{semiBarcode}</if>
|
||||
<if test="productBarcode != null and productBarcode != ''"> and ProductBarcode = #{productBarcode}</if>
|
||||
<if test="semibarcodeLine != null and semibarcodeLine != ''"> and SemiBarcode_Line = #{semibarcodeLine}</if>
|
||||
<if test="lineID != null "> and LineID = #{lineID}</if>
|
||||
<if test="stateFlag != null and stateFlag != ''"> and StateFlag = #{stateFlag}</if>
|
||||
<if test="insertTime != null "> and InsertTime = #{insertTime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectTRpBarcoderelationshipById" parameterType="Long" resultMap="TRpBarcoderelationshipResult">
|
||||
<include refid="selectTRpBarcoderelationshipVo"/>
|
||||
where ID = #{ID}
|
||||
</select>
|
||||
|
||||
<insert id="insertTRpBarcoderelationship" parameterType="TRpBarcoderelationship">
|
||||
insert into T_RP_BarcodeRelationShip
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="ID != null">ID,</if>
|
||||
<if test="semiBarcode != null">SemiBarcode,</if>
|
||||
<if test="productBarcode != null">ProductBarcode,</if>
|
||||
<if test="semibarcodeLine != null">SemiBarcode_Line,</if>
|
||||
<if test="lineID != null">LineID,</if>
|
||||
<if test="stateFlag != null">StateFlag,</if>
|
||||
<if test="insertTime != null">InsertTime,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="ID != null">#{ID},</if>
|
||||
<if test="semiBarcode != null">#{semiBarcode},</if>
|
||||
<if test="productBarcode != null">#{productBarcode},</if>
|
||||
<if test="semibarcodeLine != null">#{semibarcodeLine},</if>
|
||||
<if test="lineID != null">#{lineID},</if>
|
||||
<if test="stateFlag != null">#{stateFlag},</if>
|
||||
<if test="insertTime != null">#{insertTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateTRpBarcoderelationship" parameterType="TRpBarcoderelationship">
|
||||
update T_RP_BarcodeRelationShip
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="semiBarcode != null">SemiBarcode = #{semiBarcode},</if>
|
||||
<if test="productBarcode != null">ProductBarcode = #{productBarcode},</if>
|
||||
<if test="semibarcodeLine != null">SemiBarcode_Line = #{semibarcodeLine},</if>
|
||||
<if test="lineID != null">LineID = #{lineID},</if>
|
||||
<if test="stateFlag != null">StateFlag = #{stateFlag},</if>
|
||||
<if test="insertTime != null">InsertTime = #{insertTime},</if>
|
||||
</trim>
|
||||
where ID = #{ID}
|
||||
</update>
|
||||
|
||||
<delete id="deleteTRpBarcoderelationshipById" parameterType="Long">
|
||||
delete from T_RP_BarcodeRelationShip where ID = #{ID}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteTRpBarcoderelationshipByIds" parameterType="String">
|
||||
delete from T_RP_BarcodeRelationShip where ID in
|
||||
<foreach item="ID" collection="array" open="(" separator="," close=")">
|
||||
#{ID}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,150 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.nanjing.mapper.TSyTracestateMapper">
|
||||
|
||||
<resultMap type="TSyTracestate" id="TSyTracestateResult">
|
||||
<result property="barcode" column="Barcode" />
|
||||
<result property="productID" column="ProductID" />
|
||||
<result property="beginTime" column="BeginTime" />
|
||||
<result property="endTime" column="EndTime" />
|
||||
<result property="shiftID" column="ShiftID" />
|
||||
<result property="groupID" column="GroupID" />
|
||||
<result property="shiftNo" column="ShiftNo" />
|
||||
<result property="semibarcodeA" column="SemiBarcode_A" />
|
||||
<result property="semibarcodeB" column="SemiBarcode_B" />
|
||||
<result property="semibarcodeC" column="SemiBarcode_C" />
|
||||
<result property="productBarcode" column="ProductBarcode" />
|
||||
<result property="semiBarcode2" column="SemiBarcode2" />
|
||||
<result property="shellbarcode" column="shellbarcode" />
|
||||
<result property="nameplateInfo" column="NameplateInfo" />
|
||||
<result property="markRecord" column="MarkRecord" />
|
||||
<result property="attr1" column="Attr1" />
|
||||
<result property="attr2" column="Attr2" />
|
||||
<result property="isDis" column="ISDis" />
|
||||
<result property="disChecker" column="DisChecker" />
|
||||
<result property="disTime" column="DisTime" />
|
||||
<result property="state" column="State" />
|
||||
<result property="currentStationID" column="CurrentStationID" />
|
||||
<result property="nGStationID" column="NGStationID" />
|
||||
<result property="finishFlag" column="FinishFlag" />
|
||||
<result property="d9Remark" column="D9Remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectTSyTracestateVo">
|
||||
select Barcode, ProductID, BeginTime, EndTime, ShiftID, GroupID, ShiftNo, SemiBarcode_A, SemiBarcode_B, SemiBarcode_C, ProductBarcode, SemiBarcode2, shellbarcode, NameplateInfo, MarkRecord, Attr1, Attr2, ISDis, DisChecker, DisTime, State, CurrentStationID, NGStationID, FinishFlag, D9Remark from T_SY_TraceState
|
||||
</sql>
|
||||
|
||||
<select id="selectTSyTracestateList" parameterType="TSyTracestate" resultMap="TSyTracestateResult">
|
||||
<include refid="selectTSyTracestateVo"/>
|
||||
<where>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectTSyTracestateById" parameterType="String" resultMap="TSyTracestateResult">
|
||||
<include refid="selectTSyTracestateVo"/>
|
||||
where Barcode = #{barcode}
|
||||
</select>
|
||||
|
||||
<insert id="insertTSyTracestate" parameterType="TSyTracestate">
|
||||
insert into T_SY_TraceState
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="barcode != null">Barcode,</if>
|
||||
<if test="productID != null">ProductID,</if>
|
||||
<if test="beginTime != null">BeginTime,</if>
|
||||
<if test="endTime != null">EndTime,</if>
|
||||
<if test="shiftID != null">ShiftID,</if>
|
||||
<if test="groupID != null">GroupID,</if>
|
||||
<if test="shiftNo != null">ShiftNo,</if>
|
||||
<if test="semibarcodeA != null">SemiBarcode_A,</if>
|
||||
<if test="semibarcodeB != null">SemiBarcode_B,</if>
|
||||
<if test="semibarcodeC != null">SemiBarcode_C,</if>
|
||||
<if test="productBarcode != null">ProductBarcode,</if>
|
||||
<if test="semiBarcode2 != null">SemiBarcode2,</if>
|
||||
<if test="shellbarcode != null">shellbarcode,</if>
|
||||
<if test="nameplateInfo != null">NameplateInfo,</if>
|
||||
<if test="markRecord != null">MarkRecord,</if>
|
||||
<if test="attr1 != null">Attr1,</if>
|
||||
<if test="attr2 != null">Attr2,</if>
|
||||
<if test="isDis != null">ISDis,</if>
|
||||
<if test="disChecker != null">DisChecker,</if>
|
||||
<if test="disTime != null">DisTime,</if>
|
||||
<if test="state != null">State,</if>
|
||||
<if test="currentStationID != null">CurrentStationID,</if>
|
||||
<if test="nGStationID != null">NGStationID,</if>
|
||||
<if test="finishFlag != null">FinishFlag,</if>
|
||||
<if test="d9Remark != null">D9Remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="barcode != null">#{barcode},</if>
|
||||
<if test="productID != null">#{productID},</if>
|
||||
<if test="beginTime != null">#{beginTime},</if>
|
||||
<if test="endTime != null">#{endTime},</if>
|
||||
<if test="shiftID != null">#{shiftID},</if>
|
||||
<if test="groupID != null">#{groupID},</if>
|
||||
<if test="shiftNo != null">#{shiftNo},</if>
|
||||
<if test="semibarcodeA != null">#{semibarcodeA},</if>
|
||||
<if test="semibarcodeB != null">#{semibarcodeB},</if>
|
||||
<if test="semibarcodeC != null">#{semibarcodeC},</if>
|
||||
<if test="productBarcode != null">#{productBarcode},</if>
|
||||
<if test="semiBarcode2 != null">#{semiBarcode2},</if>
|
||||
<if test="shellbarcode != null">#{shellbarcode},</if>
|
||||
<if test="nameplateInfo != null">#{nameplateInfo},</if>
|
||||
<if test="markRecord != null">#{markRecord},</if>
|
||||
<if test="attr1 != null">#{attr1},</if>
|
||||
<if test="attr2 != null">#{attr2},</if>
|
||||
<if test="isDis != null">#{isDis},</if>
|
||||
<if test="disChecker != null">#{disChecker},</if>
|
||||
<if test="disTime != null">#{disTime},</if>
|
||||
<if test="state != null">#{state},</if>
|
||||
<if test="currentStationID != null">#{currentStationID},</if>
|
||||
<if test="nGStationID != null">#{nGStationID},</if>
|
||||
<if test="finishFlag != null">#{finishFlag},</if>
|
||||
<if test="d9Remark != null">#{d9Remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateTSyTracestate" parameterType="TSyTracestate">
|
||||
update T_SY_TraceState
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="productID != null">ProductID = #{productID},</if>
|
||||
<if test="beginTime != null">BeginTime = #{beginTime},</if>
|
||||
<if test="endTime != null">EndTime = #{endTime},</if>
|
||||
<if test="shiftID != null">ShiftID = #{shiftID},</if>
|
||||
<if test="groupID != null">GroupID = #{groupID},</if>
|
||||
<if test="shiftNo != null">ShiftNo = #{shiftNo},</if>
|
||||
<if test="semibarcodeA != null">SemiBarcode_A = #{semibarcodeA},</if>
|
||||
<if test="semibarcodeB != null">SemiBarcode_B = #{semibarcodeB},</if>
|
||||
<if test="semibarcodeC != null">SemiBarcode_C = #{semibarcodeC},</if>
|
||||
<if test="productBarcode != null">ProductBarcode = #{productBarcode},</if>
|
||||
<if test="semiBarcode2 != null">SemiBarcode2 = #{semiBarcode2},</if>
|
||||
<if test="shellbarcode != null">shellbarcode = #{shellbarcode},</if>
|
||||
<if test="nameplateInfo != null">NameplateInfo = #{nameplateInfo},</if>
|
||||
<if test="markRecord != null">MarkRecord = #{markRecord},</if>
|
||||
<if test="attr1 != null">Attr1 = #{attr1},</if>
|
||||
<if test="attr2 != null">Attr2 = #{attr2},</if>
|
||||
<if test="isDis != null">ISDis = #{isDis},</if>
|
||||
<if test="disChecker != null">DisChecker = #{disChecker},</if>
|
||||
<if test="disTime != null">DisTime = #{disTime},</if>
|
||||
<if test="state != null">State = #{state},</if>
|
||||
<if test="currentStationID != null">CurrentStationID = #{currentStationID},</if>
|
||||
<if test="nGStationID != null">NGStationID = #{nGStationID},</if>
|
||||
<if test="finishFlag != null">FinishFlag = #{finishFlag},</if>
|
||||
<if test="d9Remark != null">D9Remark = #{d9Remark},</if>
|
||||
</trim>
|
||||
where Barcode = #{barcode}
|
||||
</update>
|
||||
|
||||
<delete id="deleteTSyTracestateById" parameterType="String">
|
||||
delete from T_SY_TraceState where Barcode = #{barcode}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteTSyTracestateByIds" parameterType="String">
|
||||
delete from T_SY_TraceState where Barcode in
|
||||
<foreach item="barcode" collection="array" open="(" separator="," close=")">
|
||||
#{barcode}
|
||||
</foreach>
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue