Skip to content

W
warehouse
Commit 2d68aa17 by zhanglt
Options

货架信息表代码

parent a2ae1320
Showing with 37 additions and 33 deletions
src/main/java/com/jeeplus/modules/warehouse/shelves/entity/Shelves.java
......@@ -6,6 +6,7 @@ package com.jeeplus.modules.warehouse.shelves.entity;
import com.jeeplus.core.persistence.DataEntity;
import com.jeeplus.common.utils.excel.annotation.ExcelField;
import com.jeeplus.modules.warehouse.warehouse.entity.Warehouse;
/**
* 货架信息Entity
......@@ -17,7 +18,7 @@ public class Shelves extends DataEntity<Shelves> {
private static final long serialVersionUID = 1L;
private String name; // 货架名称
private String number; // 货架编号
private String warehouse; // 仓库id
private Warehouse warehouse; // 仓库id
public Shelves() {
super();
......@@ -46,11 +47,11 @@ public class Shelves extends DataEntity<Shelves> {
}
@ExcelField(title="仓库id", dictType="", align=2, sort=3)
public String getWarehouse() {
public Warehouse getWarehouse() {
return warehouse;
}
public void setWarehouse(String warehouse) {
public void setWarehouse(Warehouse warehouse) {
this.warehouse = warehouse;
}
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeForm.jsp
......@@ -34,36 +34,37 @@
<form:form id="inputForm" modelAttribute="materialType" action="${ctx}/warehouse/materialtype/materialType/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<div class="form-group">
<label class="col-sm-2 control-label">备注信息：</label>
<label class="col-sm-2 control-label"><font color="red">*</font>名称：</label>
<div class="col-sm-10">
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
<form:input path="name" htmlEscape="false" class="form-control required"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">上级父级编号:</label>
<label class="col-sm-2 control-label"><font color="red">*</font>排序：</label>
<div class="col-sm-10">
<sys:treeselect id="parent" name="parent.id" value="${materialType.parent.id}" labelName="parent.name" labelValue="${materialType.parent.name}"
title="父级编号" url="/warehouse/materialtype/materialType/treeData" extId="${materialType.id}" cssClass="form-control " allowClear="true"/>
<form:input path="sort" htmlEscape="false" class="form-control required"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><font color="red">*</font>名称：</label>
<label class="col-sm-2 control-label">物资类型编码：</label>
<div class="col-sm-10">
<form:input path="name" htmlEscape="false" class="form-control required"/>
<form:input path="code" htmlEscape="false" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"><font color="red">*</font>排序：</label>
<label class="col-sm-2 control-label">备注信息：</label>
<div class="col-sm-10">
<form:input path="sort" htmlEscape="false" class="form-control required"/>
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">物资类型编码：</label>
<label class="col-sm-2 control-label">上级父级编号:</label>
<div class="col-sm-10">
<form:input path="code" htmlEscape="false" class="form-control "/>
<sys:treeselect id="parent" name="parent.id" value="${materialType.parent.id}" labelName="parent.name" labelValue="${materialType.parent.name}"
title="父级编号" url="/warehouse/materialtype/materialType/treeData" extId="${materialType.id}" cssClass="form-control " allowClear="true"/>
</div>
</div>
<c:if test="${mode == 'add' || mode=='edit'}">
<div class="col-lg-3"></div>
<div class="col-lg-6">
......
src/main/webapp/webpage/modules/warehouse/materialtype/materialTypeList.jsp
......@@ -31,9 +31,9 @@
<table id="materialTypeTreeTable" class="table table-hover">
<thead>
<tr>
<th>备注信息</th>
<th>名称</th>
<th>物资类型编码</th>
<th>备注信息</th>
<th>操作</th>
</tr>
</thead>
......
src/main/webapp/webpage/modules/warehouse/shelves/shelvesForm.jsp
......@@ -48,7 +48,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">仓库id：</label>
<div class="col-sm-10">
<form:radiobuttons path="warehouse.id" items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false" class="i-checks "/>
<form:input path="warehouse.id" htmlEscape="false" class="form-control"/>
</div>
</div>
<div class="form-group">
......
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseForm.jsp
......@@ -34,12 +34,6 @@
<form:form id="inputForm" modelAttribute="warehouse" action="${ctx}/warehouse/warehouse/warehouse/save" method="post" class="form-horizontal">
<form:hidden path="id"/>
<div class="form-group">
<label class="col-sm-2 control-label">备注信息：</label>
<div class="col-sm-10">
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">仓库名称：</label>
<div class="col-sm-10">
<form:input path="name" htmlEscape="false" class="form-control "/>
......@@ -51,6 +45,13 @@
<form:input path="code" htmlEscape="false" class="form-control "/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">备注信息：</label>
<div class="col-sm-10">
<form:textarea path="remarks" htmlEscape="false" rows="4" class="form-control "/>
</div>
</div>
<c:if test="${mode == 'add' || mode=='edit'}">
<div class="col-lg-3"></div>
<div class="col-lg-6">
......
src/main/webapp/webpage/modules/warehouse/warehouse/warehouseList.js
......@@ -85,10 +85,10 @@ $(document).ready(function() {
}
,{
field: 'remarks',
title: '备注信息',
field: 'name',
title: '仓库名称',
sortable: true,
sortName: 'remarks'
sortName: 'name'
,formatter:function(value, row , index){
value = jp.unescapeHTML(value);
<c:choose>
......@@ -103,14 +103,6 @@ $(document).ready(function() {
</c:otherwise>
</c:choose>
}
}
,{
field: 'name',
title: '仓库名称',
sortable: true,
sortName: 'name'
}
,{
field: 'code',
......@@ -118,7 +110,16 @@ $(document).ready(function() {
sortable: true,
sortName: 'code'
},
{
field: 'remarks',
title: '备注信息',
sortable: true,
sortName: 'remarks'
}
]
});
......
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