修改PDA工单最终提交的接口方法
parent
9e6b5105cb
commit
d3f5b3a78c
@ -0,0 +1,128 @@
|
||||
package com.ruoyi.web.controller.tyre;
|
||||
|
||||
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.system.domain.BizOrderTireDetail;
|
||||
import com.ruoyi.system.service.IBizOrderTireDetailService;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 工单轮胎执行明细Controller
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2026-04-17
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/system/detail")
|
||||
public class BizOrderTireDetailController extends BaseController
|
||||
{
|
||||
private String prefix = "system/detail";
|
||||
|
||||
@Autowired
|
||||
private IBizOrderTireDetailService bizOrderTireDetailService;
|
||||
|
||||
@RequiresPermissions("system:detail:view")
|
||||
@GetMapping()
|
||||
public String detail()
|
||||
{
|
||||
return prefix + "/detail";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询工单轮胎执行明细列表
|
||||
*/
|
||||
@RequiresPermissions("system:detail:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(BizOrderTireDetail bizOrderTireDetail)
|
||||
{
|
||||
startPage();
|
||||
List<BizOrderTireDetail> list = bizOrderTireDetailService.selectBizOrderTireDetailList(bizOrderTireDetail);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出工单轮胎执行明细列表
|
||||
*/
|
||||
@RequiresPermissions("system:detail:export")
|
||||
@Log(title = "工单轮胎执行明细", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(BizOrderTireDetail bizOrderTireDetail)
|
||||
{
|
||||
List<BizOrderTireDetail> list = bizOrderTireDetailService.selectBizOrderTireDetailList(bizOrderTireDetail);
|
||||
ExcelUtil<BizOrderTireDetail> util = new ExcelUtil<BizOrderTireDetail>(BizOrderTireDetail.class);
|
||||
return util.exportExcel(list, "工单轮胎执行明细数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增工单轮胎执行明细
|
||||
*/
|
||||
@RequiresPermissions("system:detail:add")
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
{
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增保存工单轮胎执行明细
|
||||
*/
|
||||
@RequiresPermissions("system:detail:add")
|
||||
@Log(title = "工单轮胎执行明细", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ResponseBody
|
||||
public AjaxResult addSave(BizOrderTireDetail bizOrderTireDetail)
|
||||
{
|
||||
return toAjax(bizOrderTireDetailService.insertBizOrderTireDetail(bizOrderTireDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改工单轮胎执行明细
|
||||
*/
|
||||
@RequiresPermissions("system:detail:edit")
|
||||
@GetMapping("/edit/{detailId}")
|
||||
public String edit(@PathVariable("detailId") Long detailId, ModelMap mmap)
|
||||
{
|
||||
BizOrderTireDetail bizOrderTireDetail = bizOrderTireDetailService.selectBizOrderTireDetailByDetailId(detailId);
|
||||
mmap.put("bizOrderTireDetail", bizOrderTireDetail);
|
||||
return prefix + "/edit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改保存工单轮胎执行明细
|
||||
*/
|
||||
@RequiresPermissions("system:detail:edit")
|
||||
@Log(title = "工单轮胎执行明细", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/edit")
|
||||
@ResponseBody
|
||||
public AjaxResult editSave(BizOrderTireDetail bizOrderTireDetail)
|
||||
{
|
||||
return toAjax(bizOrderTireDetailService.updateBizOrderTireDetail(bizOrderTireDetail));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除工单轮胎执行明细
|
||||
*/
|
||||
@RequiresPermissions("system:detail:remove")
|
||||
@Log(title = "工单轮胎执行明细", businessType = BusinessType.DELETE)
|
||||
@PostMapping( "/remove")
|
||||
@ResponseBody
|
||||
public AjaxResult remove(String ids)
|
||||
{
|
||||
return toAjax(bizOrderTireDetailService.deleteBizOrderTireDetailByDetailIds(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,106 @@
|
||||
<!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>
|
||||
轮胎品牌:<select name="tyreBrand" th:with="type=${@dict.getType('brand')}">
|
||||
<option value="">所有</option>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<p>轮胎类别:</p>
|
||||
<select name="tyreType" th:with="type=${@dict.getType('tyre_type')}">
|
||||
<option value="">所有</option>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</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-warning" onclick="$.table.exportExcel()" shiro:hasPermission="tyre:tyre:export">
|
||||
<i class="fa fa-download"></i> 导出
|
||||
</a>
|
||||
|
||||
</div>
|
||||
<div class="col-sm-12 select-table table-bordered">
|
||||
<table id="bootstrap-table"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<th:block th:include="include :: footer" />
|
||||
<script th:inline="javascript">
|
||||
var prefix = ctx + "demo/table";
|
||||
var datas = [[${@dict.getType('sys_normal_disable')}]];
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/list",
|
||||
showSearch: false,
|
||||
showRefresh: false,
|
||||
showToggle: false,
|
||||
showColumns: false,
|
||||
columns : [
|
||||
[{
|
||||
title : '统计维度',
|
||||
align : 'center',
|
||||
colspan : 2
|
||||
}, {
|
||||
title : '可用轮胎库存',
|
||||
align : 'center',
|
||||
colspan : 4
|
||||
},
|
||||
{
|
||||
title : '在车轮胎',
|
||||
align : 'center',
|
||||
rowspan : 2
|
||||
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
field : 'userId',
|
||||
title : '所属部门'
|
||||
}, {
|
||||
field : 'userCode',
|
||||
title : '所属场站'
|
||||
}, {
|
||||
field : 'userName',
|
||||
title : '全新胎'
|
||||
}, {
|
||||
field : 'userPhone',
|
||||
title : '周转胎'
|
||||
}, {
|
||||
field : 'userEmail',
|
||||
title : '翻新胎'
|
||||
}, {
|
||||
field : 'userBalance',
|
||||
title : '实验胎'
|
||||
}
|
||||
]
|
||||
]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,34 @@
|
||||
package com.ruoyi.system.domain;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class TyreStatVO {
|
||||
/** 所属部门 */
|
||||
private String deptName;
|
||||
/** 所属场站 */
|
||||
private String factoryName;
|
||||
|
||||
/** 可用轮胎库存 - 新胎 */
|
||||
private Integer newTyre;
|
||||
/** 可用轮胎库存 - 周转胎 */
|
||||
private Integer rotateTyre;
|
||||
/** 可用轮胎库存 - 翻新胎 */
|
||||
private Integer remoldTyre;
|
||||
/** 可用轮胎库存 - 修补胎 */
|
||||
private Integer repairTyre;
|
||||
|
||||
/** 在车轮胎 */
|
||||
private Integer onCarTyre;
|
||||
|
||||
/** 维护中/待处理库存 - 待鉴定 */
|
||||
private Integer pendingAppraise;
|
||||
/** 维护中/待处理库存 - 待修补 */
|
||||
private Integer pendingRepair;
|
||||
/** 维护中/待处理库存 - 待翻新 */
|
||||
private Integer pendingRemold;
|
||||
/** 维护中/待处理库存 - 待报废 */
|
||||
private Integer pendingScrap;
|
||||
/** 维护中/待处理库存 - 报废 */
|
||||
private Integer scrapped;
|
||||
}
|
||||
Loading…
Reference in New Issue