master
CaesarBao 5 months ago
parent bb7f8e4577
commit 1e5ddca777

@ -0,0 +1,128 @@
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.BaseBarcodePrintinfo;
import com.ruoyi.nanjing.domain.TBdProductinfo;
import com.ruoyi.nanjing.service.IBaseBarcodePrintinfoService;
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.*;
import java.util.List;
/**
* Controller
*
* @author ruoyi
* @date 2024-05-24
*/
@Controller
@RequestMapping("/nanjing/PrintInfo")
public class BaseBarcodePrintinfoController extends BaseController
{
private String prefix = "nanjing/PrintInfo";
@Autowired
private ITBdProductinfoService tBdProductinfoService;
@Autowired
private IBaseBarcodePrintinfoService baseBarcodePrintinfoService;
@RequiresPermissions("nanjing:PrintInfo:view")
@GetMapping()
public String PrintInfo(ModelMap map)
{
List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo());
map.addAttribute("list",tBdProductinfoList);
return prefix + "/PrintInfo";
}
/**
*
*/
@RequiresPermissions("nanjing:PrintInfo:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
startPage();
List<BaseBarcodePrintinfo> list = baseBarcodePrintinfoService.selectBaseBarcodePrintinfoList(baseBarcodePrintinfo);
return getDataTable(list);
}
/**
*
*/
@RequiresPermissions("nanjing:PrintInfo:export")
@Log(title = "条码打印记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ResponseBody
public AjaxResult export(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
List<BaseBarcodePrintinfo> list = baseBarcodePrintinfoService.selectBaseBarcodePrintinfoList(baseBarcodePrintinfo);
ExcelUtil<BaseBarcodePrintinfo> util = new ExcelUtil<BaseBarcodePrintinfo>(BaseBarcodePrintinfo.class);
return util.exportExcel(list, "PrintInfo");
}
/**
*
*/
@GetMapping("/add")
public String add()
{
return prefix + "/add";
}
/**
*
*/
@RequiresPermissions("nanjing:PrintInfo:add")
@Log(title = "条码打印记录", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
public AjaxResult addSave(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return toAjax(baseBarcodePrintinfoService.insertBaseBarcodePrintinfo(baseBarcodePrintinfo));
}
/**
*
*/
@GetMapping("/edit/{ID}")
public String edit(@PathVariable("ID") String ID, ModelMap mmap)
{
BaseBarcodePrintinfo baseBarcodePrintinfo = baseBarcodePrintinfoService.selectBaseBarcodePrintinfoById(ID);
mmap.put("baseBarcodePrintinfo", baseBarcodePrintinfo);
return prefix + "/edit";
}
/**
*
*/
@RequiresPermissions("nanjing:PrintInfo:edit")
@Log(title = "条码打印记录", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
public AjaxResult editSave(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return toAjax(baseBarcodePrintinfoService.updateBaseBarcodePrintinfo(baseBarcodePrintinfo));
}
/**
*
*/
@RequiresPermissions("nanjing:PrintInfo:remove")
@Log(title = "条码打印记录", businessType = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
public AjaxResult remove(String ids)
{
return toAjax(baseBarcodePrintinfoService.deleteBaseBarcodePrintinfoByIds(ids));
}
}

@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.nanjing.domain.BaseRepairinfoRecord; import com.ruoyi.nanjing.domain.BaseRepairinfoRecord;
import com.ruoyi.nanjing.domain.ProRpList; import com.ruoyi.nanjing.domain.ProRpList;
@ -21,10 +22,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* *
@ -47,8 +45,10 @@ public class Rework extends BaseController
@RequiresPermissions("nanjing:ProRpList:view") @RequiresPermissions("nanjing:ProRpList:view")
@GetMapping() @GetMapping()
public String ProRpList(ModelMap map) public String ProRpList(ModelMap map, Locale locale)
{ {
map.put("beginTime", DateUtils.getDate());
map.put("endTime",DateUtils.getDate());
List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo()); List<TBdProductinfo> tBdProductinfoList = tBdProductinfoService.selectTBdProductinfoList(new TBdProductinfo());
map.addAttribute("list",tBdProductinfoList); map.addAttribute("list",tBdProductinfoList);
return prefix + "/Rework"; return prefix + "/Rework";
@ -165,6 +165,10 @@ public class Rework extends BaseController
@PostMapping("/selectRework") @PostMapping("/selectRework")
@ResponseBody @ResponseBody
public TableDataInfo selectRework(ProRpList proRpList){ public TableDataInfo selectRework(ProRpList proRpList){
if(proRpList.getBeginTime()==null || proRpList.getEndTime()==null){
proRpList.setBeginTime(DateUtils.getNowDate());
proRpList.setEndTime(DateUtils.addDays(proRpList.getBeginTime(),1));
}
startPage(); startPage();
List<BaseRepairinfoRecord> list = new ArrayList<>(); List<BaseRepairinfoRecord> list = new ArrayList<>();
list = reworkService.selectRework(proRpList.getBeginTime(),proRpList.getEndTime()); list = reworkService.selectRework(proRpList.getBeginTime(),proRpList.getEndTime());

@ -79,7 +79,7 @@ public class SelectProRpListController extends BaseController
@ResponseBody @ResponseBody
public TableDataInfo getData(ProRpList proRpList) public TableDataInfo getData(ProRpList proRpList)
{ {
// startPage(); startPage();
List<ProRpList> list = new ArrayList<ProRpList>(); List<ProRpList> list = new ArrayList<ProRpList>();
if(proRpList.getBeginTime()==null||proRpList.getEndTime()==null) if(proRpList.getBeginTime()==null||proRpList.getEndTime()==null)
{ {

@ -79,7 +79,7 @@ public class StationParaInfoController extends BaseController {
// s200 210 230 240直接查产品码 5 6 8 9 11 12 // s200 210 230 240直接查产品码 5 6 8 9 11 12
// s300 320 // s300 320
if (stationCode.equals("5")||stationCode.equals("6")||stationCode.equals("8") if (stationCode.equals("5")||stationCode.equals("6")||stationCode.equals("8")
||stationCode.equals("9")||stationCode.equals("11")||stationCode.equals("12") ||stationCode.equals("9")||stationCode.equals("11")||stationCode.equals("12")||stationCode.equals("13")||stationCode.equals("14")||stationCode.equals("15")||stationCode.equals("16")||stationCode.equals("17")||stationCode.equals("18")||stationCode.equals("19")||stationCode.equals("20")
){ ){
map.put("ScanBarcode",productBarcode); map.put("ScanBarcode",productBarcode);
@ -88,15 +88,14 @@ public class StationParaInfoController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
else{ else{
List<Map<String, Object>> list = tracestateService.selectStationPara(map); List<Map<String, Object>> list = tracestateService.selectStationPara(map);
for (int i = 0; i < list.size(); i++) { // for (int i = 0; i < list.size(); i++) {
if (list.get(i).containsKey("系统主条码")) { // if (list.get(i).containsKey("系统主条码")) {
continue; // continue;
} else { // } else {
list.get(i).put("系统主条码", "-"); // list.get(i).put("系统主条码", "-");
} // }
} // }
return getDataTable(list); return getDataTable(list);
} }
} }

@ -1,5 +1,6 @@
package com.ruoyi.web.controller.nanjing; package com.ruoyi.web.controller.nanjing;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -50,7 +51,14 @@ public class TRpBarcoderelationshipController extends BaseController
public TableDataInfo list(TRpBarcoderelationship tRpBarcoderelationship) public TableDataInfo list(TRpBarcoderelationship tRpBarcoderelationship)
{ {
startPage(); startPage();
List<TRpBarcoderelationship> list = tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship); if (tRpBarcoderelationship.getProductBarcode() == "")
return getDataTable(new ArrayList());
List<TRpBarcoderelationship> list1 = this.tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship);
if (list1.stream().count() > 0L) {
tRpBarcoderelationship.setSemiBarcode(((TRpBarcoderelationship)list1.get(0)).getSemiBarcode());
tRpBarcoderelationship.setProductBarcode(null);
}
List<TRpBarcoderelationship> list = this.tRpBarcoderelationshipService.selectTRpBarcoderelationshipList(tRpBarcoderelationship);
return getDataTable(list); return getDataTable(list);
} }

@ -17,7 +17,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口默认为80 # 服务器的HTTP端口默认为80
port: 9080 port: 9099
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /

@ -10,26 +10,26 @@
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li> <!-- <li>-->
<label>Semi</label> <!-- <label>Semi</label>-->
<input type="text" name="semiBarcode"/> <!-- <input type="text" name="semiBarcode"/>-->
</li> <!-- </li>-->
<li> <li>
<label>产品条码:</label> <label>产品条码:</label>
<input type="text" name="productBarcode"/> <input type="text" name="productBarcode"/>
</li> </li>
<li> <!-- <li>-->
<label>支线条码:</label> <!-- <label>支线条码:</label>-->
<input type="text" name="semibarcodeLine"/> <!-- <input type="text" name="semibarcodeLine"/>-->
</li> <!-- </li>-->
<li> <!-- <li>-->
<label>所属支线ID</label> <!-- <label>所属支线ID</label>-->
<input type="text" name="lineID"/> <!-- <input type="text" name="lineID"/>-->
</li> <!-- </li>-->
<li> <!-- <li>-->
<label>是否生效:</label> <!-- <label>是否生效:</label>-->
<input type="text" name="stateFlag"/> <!-- <input type="text" name="stateFlag"/>-->
</li> <!-- </li>-->
<li class="select-time"> <li class="select-time">
<label>记录时间:</label> <label>记录时间:</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginInsertTime]"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginInsertTime]"/>
@ -88,24 +88,24 @@
}, },
{ {
field: 'semiBarcode', field: 'semiBarcode',
title: 'Semi' title: '序列号'
}, },
{ {
field: 'productBarcode', field: 'productBarcode',
title: '产品条码' title: '产品条码'
}, },
{ {
field: 'semibarcodeLine', field: 'matirialBarcode',
title: '支线条码' title: '定转子条码'
}, },
{ {
field: 'lineID', field: 'lineID',
title: '所属支线ID' title: '组件类别'
},
{
field: 'stateFlag',
title: '是否生效'
}, },
// {
// field: 'stateFlag',
// title: '是否生效'
// },
{ {
field: 'insertTime', field: 'insertTime',
title: '记录时间' title: '记录时间'

@ -0,0 +1,144 @@
<!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>${comment}</label>-->
<!-- <input type="text" name="ID"/>-->
<!-- </li>-->
<li>
<label>产品条码:</label>
<input type="text" name="ProductBarcode"/>
</li>
<li>
<label>序列号:</label>
<input type="text" name="SerialNo"/>
</li>
<!-- <li>-->
<!-- <label>是否补码:</label>-->
<!-- <input type="text" name="IsRestart"/>-->
<!-- </li>-->
<li>
<label>产品型号:</label>
<!-- <input type="text" name="ProductID"/>-->
<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>
<input type="text" name="ShiftID"/>
</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 class="select-time" >-->
<!-- <label>时间区间: </label>-->
<!-- <input type="text" style="width:160px" class="form-control" id="InsertTime" placeholder="开始时间">-->
<!-- <span>-</span>-->
<!-- <input type="text" style="width:160px" class="form-control" id="InsertTime" placeholder="结束时间">-->
<!-- </li>-->
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</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="system:PrintInfo:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:PrintInfo:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:PrintInfo:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="nanjing:PrintInfo: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:PrintInfo:edit')}]];
var removeFlag = [[${@permission.hasPermi('nanjing:PrintInfo:remove')}]];
var prefix = ctx + "nanjing/PrintInfo";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "条码打印记录",
columns: [
// {
// checkbox: true
// },
// {
// field: 'id',
// title: '编号'
// },
{
field: 'productBarcode',
title: '产品条码'
},
{
field: 'serialNo',
title: '序列号'
},
// {
// field: 'isRestart',
// title: '是否补码'
// },
{
field: 'tBdProductinfo.productName',
title: '产品型号'
},
{
field: 'shiftID',
title: '班次'
},
{
field: 'insertTime',
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.ID + '\')"><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.ID + '\')"><i class="fa fa-remove"></i>删除</a>');
// return actions.join('');
// }
// }
]
};
$.table.init(options);
});
</script>
</body>
</html>

@ -0,0 +1,78 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增条码打印记录')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-PrintInfo-add">
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ID" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductBarcode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="SerialNo" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="IsRestart" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductID" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ShiftID" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="InsertTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "nanjing/PrintInfo"
$("#form-PrintInfo-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-PrintInfo-add').serialize());
}
}
$("input[name='InsertTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -0,0 +1,79 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改条码打印记录')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-PrintInfo-edit" th:object="${baseBarcodePrintinfo}">
<input name="ID" th:field="*{ID}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ID" th:field="*{ID}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductBarcode" th:field="*{ProductBarcode}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="SerialNo" th:field="*{SerialNo}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="IsRestart" th:field="*{IsRestart}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ProductID" th:field="*{ProductID}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<input name="ShiftID" th:field="*{ShiftID}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">${comment}</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="InsertTime" th:value="${#dates.format(baseBarcodePrintinfo.InsertTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript">
var prefix = ctx + "nanjing/PrintInfo";
$("#form-PrintInfo-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-PrintInfo-edit').serialize());
}
}
$("input[name='InsertTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
</script>
</body>
</html>

@ -79,10 +79,10 @@
field: 'productName', field: 'productName',
title: '机种名称' title: '机种名称'
}, },
// { {
// field: 'semiBarcode', field: 'semiBarcode',
// title: '产品条码' title: '组件条码'
// }, },
{ {
field: 'state', field: 'state',
title: '状态' title: '状态'

@ -52,7 +52,7 @@
}, },
{ {
field:'id', field:'id',
title:'id' title:'编号'
}, },
// { // {
// field: 'barcode', // field: 'barcode',
@ -62,10 +62,85 @@
field: 'productBarcode', field: 'productBarcode',
title: '机种码' title: '机种码'
}, },
// { {
// field: 'semiBarcode', field: 'ngStation',
// title: '产品条码' title: 'NG工位',
// }, formatter:function (value, row, index) {
if (value == 1) {
return "S100电机壳压销";
} else if (value == 2) {
return "S110电机壳压销2";
} else if (value == 3) {
return "S110定子放入电机机壳后上线";
} else if (value == 4) {
return "10轴承压入电机壳底部";
} else if (value == 5) {
return "S200前盖轴承轴封挡圈压入";
} else if (value == 6) {
return "S210前盖压销";
} else if (value == 7) {
return "S220曲轴压入转子";
} else if (value == 8) {
return "S230曲轴组件和前盖轴承装配";
} else if (value == 9) {
return "S240转子充磁";
} else if (value == 10) {
return "20前盖组件放入电池壳";
} else if (value == 11) {
return "S300静盘正反面压销";
} else if (value == 12) {
return "S320动静盘组件高度测量";
} else if (value == 13) {
return "30动静盘组件安装";
} else if (value == 14) {
return "40机盘背面和机壳端面高度测量";
} else if (value == 15) {
return "50后盖安装和螺栓预拧";
} else if (value == 16) {
return "60后盖螺栓紧固";
} else if (value == 17) {
return "70后盖螺栓测量";
} else if (value == 18) {
return "100玻璃接线柱高度测量";
} else if (value == 19) {
return "110玻璃接线柱螺栓紧固";
} else if (value == 20) {
return "120裸机绝缘耐压检测";
} else if (value == 21) {
return "130法兰安装、抽真空、充氦气";
} else if (value == 22) {
return "140氦气检漏";
} else if (value == 23) {
return "150氦气回收";
} else if (value == 24) {
return "160导热硅脂喷涂";
} else if (value == 25) {
return "180控制器螺栓紧固";
} else if (value == 26) {
return "190控制器检漏";
} else if (value == 27) {
return "200整机翻转";
} else if (value == 28) {
return "210整机称重、注油";
} else if (value == 29) {
return "220整机绝缘测试和法兰安装";
} else if (value == 30) {
return "230_1性能测试高速";
} else if (value == 31) {
return "230_2性能测试低速";
} else if (value == 32) {
return "250整机补油";
} else if (value == 33) {
return "260密封塞安装、抽真空充氦气";
} else if (value == 34) {
return "270铭牌打印";
} else if (value == 35) {
return "S300静盘正反面压销-2";
} else if (value == 36) {
return "S110定子放入电机壳加热";
}
}
},
{ {
field: 'reStartStation', field: 'reStartStation',
title: '重启工位', title: '重启工位',

@ -0,0 +1,131 @@
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;
/**
* base_Barcode_PrintInfo
*
* @author ruoyi
* @date 2024-05-24
*/
public class BaseBarcodePrintinfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
@Excel(name = "编号")
private String ID;
/** $column.columnComment */
@Excel(name = "产品条码")
private String ProductBarcode;
/** $column.columnComment */
@Excel(name = "序列号")
private String SerialNo;
/** $column.columnComment */
@Excel(name = "是否补码")
private Long IsRestart;
/** $column.columnComment */
@Excel(name = "产品型号")
private Long ProductID;
/** $column.columnComment */
@Excel(name = "班次")
private String ShiftID;
/** $column.columnComment */
@Excel(name = "记录时间")
private Date InsertTime;
public TBdProductinfo gettBdProductinfo() {
return tBdProductinfo;
}
public void settBdProductinfo(TBdProductinfo tBdProductinfo) {
this.tBdProductinfo = tBdProductinfo;
}
private TBdProductinfo tBdProductinfo;
public void setID(String ID)
{
this.ID = ID;
}
public String getID()
{
return ID;
}
public void setProductBarcode(String ProductBarcode)
{
this.ProductBarcode = ProductBarcode;
}
public String getProductBarcode()
{
return ProductBarcode;
}
public void setSerialNo(String SerialNo)
{
this.SerialNo = SerialNo;
}
public String getSerialNo()
{
return SerialNo;
}
public void setIsRestart(Long IsRestart)
{
this.IsRestart = IsRestart;
}
public Long getIsRestart()
{
return IsRestart;
}
public void setProductID(Long ProductID)
{
this.ProductID = ProductID;
}
public Long getProductID()
{
return ProductID;
}
public void setShiftID(String ShiftID)
{
this.ShiftID = ShiftID;
}
public String getShiftID()
{
return ShiftID;
}
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("ProductBarcode", getProductBarcode())
.append("SerialNo", getSerialNo())
.append("IsRestart", getIsRestart())
.append("ProductID", getProductID())
.append("ShiftID", getShiftID())
.append("InsertTime", getInsertTime())
.toString();
}
}

@ -7,6 +7,8 @@ public class BaseRepairinfoRecord {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String ngStation;
private Integer id; private Integer id;
private String barcode; private String barcode;
@ -67,4 +69,12 @@ public class BaseRepairinfoRecord {
", recordTime=" + recordTime + ", recordTime=" + recordTime +
'}'; '}';
} }
public String getNgStation() {
return ngStation;
}
public void setNgStation(String ngStation) {
this.ngStation = ngStation;
}
} }

@ -26,14 +26,15 @@ public class TRpBarcoderelationship extends BaseEntity
/** 产品条码 */ /** 产品条码 */
@Excel(name = "产品条码") @Excel(name = "产品条码")
private String productBarcode; private String productBarcode;
@Excel(name = "组件条码")
private String matirialBarcode;
/** 支线条码 */ /** 支线条码 */
@Excel(name = "支线条码") @Excel(name = "支线条码")
private String semibarcodeLine; private String semibarcodeLine;
/** 所属支线ID */ /** 所属支线ID */
@Excel(name = "所属支线ID") @Excel(name = "所属支线ID")
private Long lineID; private String lineID;
/** 是否生效 */ /** 是否生效 */
@Excel(name = "是否生效") @Excel(name = "是否生效")
@ -79,15 +80,7 @@ public class TRpBarcoderelationship extends BaseEntity
{ {
return semibarcodeLine; return semibarcodeLine;
} }
public void setLineID(Long lineID)
{
this.lineID = lineID;
}
public Long getLineID()
{
return lineID;
}
public void setStateFlag(String stateFlag) public void setStateFlag(String stateFlag)
{ {
this.stateFlag = stateFlag; this.stateFlag = stateFlag;
@ -119,4 +112,20 @@ public class TRpBarcoderelationship extends BaseEntity
.append("insertTime", getInsertTime()) .append("insertTime", getInsertTime())
.toString(); .toString();
} }
public String getLineID() {
return lineID;
}
public void setLineID(String lineID) {
this.lineID = lineID;
}
public String getMatirialBarcode() {
return matirialBarcode;
}
public void setMatirialBarcode(String matirialBarcode) {
this.matirialBarcode = matirialBarcode;
}
} }

@ -0,0 +1,62 @@
package com.ruoyi.nanjing.mapper;
import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo;
import java.util.List;
/**
* Mapper
*
* @author ruoyi
* @date 2024-05-24
*/
public interface BaseBarcodePrintinfoMapper
{
/**
*
*
* @param ID ID
* @return
*/
public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public List<BaseBarcodePrintinfo> selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param ID ID
* @return
*/
public int deleteBaseBarcodePrintinfoById(String ID);
/**
*
*
* @param IDs ID
* @return
*/
public int deleteBaseBarcodePrintinfoByIds(String[] IDs);
}

@ -0,0 +1,62 @@
package com.ruoyi.nanjing.service;
import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @date 2024-05-24
*/
public interface IBaseBarcodePrintinfoService
{
/**
*
*
* @param ID ID
* @return
*/
public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public List<BaseBarcodePrintinfo> selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo);
/**
*
*
* @param ids ID
* @return
*/
public int deleteBaseBarcodePrintinfoByIds(String ids);
/**
*
*
* @param ID ID
* @return
*/
public int deleteBaseBarcodePrintinfoById(String ID);
}

@ -0,0 +1,95 @@
package com.ruoyi.nanjing.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.nanjing.domain.BaseBarcodePrintinfo;
import com.ruoyi.nanjing.mapper.BaseBarcodePrintinfoMapper;
import com.ruoyi.nanjing.service.IBaseBarcodePrintinfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Service
*
* @author ruoyi
* @date 2024-05-24
*/
@Service
public class BaseBarcodePrintinfoServiceImpl implements IBaseBarcodePrintinfoService
{
@Autowired
private BaseBarcodePrintinfoMapper baseBarcodePrintinfoMapper;
/**
*
*
* @param ID ID
* @return
*/
@Override
public BaseBarcodePrintinfo selectBaseBarcodePrintinfoById(String ID)
{
return baseBarcodePrintinfoMapper.selectBaseBarcodePrintinfoById(ID);
}
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
@Override
public List<BaseBarcodePrintinfo> selectBaseBarcodePrintinfoList(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return baseBarcodePrintinfoMapper.selectBaseBarcodePrintinfoList(baseBarcodePrintinfo);
}
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
@Override
public int insertBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return baseBarcodePrintinfoMapper.insertBaseBarcodePrintinfo(baseBarcodePrintinfo);
}
/**
*
*
* @param baseBarcodePrintinfo
* @return
*/
@Override
public int updateBaseBarcodePrintinfo(BaseBarcodePrintinfo baseBarcodePrintinfo)
{
return baseBarcodePrintinfoMapper.updateBaseBarcodePrintinfo(baseBarcodePrintinfo);
}
/**
*
*
* @param ids ID
* @return
*/
@Override
public int deleteBaseBarcodePrintinfoByIds(String ids)
{
return baseBarcodePrintinfoMapper.deleteBaseBarcodePrintinfoByIds(Convert.toStrArray(ids));
}
/**
*
*
* @param ID ID
* @return
*/
@Override
public int deleteBaseBarcodePrintinfoById(String ID)
{
return baseBarcodePrintinfoMapper.deleteBaseBarcodePrintinfoById(ID);
}
}

@ -0,0 +1,95 @@
<?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.BaseBarcodePrintinfoMapper">
<resultMap type="BaseBarcodePrintinfo" id="BaseBarcodePrintinfoResult">
<result property="ID" column="ID" />
<result property="ProductBarcode" column="ProductBarcode" />
<result property="SerialNo" column="SerialNo" />
<result property="IsRestart" column="IsRestart" />
<result property="ProductID" column="ProductID" />
<result property="ShiftID" column="ShiftID" />
<result property="InsertTime" column="InsertTime" />
<association property="tBdProductinfo" column="productName" javaType="com.ruoyi.nanjing.domain.TBdProductinfo" resultMap="prodName"/>
</resultMap>
<resultMap id="prodName" type="com.ruoyi.nanjing.domain.TBdProductinfo">
<result property="productName" column="ProductName"></result>
</resultMap>
<sql id="selectBaseBarcodePrintinfoVo">
select t1.ID, t1.ProductBarcode, t1.SerialNo, t1.IsRestart, t1.ProductID, t2.ProductName,t1.ShiftID, t1.InsertTime from base_Barcode_PrintInfo t1
left join T_BD_ProductInfo t2 on t1.ProductId = t2.ProductID
</sql>
<select id="selectBaseBarcodePrintinfoList" parameterType="BaseBarcodePrintinfo" resultMap="BaseBarcodePrintinfoResult">
<include refid="selectBaseBarcodePrintinfoVo"/>
<where>
<if test="ID != null and ID != ''"> and t1.ID = #{ID}</if>
<if test="ProductBarcode != null and ProductBarcode != ''"> and t1.ProductBarcode = #{ProductBarcode}</if>
<if test="SerialNo != null and SerialNo != ''"> and t1.SerialNo = #{SerialNo}</if>
<if test="IsRestart != null "> and t1.IsRestart = #{IsRestart}</if>
<if test="ProductID != null "> and t1.ProductID = #{ProductID}</if>
<if test="ShiftID != null and ShiftID != ''"> and t1.ShiftID = #{ShiftID}</if>
<!-- <if test="InsertTime != null "> and t1.InsertTime = #{InsertTime}</if>-->
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND datediff(dd,#{params.beginTime},t1.InsertTime)>=0
</if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND datediff(dd,t1.InsertTime,#{params.endTime})>=0
</if>
</where>
</select>
<select id="selectBaseBarcodePrintinfoById" parameterType="String" resultMap="BaseBarcodePrintinfoResult">
<include refid="selectBaseBarcodePrintinfoVo"/>
where ID = #{ID}
</select>
<insert id="insertBaseBarcodePrintinfo" parameterType="BaseBarcodePrintinfo">
insert into base_Barcode_PrintInfo
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ID != null">ID,</if>
<if test="ProductBarcode != null">ProductBarcode,</if>
<if test="SerialNo != null">SerialNo,</if>
<if test="IsRestart != null">IsRestart,</if>
<if test="ProductID != null">ProductID,</if>
<if test="ShiftID != null">ShiftID,</if>
<if test="InsertTime != null">InsertTime,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ID != null">#{ID},</if>
<if test="ProductBarcode != null">#{ProductBarcode},</if>
<if test="SerialNo != null">#{SerialNo},</if>
<if test="IsRestart != null">#{IsRestart},</if>
<if test="ProductID != null">#{ProductID},</if>
<if test="ShiftID != null">#{ShiftID},</if>
<if test="InsertTime != null">#{InsertTime},</if>
</trim>
</insert>
<update id="updateBaseBarcodePrintinfo" parameterType="BaseBarcodePrintinfo">
update base_Barcode_PrintInfo
<trim prefix="SET" suffixOverrides=",">
<if test="ProductBarcode != null">ProductBarcode = #{ProductBarcode},</if>
<if test="SerialNo != null">SerialNo = #{SerialNo},</if>
<if test="IsRestart != null">IsRestart = #{IsRestart},</if>
<if test="ProductID != null">ProductID = #{ProductID},</if>
<if test="ShiftID != null">ShiftID = #{ShiftID},</if>
<if test="InsertTime != null">InsertTime = #{InsertTime},</if>
</trim>
where ID = #{ID}
</update>
<delete id="deleteBaseBarcodePrintinfoById" parameterType="String">
delete from base_Barcode_PrintInfo where ID = #{ID}
</delete>
<delete id="deleteBaseBarcodePrintinfoByIds" parameterType="String">
delete from base_Barcode_PrintInfo where ID in
<foreach item="ID" collection="array" open="(" separator="," close=")">
#{ID}
</foreach>
</delete>
</mapper>

@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectProLists" parameterType="map" statementType="CALLABLE" resultMap="ProRpList"> <select id="selectProLists" parameterType="map" statementType="CALLABLE" resultMap="ProRpList">
{ {
call pro_ProRpList call pro_ProRpList_copy
( (
#{beginTime,mode=IN,jdbcType=DATE}, #{beginTime,mode=IN,jdbcType=DATE},
#{endTime,mode=IN,jdbcType=DATE}, #{endTime,mode=IN,jdbcType=DATE},

@ -19,14 +19,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="selectTRpBarcoderelationshipList" parameterType="TRpBarcoderelationship" resultMap="TRpBarcoderelationshipResult"> <select id="selectTRpBarcoderelationshipList" parameterType="TRpBarcoderelationship" resultMap="TRpBarcoderelationshipResult">
<include refid="selectTRpBarcoderelationshipVo"/> select ID, SemiBarcode, t1.ProductBarcode, SemiBarcode_Line, CASE WHEN LineID=1 THEN '壳体码'when LineID = 2 then '前盖码'when LineID = 3 then '动盘码'when LineID =4 then '静盘码' WHEN LineID = 5 then '后盖码' WHEN LineID = 0 then '控制器码' end as lineID,t2.MatirialBarcode, StateFlag, t1.InsertTime from T_RP_BarcodeRelationShip
t1
left join dbo.T_RP_MatirialBarcodeRelationShip t2 on t1.ProductBarcode = t2.ProductBarcode
<where> <where>
<if test="semiBarcode != null and semiBarcode != ''"> and SemiBarcode = #{semiBarcode}</if> <if test="semiBarcode != null and semiBarcode != ''"> and SemiBarcode = #{semiBarcode}</if>
<if test="productBarcode != null and productBarcode != ''"> and ProductBarcode = #{productBarcode}</if> <if test="productBarcode != null and productBarcode != ''"> and t1.ProductBarcode = #{productBarcode}</if>
<if test="semibarcodeLine != null and semibarcodeLine != ''"> and SemiBarcode_Line = #{semibarcodeLine}</if> <if test="semibarcodeLine != null and semibarcodeLine != ''"> and SemiBarcode_Line = #{semibarcodeLine}</if>
<if test="lineID != null "> and LineID = #{lineID}</if> <if test="lineID != null "> and LineID = #{lineID}</if>
<if test="stateFlag != null and stateFlag != ''"> and StateFlag = #{stateFlag}</if> <if test="stateFlag != null and stateFlag != ''"> and StateFlag = #{stateFlag}</if>
<if test="insertTime != null "> and InsertTime = #{insertTime}</if> <if test="insertTime != null "> and t1.InsertTime = #{insertTime}</if>
</where> </where>
</select> </select>

Loading…
Cancel
Save