森屿海巷
4 years ago
parent
c9725da00b
commit
ef9286ba67
@ -0,0 +1,129 @@
|
||||
package com.ruoyi.web.controller.basic;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.web.controller.tool.UUIDTool;
|
||||
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.PrepareInstoreInfo;
|
||||
import com.ruoyi.system.service.IPrepareInstoreInfoService;
|
||||
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 Frank zhou
|
||||
* @date 2021-09-10
|
||||
*/
|
||||
@Controller
|
||||
@RequestMapping("/system/PrepareInstoreInfo")
|
||||
public class PrepareInstoreInfoController extends BaseController
|
||||
{
|
||||
private String prefix = "system/PrepareInstoreInfo";
|
||||
|
||||
@Autowired
|
||||
private IPrepareInstoreInfoService prepareInstoreInfoService;
|
||||
|
||||
@RequiresPermissions("system:PrepareInstoreInfo:view")
|
||||
@GetMapping()
|
||||
public String PrepareInstoreInfo()
|
||||
{
|
||||
return prefix + "/PrepareInstoreInfo";
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询待入库信息列表
|
||||
*/
|
||||
@RequiresPermissions("system:PrepareInstoreInfo:list")
|
||||
@PostMapping("/list")
|
||||
@ResponseBody
|
||||
public TableDataInfo list(PrepareInstoreInfo prepareInstoreInfo)
|
||||
{
|
||||
startPage();
|
||||
List<PrepareInstoreInfo> list = prepareInstoreInfoService.selectPrepareInstoreInfoList(prepareInstoreInfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出待入库信息列表
|
||||
*/
|
||||
@RequiresPermissions("system:PrepareInstoreInfo:export")
|
||||
@Log(title = "待入库信息", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
@ResponseBody
|
||||
public AjaxResult export(PrepareInstoreInfo prepareInstoreInfo)
|
||||
{
|
||||
List<PrepareInstoreInfo> list = prepareInstoreInfoService.selectPrepareInstoreInfoList(prepareInstoreInfo);
|
||||
ExcelUtil<PrepareInstoreInfo> util = new ExcelUtil<PrepareInstoreInfo>(PrepareInstoreInfo.class);
|
||||
return util.exportExcel(list, "待入库信息数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增待入库信息
|
||||
*/
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
{
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增保存待入库信息
|
||||
*/
|
||||
@RequiresPermissions("system:PrepareInstoreInfo:add")
|
||||
@Log(title = "待入库信息", businessType = BusinessType.INSERT)
|
||||
@PostMapping("/add")
|
||||
@ResponseBody
|
||||
public AjaxResult addSave(PrepareInstoreInfo prepareInstoreInfo)
|
||||
{
|
||||
prepareInstoreInfo.setObjid(UUIDTool.generate());
|
||||
return toAjax(prepareInstoreInfoService.insertPrepareInstoreInfo(prepareInstoreInfo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改待入库信息
|
||||
*/
|
||||
@GetMapping("/edit/{objid}")
|
||||
public String edit(@PathVariable("objid") String objid, ModelMap mmap)
|
||||
{
|
||||
PrepareInstoreInfo prepareInstoreInfo = prepareInstoreInfoService.selectPrepareInstoreInfoByObjid(objid);
|
||||
mmap.put("prepareInstoreInfo", prepareInstoreInfo);
|
||||
return prefix + "/edit";
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改保存待入库信息
|
||||
*/
|
||||
@RequiresPermissions("system:PrepareInstoreInfo:edit")
|
||||
@Log(title = "待入库信息", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/edit")
|
||||
@ResponseBody
|
||||
public AjaxResult editSave(PrepareInstoreInfo prepareInstoreInfo)
|
||||
{
|
||||
return toAjax(prepareInstoreInfoService.updatePrepareInstoreInfo(prepareInstoreInfo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除待入库信息
|
||||
*/
|
||||
@RequiresPermissions("system:PrepareInstoreInfo:remove")
|
||||
@Log(title = "待入库信息", businessType = BusinessType.DELETE)
|
||||
@PostMapping( "/remove")
|
||||
@ResponseBody
|
||||
public AjaxResult remove(String ids)
|
||||
{
|
||||
return toAjax(prepareInstoreInfoService.deletePrepareInstoreInfoByObjids(ids));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,138 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
|
||||
<head>
|
||||
<th:block th:include="include :: header('待入库信息列表')" />
|
||||
</head>
|
||||
<body class="gray-bg">
|
||||
<div class="container-div">
|
||||
<div class="row">
|
||||
<div class="col-sm-12 search-collapse">
|
||||
<form id="formId">
|
||||
<div class="select-list">
|
||||
<ul>
|
||||
<li>
|
||||
<label>任务编号：</label>
|
||||
<input type="text" name="taskCode"/>
|
||||
</li>
|
||||
<li>
|
||||
<label>堆垛机编号：</label>
|
||||
<input type="text" name="pilerCode"/>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="btn-group-sm" id="toolbar" role="group">
|
||||
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:PrepareInstoreInfo:add">
|
||||
<i class="fa fa-plus"></i> 添加
|
||||
</a>
|
||||
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:PrepareInstoreInfo:edit">
|
||||
<i class="fa fa-edit"></i> 修改
|
||||
</a>
|
||||
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:PrepareInstoreInfo:remove">
|
||||
<i class="fa fa-remove"></i> 删除
|
||||
</a>
|
||||
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:PrepareInstoreInfo: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('system:PrepareInstoreInfo:edit')}]];
|
||||
var removeFlag = [[${@permission.hasPermi('system:PrepareInstoreInfo:remove')}]];
|
||||
var operationTypeDatas = [[${@dict.getType('warehousing_type')}]];
|
||||
var instoreStatusDatas = [[${@dict.getType('warehousing_status')}]];
|
||||
var prefix = ctx + "system/PrepareInstoreInfo";
|
||||
|
||||
$(function() {
|
||||
var options = {
|
||||
url: prefix + "/list",
|
||||
createUrl: prefix + "/add",
|
||||
updateUrl: prefix + "/edit/{id}",
|
||||
removeUrl: prefix + "/remove",
|
||||
exportUrl: prefix + "/export",
|
||||
modalName: "待入库信息",
|
||||
columns: [{
|
||||
checkbox: true
|
||||
},
|
||||
{
|
||||
field: 'objid',
|
||||
title: '主键',
|
||||
visible: false
|
||||
},
|
||||
{
|
||||
field: 'taskCode',
|
||||
title: '任务编号'
|
||||
},
|
||||
{
|
||||
field: 'pilerCode',
|
||||
title: '堆垛机编号'
|
||||
},
|
||||
{
|
||||
field: 'materialCode',
|
||||
title: '物料编码'
|
||||
},
|
||||
{
|
||||
field: 'materialType',
|
||||
title: '物料类别'
|
||||
},
|
||||
{
|
||||
field: 'storeCode',
|
||||
title: '目标仓库'
|
||||
},
|
||||
{
|
||||
field: 'locationCode',
|
||||
title: '目标库位'
|
||||
},
|
||||
{
|
||||
field: 'operationType',
|
||||
title: '入库类型',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.selectDictLabel(operationTypeDatas, value);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'instoreStatus',
|
||||
title: '入库状态',
|
||||
formatter: function(value, row, index) {
|
||||
return $.table.selectDictLabel(instoreStatusDatas, value);
|
||||
}
|
||||
},
|
||||
{
|
||||
field: 'beginTime',
|
||||
title: '开始时间'
|
||||
},
|
||||
{
|
||||
field: 'endTime',
|
||||
title: '结束时间'
|
||||
},
|
||||
{
|
||||
field: 'recordTime',
|
||||
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.objid + '\')"><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.objid + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
};
|
||||
$.table.init(options);
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,124 @@
|
||||
<!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-PrepareInstoreInfo-add">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">任务编号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="taskCode" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">堆垛机编号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="pilerCode" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">物料编码：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="materialCode" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">物料类别：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="materialType" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">目标仓库：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="storeCode" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">目标库位：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="locationCode" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">入库类型：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="operationType" class="form-control m-b" th:with="type=${@dict.getType('warehousing_type')}">
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">入库状态：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="instoreStatus" class="form-control m-b" th:with="type=${@dict.getType('warehousing_status')}">
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">开始时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="beginTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">结束时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="endTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">记录时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="recordTime" 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 + "system/PrepareInstoreInfo"
|
||||
$("#form-PrepareInstoreInfo-add").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/add", $('#form-PrepareInstoreInfo-add').serialize());
|
||||
}
|
||||
}
|
||||
|
||||
$("input[name='beginTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='endTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='recordTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,125 @@
|
||||
<!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-PrepareInstoreInfo-edit" th:object="${prepareInstoreInfo}">
|
||||
<input name="objid" th:field="*{objid}" type="hidden">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">任务编号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="taskCode" th:field="*{taskCode}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">堆垛机编号：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="pilerCode" th:field="*{pilerCode}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">物料编码：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="materialCode" th:field="*{materialCode}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">物料类别：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="materialType" th:field="*{materialType}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">目标仓库：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="storeCode" th:field="*{storeCode}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">目标库位：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="locationCode" th:field="*{locationCode}" class="form-control" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">入库类型：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="operationType" class="form-control m-b" th:with="type=${@dict.getType('warehousing_type')}">
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{operationType}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">入库状态：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="instoreStatus" class="form-control m-b" th:with="type=${@dict.getType('warehousing_status')}">
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{instoreStatus}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">开始时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="beginTime" th:value="${#dates.format(prepareInstoreInfo.beginTime, '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>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">结束时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="endTime" th:value="${#dates.format(prepareInstoreInfo.endTime, '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>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-3 control-label">记录时间：</label>
|
||||
<div class="col-sm-8">
|
||||
<div class="input-group date">
|
||||
<input name="recordTime" th:value="${#dates.format(prepareInstoreInfo.recordTime, '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 + "system/PrepareInstoreInfo";
|
||||
$("#form-PrepareInstoreInfo-edit").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
||||
function submitHandler() {
|
||||
if ($.validate.form()) {
|
||||
$.operate.save(prefix + "/edit", $('#form-PrepareInstoreInfo-edit').serialize());
|
||||
}
|
||||
}
|
||||
|
||||
$("input[name='beginTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='endTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
|
||||
$("input[name='recordTime']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: "month",
|
||||
autoclose: true
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,196 @@
|
||||
package com.ruoyi.system.domain;
|
||||
|
||||
import java.util.Date;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 待入库信息对象 prepare_instore_info
|
||||
*
|
||||
* @author Frank zhou
|
||||
* @date 2021-09-10
|
||||
*/
|
||||
public class PrepareInstoreInfo extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private String objid;
|
||||
|
||||
/** 任务编号 */
|
||||
@Excel(name = "任务编号")
|
||||
private String taskCode;
|
||||
|
||||
/** 堆垛机编号 */
|
||||
@Excel(name = "堆垛机编号")
|
||||
private String pilerCode;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
private String materialCode;
|
||||
|
||||
/** 物料类别 */
|
||||
@Excel(name = "物料类别")
|
||||
private String materialType;
|
||||
|
||||
/** 目标仓库 */
|
||||
@Excel(name = "目标仓库")
|
||||
private String storeCode;
|
||||
|
||||
/** 目标库位 */
|
||||
@Excel(name = "目标库位")
|
||||
private String locationCode;
|
||||
|
||||
/** 入库类型 */
|
||||
@Excel(name = "入库类型")
|
||||
private Long operationType;
|
||||
|
||||
/** 入库状态 */
|
||||
@Excel(name = "入库状态")
|
||||
private Long instoreStatus;
|
||||
|
||||
/** 开始时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date beginTime;
|
||||
|
||||
/** 结束时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date endTime;
|
||||
|
||||
/** 记录时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
@Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd")
|
||||
private Date recordTime;
|
||||
|
||||
public void setObjid(String objid)
|
||||
{
|
||||
this.objid = objid;
|
||||
}
|
||||
|
||||
public String getObjid()
|
||||
{
|
||||
return objid;
|
||||
}
|
||||
public void setTaskCode(String taskCode)
|
||||
{
|
||||
this.taskCode = taskCode;
|
||||
}
|
||||
|
||||
public String getTaskCode()
|
||||
{
|
||||
return taskCode;
|
||||
}
|
||||
public void setPilerCode(String pilerCode)
|
||||
{
|
||||
this.pilerCode = pilerCode;
|
||||
}
|
||||
|
||||
public String getPilerCode()
|
||||
{
|
||||
return pilerCode;
|
||||
}
|
||||
public void setMaterialCode(String materialCode)
|
||||
{
|
||||
this.materialCode = materialCode;
|
||||
}
|
||||
|
||||
public String getMaterialCode()
|
||||
{
|
||||
return materialCode;
|
||||
}
|
||||
public void setMaterialType(String materialType)
|
||||
{
|
||||
this.materialType = materialType;
|
||||
}
|
||||
|
||||
public String getMaterialType()
|
||||
{
|
||||
return materialType;
|
||||
}
|
||||
public void setStoreCode(String storeCode)
|
||||
{
|
||||
this.storeCode = storeCode;
|
||||
}
|
||||
|
||||
public String getStoreCode()
|
||||
{
|
||||
return storeCode;
|
||||
}
|
||||
public void setLocationCode(String locationCode)
|
||||
{
|
||||
this.locationCode = locationCode;
|
||||
}
|
||||
|
||||
public String getLocationCode()
|
||||
{
|
||||
return locationCode;
|
||||
}
|
||||
public void setOperationType(Long operationType)
|
||||
{
|
||||
this.operationType = operationType;
|
||||
}
|
||||
|
||||
public Long getOperationType()
|
||||
{
|
||||
return operationType;
|
||||
}
|
||||
public void setInstoreStatus(Long instoreStatus)
|
||||
{
|
||||
this.instoreStatus = instoreStatus;
|
||||
}
|
||||
|
||||
public Long getInstoreStatus()
|
||||
{
|
||||
return instoreStatus;
|
||||
}
|
||||
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 setRecordTime(Date recordTime)
|
||||
{
|
||||
this.recordTime = recordTime;
|
||||
}
|
||||
|
||||
public Date getRecordTime()
|
||||
{
|
||||
return recordTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("objid", getObjid())
|
||||
.append("taskCode", getTaskCode())
|
||||
.append("pilerCode", getPilerCode())
|
||||
.append("materialCode", getMaterialCode())
|
||||
.append("materialType", getMaterialType())
|
||||
.append("storeCode", getStoreCode())
|
||||
.append("locationCode", getLocationCode())
|
||||
.append("operationType", getOperationType())
|
||||
.append("instoreStatus", getInstoreStatus())
|
||||
.append("beginTime", getBeginTime())
|
||||
.append("endTime", getEndTime())
|
||||
.append("recordTime", getRecordTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.PrepareInstoreInfo;
|
||||
|
||||
/**
|
||||
* 待入库信息Mapper接口
|
||||
*
|
||||
* @author Frank zhou
|
||||
* @date 2021-09-10
|
||||
*/
|
||||
public interface PrepareInstoreInfoMapper
|
||||
{
|
||||
/**
|
||||
* 查询待入库信息
|
||||
*
|
||||
* @param objid 待入库信息主键
|
||||
* @return 待入库信息
|
||||
*/
|
||||
public PrepareInstoreInfo selectPrepareInstoreInfoByObjid(String objid);
|
||||
|
||||
/**
|
||||
* 查询待入库信息列表
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 待入库信息集合
|
||||
*/
|
||||
public List<PrepareInstoreInfo> selectPrepareInstoreInfoList(PrepareInstoreInfo prepareInstoreInfo);
|
||||
|
||||
/**
|
||||
* 新增待入库信息
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertPrepareInstoreInfo(PrepareInstoreInfo prepareInstoreInfo);
|
||||
|
||||
/**
|
||||
* 修改待入库信息
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updatePrepareInstoreInfo(PrepareInstoreInfo prepareInstoreInfo);
|
||||
|
||||
/**
|
||||
* 删除待入库信息
|
||||
*
|
||||
* @param objid 待入库信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deletePrepareInstoreInfoByObjid(String objid);
|
||||
|
||||
/**
|
||||
* 批量删除待入库信息
|
||||
*
|
||||
* @param objids 需要删除的数据主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deletePrepareInstoreInfoByObjids(String[] objids);
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.system.domain.PrepareInstoreInfo;
|
||||
|
||||
/**
|
||||
* 待入库信息Service接口
|
||||
*
|
||||
* @author Frank zhou
|
||||
* @date 2021-09-10
|
||||
*/
|
||||
public interface IPrepareInstoreInfoService
|
||||
{
|
||||
/**
|
||||
* 查询待入库信息
|
||||
*
|
||||
* @param objid 待入库信息主键
|
||||
* @return 待入库信息
|
||||
*/
|
||||
public PrepareInstoreInfo selectPrepareInstoreInfoByObjid(String objid);
|
||||
|
||||
/**
|
||||
* 查询待入库信息列表
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 待入库信息集合
|
||||
*/
|
||||
public List<PrepareInstoreInfo> selectPrepareInstoreInfoList(PrepareInstoreInfo prepareInstoreInfo);
|
||||
|
||||
/**
|
||||
* 新增待入库信息
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int insertPrepareInstoreInfo(PrepareInstoreInfo prepareInstoreInfo);
|
||||
|
||||
/**
|
||||
* 修改待入库信息
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 结果
|
||||
*/
|
||||
public int updatePrepareInstoreInfo(PrepareInstoreInfo prepareInstoreInfo);
|
||||
|
||||
/**
|
||||
* 批量删除待入库信息
|
||||
*
|
||||
* @param objids 需要删除的待入库信息主键集合
|
||||
* @return 结果
|
||||
*/
|
||||
public int deletePrepareInstoreInfoByObjids(String objids);
|
||||
|
||||
/**
|
||||
* 删除待入库信息信息
|
||||
*
|
||||
* @param objid 待入库信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
public int deletePrepareInstoreInfoByObjid(String objid);
|
||||
}
|
||||
@ -0,0 +1,94 @@
|
||||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.system.mapper.PrepareInstoreInfoMapper;
|
||||
import com.ruoyi.system.domain.PrepareInstoreInfo;
|
||||
import com.ruoyi.system.service.IPrepareInstoreInfoService;
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
|
||||
/**
|
||||
* 待入库信息Service业务层处理
|
||||
*
|
||||
* @author Frank zhou
|
||||
* @date 2021-09-10
|
||||
*/
|
||||
@Service
|
||||
public class PrepareInstoreInfoServiceImpl implements IPrepareInstoreInfoService
|
||||
{
|
||||
@Autowired
|
||||
private PrepareInstoreInfoMapper prepareInstoreInfoMapper;
|
||||
|
||||
/**
|
||||
* 查询待入库信息
|
||||
*
|
||||
* @param objid 待入库信息主键
|
||||
* @return 待入库信息
|
||||
*/
|
||||
@Override
|
||||
public PrepareInstoreInfo selectPrepareInstoreInfoByObjid(String objid)
|
||||
{
|
||||
return prepareInstoreInfoMapper.selectPrepareInstoreInfoByObjid(objid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询待入库信息列表
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 待入库信息
|
||||
*/
|
||||
@Override
|
||||
public List<PrepareInstoreInfo> selectPrepareInstoreInfoList(PrepareInstoreInfo prepareInstoreInfo)
|
||||
{
|
||||
return prepareInstoreInfoMapper.selectPrepareInstoreInfoList(prepareInstoreInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增待入库信息
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertPrepareInstoreInfo(PrepareInstoreInfo prepareInstoreInfo)
|
||||
{
|
||||
return prepareInstoreInfoMapper.insertPrepareInstoreInfo(prepareInstoreInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改待入库信息
|
||||
*
|
||||
* @param prepareInstoreInfo 待入库信息
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updatePrepareInstoreInfo(PrepareInstoreInfo prepareInstoreInfo)
|
||||
{
|
||||
return prepareInstoreInfoMapper.updatePrepareInstoreInfo(prepareInstoreInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除待入库信息
|
||||
*
|
||||
* @param objids 需要删除的待入库信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deletePrepareInstoreInfoByObjids(String objids)
|
||||
{
|
||||
return prepareInstoreInfoMapper.deletePrepareInstoreInfoByObjids(Convert.toStrArray(objids));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除待入库信息信息
|
||||
*
|
||||
* @param objid 待入库信息主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deletePrepareInstoreInfoByObjid(String objid)
|
||||
{
|
||||
return prepareInstoreInfoMapper.deletePrepareInstoreInfoByObjid(objid);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,102 @@
|
||||
<?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.system.mapper.PrepareInstoreInfoMapper">
|
||||
|
||||
<resultMap type="PrepareInstoreInfo" id="PrepareInstoreInfoResult">
|
||||
<result property="objid" column="objid" />
|
||||
<result property="taskCode" column="task_code" />
|
||||
<result property="pilerCode" column="piler_code" />
|
||||
<result property="materialCode" column="material_code" />
|
||||
<result property="materialType" column="material_type" />
|
||||
<result property="storeCode" column="store_code" />
|
||||
<result property="locationCode" column="location_code" />
|
||||
<result property="operationType" column="operation_type" />
|
||||
<result property="instoreStatus" column="instore_status" />
|
||||
<result property="beginTime" column="begin_time" />
|
||||
<result property="endTime" column="end_time" />
|
||||
<result property="recordTime" column="record_time" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectPrepareInstoreInfoVo">
|
||||
select objid, task_code, piler_code, material_code, material_type, store_code, location_code, operation_type, instore_status, begin_time, end_time, record_time from prepare_instore_info
|
||||
</sql>
|
||||
|
||||
<select id="selectPrepareInstoreInfoList" parameterType="PrepareInstoreInfo" resultMap="PrepareInstoreInfoResult">
|
||||
<include refid="selectPrepareInstoreInfoVo"/>
|
||||
<where>
|
||||
<if test="taskCode != null and taskCode != ''"> and task_code like concat(concat('%', #{taskCode}), '%')</if>
|
||||
<if test="params.beginPilerCode != null and params.beginPilerCode != '' and params.endPilerCode != null and params.endPilerCode != ''"> and piler_code between #{params.beginPilerCode} and #{params.endPilerCode}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectPrepareInstoreInfoByObjid" parameterType="String" resultMap="PrepareInstoreInfoResult">
|
||||
<include refid="selectPrepareInstoreInfoVo"/>
|
||||
where objid = #{objid}
|
||||
</select>
|
||||
|
||||
<insert id="insertPrepareInstoreInfo" parameterType="PrepareInstoreInfo">
|
||||
<!--<selectKey keyProperty="objid" resultType="long" order="BEFORE">
|
||||
SELECT seq_prepare_instore_info.NEXTVAL as objid FROM DUAL
|
||||
</selectKey>-->
|
||||
insert into prepare_instore_info
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="objid != null">objid,</if>
|
||||
<if test="taskCode != null">task_code,</if>
|
||||
<if test="pilerCode != null">piler_code,</if>
|
||||
<if test="materialCode != null">material_code,</if>
|
||||
<if test="materialType != null">material_type,</if>
|
||||
<if test="storeCode != null">store_code,</if>
|
||||
<if test="locationCode != null">location_code,</if>
|
||||
<if test="operationType != null">operation_type,</if>
|
||||
<if test="instoreStatus != null">instore_status,</if>
|
||||
<if test="beginTime != null">begin_time,</if>
|
||||
<if test="endTime != null">end_time,</if>
|
||||
<if test="recordTime != null">record_time,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="objid != null">#{objid},</if>
|
||||
<if test="taskCode != null">#{taskCode},</if>
|
||||
<if test="pilerCode != null">#{pilerCode},</if>
|
||||
<if test="materialCode != null">#{materialCode},</if>
|
||||
<if test="materialType != null">#{materialType},</if>
|
||||
<if test="storeCode != null">#{storeCode},</if>
|
||||
<if test="locationCode != null">#{locationCode},</if>
|
||||
<if test="operationType != null">#{operationType},</if>
|
||||
<if test="instoreStatus != null">#{instoreStatus},</if>
|
||||
<if test="beginTime != null">#{beginTime},</if>
|
||||
<if test="endTime != null">#{endTime},</if>
|
||||
<if test="recordTime != null">#{recordTime},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updatePrepareInstoreInfo" parameterType="PrepareInstoreInfo">
|
||||
update prepare_instore_info
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="taskCode != null">task_code = #{taskCode},</if>
|
||||
<if test="pilerCode != null">piler_code = #{pilerCode},</if>
|
||||
<if test="materialCode != null">material_code = #{materialCode},</if>
|
||||
<if test="materialType != null">material_type = #{materialType},</if>
|
||||
<if test="storeCode != null">store_code = #{storeCode},</if>
|
||||
<if test="locationCode != null">location_code = #{locationCode},</if>
|
||||
<if test="operationType != null">operation_type = #{operationType},</if>
|
||||
<if test="instoreStatus != null">instore_status = #{instoreStatus},</if>
|
||||
<if test="beginTime != null">begin_time = #{beginTime},</if>
|
||||
<if test="endTime != null">end_time = #{endTime},</if>
|
||||
<if test="recordTime != null">record_time = #{recordTime},</if>
|
||||
</trim>
|
||||
where objid = #{objid}
|
||||
</update>
|
||||
|
||||
<delete id="deletePrepareInstoreInfoByObjid" parameterType="String">
|
||||
delete from prepare_instore_info where objid = #{objid}
|
||||
</delete>
|
||||
|
||||
<delete id="deletePrepareInstoreInfoByObjids" parameterType="String">
|
||||
delete from prepare_instore_info where objid in
|
||||
<foreach item="objid" collection="array" open="(" separator="," close=")">
|
||||
#{objid}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue