Skip to content

W
warehouse
Commit 22a350e9 by 胡懿
Options

Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy

parents da2a05d8 6218a63f
Showing with 155 additions and 104 deletions
src/main/java/com/jeeplus/modules/warehouse/materialrequisition/entity/MaterialRequisition.java
......@@ -22,6 +22,7 @@ public class MaterialRequisition extends DataEntity<MaterialRequisition> {
private static final long serialVersionUID = 1L;
private String number; // 领用单号
private String status; // 出库状态 1未出库 2已出库
private User operator; // 操作人
// private String receiver; // 领用人
private Office office; // 领用机构
......@@ -72,6 +73,14 @@ public class MaterialRequisition extends DataEntity<MaterialRequisition> {
return time;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public void setTime(Date time) {
this.time = time;
}
......
src/main/java/com/jeeplus/modules/warehouse/materialrequisition/mapper/xml/MaterialRequisitionMapper.xml
......@@ -5,6 +5,7 @@
<sql id="materialRequisitionColumns">
a.id AS "id",
a.number AS "number",
a.status AS "status",
a.operator AS "operator.id",
a.collecting_office_id AS "office.id",
a.time AS "time",
......@@ -87,6 +88,7 @@
INSERT INTO t_wh_material_requisition(
id,
number,
status,
operator,
collecting_office_id,
time,
......@@ -99,6 +101,7 @@
) VALUES (
#{id},
#{number},
#{status},
#{operator.id},
#{office.id},
#{time},
......@@ -114,6 +117,7 @@
<update id="update">
UPDATE t_wh_material_requisition SET
number = #{number},
status = #{status},
operator = #{operator.id},
collecting_office_id = #{office.id},
time = #{time},
......
src/main/java/com/jeeplus/modules/warehouse/materialrequisition/service/MaterialRequisitionService.java
......@@ -68,23 +68,14 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
@Transactional(readOnly = false)
public void save(MaterialRequisition materialRequisition) {
materialRequisition.setStatus("1");
super.save(materialRequisition);
materialRequisitionInfoMapper.delete(new MaterialRequisitionInfo(materialRequisition));
for (MaterialRequisitionInfo materialRequisitionInfo : materialRequisition.getMaterialRequisitionInfoList()){
materialRequisitionInfo.setId(null);
materialRequisitionInfo.setMaterialRequisition(materialRequisition);
if (materialRequisitionInfo.getId() == null){
continue;
}
if (MaterialRequisitionInfo.DEL_FLAG_NORMAL.equals(materialRequisitionInfo.getDelFlag())){
if (StringUtils.isBlank(materialRequisitionInfo.getId())){
materialRequisitionInfo.preInsert();
materialRequisitionInfoMapper.insert(materialRequisitionInfo);
}else{
materialRequisitionInfo.preUpdate();
materialRequisitionInfoMapper.update(materialRequisitionInfo);
}
}else{
materialRequisitionInfoMapper.delete(materialRequisitionInfo);
}
materialRequisitionInfo.preInsert();
materialRequisitionInfoMapper.insert(materialRequisitionInfo);
}
}
......@@ -104,7 +95,8 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
if(materialRequisition.getNumber() == null &&Objects.equals(materialRequisition.getNumber(), "")){
materialRequisition.setNumber(this.createLYDH());
}
this.save(materialRequisition);
materialRequisition.setStatus("2");
super.save(materialRequisition);
Outbound outbound = new Outbound();
//设置相关表单id为领用主表的ID
outbound.setRelationId(materialRequisition.getId());
......
src/main/java/com/jeeplus/modules/warehouse/materialrequisition/web/MaterialRequisitionController.java
......@@ -123,8 +123,14 @@ public class MaterialRequisitionController extends BaseController {
return j;
}
//新增或编辑表单保存
// materialRequisitionService.save(materialRequisition);//保存
materialRequisitionService.delivery(materialRequisition);
if(!Objects.equals(materialRequisition.getStatus(), "2")){
materialRequisitionService.save(materialRequisition);//保存
}else {
j.setSuccess(false);
j.setMsg("该物资领用单已出库不可以修改");
return j;
}
// materialRequisitionService.delivery(materialRequisition);
j.setSuccess(true);
j.setMsg("保存物资领用成功");
......@@ -263,6 +269,11 @@ public class MaterialRequisitionController extends BaseController {
}
//新增或编辑表单保存
// materialRequisitionService.save(materialRequisition);//保存
if(Objects.equals(materialRequisition.getStatus(), "2")){
j.setSuccess(false);
j.setMsg("该物资已领用出库，不可重复领用");
return j;
}
materialRequisitionService.delivery(materialRequisition);
j.setSuccess(true);
j.setMsg("保存物资领用成功");
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.js
......@@ -120,6 +120,16 @@ $(document).ready(function() {
sortName: 'time'
}
,{
field: 'status',
title: '出库状态',
sortable: true,
sortName: 'status',
formatter:function(value, row , index){
return jp.getDictLabel(${fns:toJson(fns:getDictList('wh_delivery_status'))}, value, "-");
}
}
,{
field: 'remarks',
title: '备注信息',
......@@ -142,6 +152,7 @@ $(document).ready(function() {
'check-all.bs.table uncheck-all.bs.table', function () {
$('#remove').prop('disabled', ! $('#materialRequisitionTable').bootstrapTable('getSelections').length);
$('#view,#edit').prop('disabled', $('#materialRequisitionTable').bootstrapTable('getSelections').length!=1);
$('#delivery').prop('disabled', !($('#materialRequisitionTable').bootstrapTable('getSelections').length==1 && $('#materialRequisitionTable').bootstrapTable('getSelections')[0].status == '1'));
});
$("#btnImport").click(function(){
......@@ -278,7 +289,22 @@ $(document).ready(function() {
idx: idx, delBtn: true, row: row
}));
}
/**
* 出库
*/
function onDelivery(){
jp.confirm('确认是否出库？', function (){
jp.get('${ctx}/warehouse/materialrequisition/materialRequisition/delivery?id='+getIdSelections(), function (res){
if(res.success){
jp.success(res.msg);
refresh();
}else{
jp.error(res.msg);
}
})
})
}
</script>
<script type="text/template" id="materialRequisitionChildrenTpl">//<!--
<div class="tabs-container">
......
src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionList.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/webpage/include/taglib.jsp"%>
<%@ include file="/webpage/include/taglib.jsp" %>
<html>
<head>
<title>物资领用管理</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<meta name="decorator" content="ani"/>
<%@ include file="/webpage/include/bootstraptable.jsp"%>
<%@include file="/webpage/include/treeview.jsp" %>
<%@include file="materialRequisitionList.js" %>
<title>物资领用管理</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<meta name="decorator" content="ani"/>
<%@ include file="/webpage/include/bootstraptable.jsp" %>
<%@include file="/webpage/include/treeview.jsp" %>
<%@include file="materialRequisitionList.js" %>
</head>
<body>
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">物资领用列表</h3>
</div>
<div class="panel-body">
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="materialRequisition" class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="领用单号：">领用单号：</label>
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label>
<form:input path="operator" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i class="fa fa-search"></i> 查询</a>
<a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm" ><i class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:import">
<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:export">
<button id="export" class="btn btn-warning">
<i class="fa fa-file-excel-o"></i> 导出
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
</div>
<!-- 表格 -->
<table id="materialRequisitionTable" data-toolbar="#toolbar"></table>
<div class="wrapper wrapper-content">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title">物资领用列表</h3>
</div>
<div class="panel-body">
<!-- context menu -->
<ul id="context-menu" class="dropdown-menu">
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:view">
<li data-item="view"><a>查看</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:edit">
<li data-item="edit"><a>编辑</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:del">
<li data-item="delete"><a>删除</a></li>
</shiro:hasPermission>
<li data-item="action1"><a>取消</a></li>
</ul>
</div>
</div>
</div>
<!-- 搜索 -->
<div id="search-collapse" class="collapse">
<div class="accordion-inner">
<form:form id="searchForm" modelAttribute="materialRequisition"
class="form form-horizontal well clearfix">
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="领用单号：">领用单号：</label>
<form:input path="number" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<label class="label-item single-overflow pull-left" title="操作人：">操作人：</label>
<form:input path="operator" htmlEscape="false" maxlength="64" class=" form-control"/>
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<div style="margin-top:26px">
<a id="search" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
class="fa fa-search"></i> 查询</a>
<a id="reset" class="btn btn-primary btn-rounded btn-bordered btn-sm"><i
class="fa fa-refresh"></i> 重置</a>
</div>
</div>
</form:form>
</div>
</div>
<!-- 工具栏 -->
<div id="toolbar">
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:add">
<button id="add" class="btn btn-primary" onclick="add()">
<i class="glyphicon glyphicon-plus"></i> 新建
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:edit">
<button id="edit" class="btn btn-success" disabled onclick="edit()">
<i class="glyphicon glyphicon-edit"></i> 修改
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:del">
<button id="remove" class="btn btn-danger" disabled onclick="deleteAll()">
<i class="glyphicon glyphicon-remove"></i> 删除
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:import">
<button id="btnImport" class="btn btn-info"><i class="fa fa-folder-open-o"></i> 导入</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:export">
<button id="export" class="btn btn-warning">
<i class="fa fa-file-excel-o"></i> 导出
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:view">
<button id="view" class="btn btn-default" disabled onclick="view()">
<i class="fa fa-search-plus"></i> 查看
</button>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:outbound:outbound:add">
<button id="delivery" class="btn btn-primary" disabled onclick="onDelivery()">
<i class="glyphicon glyphicon-plus"></i> 出库
</button>
</shiro:hasPermission>
</div>
<!-- 表格 -->
<table id="materialRequisitionTable" data-toolbar="#toolbar"></table>
<!-- context menu -->
<ul id="context-menu" class="dropdown-menu">
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:view">
<li data-item="view"><a>查看</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:edit">
<li data-item="edit"><a>编辑</a></li>
</shiro:hasPermission>
<shiro:hasPermission name="warehouse:materialrequisition:materialRequisition:del">
<li data-item="delete"><a>删除</a></li>
</shiro:hasPermission>
<li data-item="action1"><a>取消</a></li>
</ul>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment