仓库管理功能 修改代码格式

This commit is contained in:
hai_c 2019-09-15 10:58:19 +08:00
parent 11dd3d4a91
commit c247446d20
9 changed files with 131 additions and 205 deletions

View file

@ -31,7 +31,7 @@ public class StoreHouseServiceImpl implements StoreHouseService {
@Override
public void queryStoreHouseByList(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> params = inputObject.getParams();
params.put("delete_Flag", "0");
params.put("deleteFlag", "0");
List<Map<String, Object>> beans = storeHouseDao.queryStoreHouseByList(params);
if(!beans.isEmpty()){
outputObject.setBeans(beans);
@ -52,11 +52,8 @@ public class StoreHouseServiceImpl implements StoreHouseService {
if(bean == null){
Map<String, Object> user = inputObject.getLogParams();
params.put("id", ToolUtil.getSurFaceId());
params.put("tenant_id", user.get("id"));
params.put("create_time", ToolUtil.getTimeAndToString());
params.put("editer_id", user.get("id"));
params.put("edit_time", ToolUtil.getTimeAndToString());
System.out.printf("---params="+params);
params.put("tenantId", user.get("id"));
params.put("createTime", ToolUtil.getTimeAndToString());
storeHouseDao.insertStoreHouse(params);
}else{
outputObject.setreturnMessage("该仓库信息已存在,请确认!");
@ -73,6 +70,7 @@ public class StoreHouseServiceImpl implements StoreHouseService {
@Override
public void queryStoreHouseById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
Map<String, Object> bean = storeHouseDao.queryStoreHouseById(params);
if(bean == null){
outputObject.setreturnMessage("未查询到信息,请重试!");
@ -93,9 +91,7 @@ public class StoreHouseServiceImpl implements StoreHouseService {
Map<String, Object> params = inputObject.getParams();
// storeHouseDao.deleteStoreHouseById(params);
Map<String, Object> user = inputObject.getLogParams();
params.put("editer_id", user.get("id"));
params.put("edit_time", ToolUtil.getTimeAndToString());
params.put("delete_Flag", 1);
params.put("deleteFlag", 1);
storeHouseDao.editStoreHouseById(params);
}
@ -108,9 +104,6 @@ public class StoreHouseServiceImpl implements StoreHouseService {
@Override
public void editStoreHouseById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> params = inputObject.getParams();
Map<String, Object> user = inputObject.getLogParams();
params.put("editer_id", user.get("id"));
params.put("edit_time", ToolUtil.getTimeAndToString());
storeHouseDao.editStoreHouseById(params);
}
}

View file

@ -13,12 +13,11 @@
d.principal,
d.tenant_id,
d.is_default,
CONVERT (d.create_time, CHAR) createTime,
CONVERT (d.edit_time, CHAR) editTime
CONVERT (d.create_time, CHAR) createTime
FROM
erp_depot d
WHERE
d.delete_Flag = #{delete_Flag}
d.delete_Flag = #{deleteFlag}
<if test="name != '' and name != null">
AND d.name LIKE '%${name}%'
</if>
@ -60,9 +59,7 @@
</if>
tenant_id,
is_default,
create_time,
edit_time,
editer_id
create_time
)VALUES(
#{id},
#{name},
@ -81,11 +78,9 @@
<if test="principal != '' and principal != null">
#{principal},
</if>
#{tenant_id},
#{tenantId},
#{is_default},
#{create_time},
#{edit_time},
#{editer_id})
#{createTime}
</insert>
<select id="queryStoreHouseById" parameterType="java.util.Map" resultType="java.util.Map">
@ -99,12 +94,13 @@
d.principal,
d.tenant_id,
d.is_default,
CONVERT (d.create_time, CHAR) createTime,
CONVERT (d.edit_time, CHAR) editTime
CONVERT (d.create_time, CHAR) createTime
FROM
erp_depot d
WHERE
d.id = #{id}
AND
d.tenant_id = #{userId}
ORDER BY d.create_time DESC LIMIT 0,1
</select>
@ -119,9 +115,6 @@
<update id="editStoreHouseById" parameterType="java.util.Map">
UPDATE erp_depot
<set>
<if test="name != '' and name != null">
name = #{name},
</if>
<if test="address != '' and address != null">
address = #{address},
</if>
@ -137,14 +130,13 @@
<if test="principal != '' and principal != null">
principal = #{principal},
</if>
<if test="delete_Flag !='' and delete_Flag != null">
delete_Flag = #{delete_Flag},
<if test="deleteFlag !='' and deleteFlag != null">
delete_Flag = #{deleteFlag},
</if>
<if test="is_default != '' and is_default != null">
is_default = #{is_default},
</if>
edit_time = #{edit_time},
editer_id = #{editer_id}
name = #{name},
</set>
WHERE
id = #{id}

View file

@ -7,9 +7,6 @@
<!-- 仓库管理开始 -->
<url id="storehouse001" path="/post/StoreHouseController/queryStoreHouseByList" val="获取仓库信息" allUse="2">
<property id="houseName" name="name" ref="" var="仓库名称"></property>
<!--
<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
<property id="page" name="page" ref="required,num" var="分页参数,第几页"/>-->
</url>
<url id="storehouse002" path="/post/StoreHouseController/insertStoreHouse" val="添加仓库信息" allUse="2">
<property id="houseName" name="name" ref="required" var="仓库名称"></property>
@ -25,6 +22,7 @@
</url>
<url id="storehouse004" path="/post/StoreHouseController/deleteStoreHouseById" val="删除仓库信息" allUse="2">
<property id="rowId" name="id" ref="required" var="仓库ID"></property>
<property id="houseName" name="name" ref="required" var="仓库名称"></property>
</url>
<url id="storehouse005" path="/post/StoreHouseController/editStoreHouseById" val="编辑仓库信息" allUse="2">
<property id="rowId" name="id" ref="required" var="仓库ID"></property>

View file

@ -4,54 +4,54 @@ layui.config({
version: skyeyeVersion
}).extend({ //指定js别名
window: 'js/winui.window',
}).define(['window', 'table', 'jquery', 'winui', 'fileUpload', 'dtree'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
var $ = layui.$,
dtree = layui.dtree;
var $ = layui.$;
form.render();
form.on('submit(formAddBean)', function (data) {
//表单验证
if (winui.verifyForm(data.elem)) {
if(isNull($.trim($("#houseName").val()))){
winui.window.msg('请输入仓库名称', {icon: 2,time: 2000});
return false;
}
var params = {
houseName: $.trim($("#houseName").val()),
address: $.trim($("#address").val()),
warehousing: $.trim($("#warehousing").val()),
truckage: $.trim($("#truckage").val()),
houseName: $("#houseName").val(),
address: $("#address").val(),
warehousing: $("#warehousing").val(),
truckage: $("#truckage").val(),
is_default: $("input[name='is_default']:checked").val(),
principal: $.trim($("#principal").val()),
remark: $.trim($("#remark").val()),
principal: $("#principal").val(),
remark: $("#remark").val(),
};
AjaxPostUtil.request({url:reqBasePath + "storehouse002", params:params, type:'json', callback:function(json){
if(json.returnCode == 0){
parent.layer.close(index);
parent.refreshCode = '0';
}else{
winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
}
}});
if(json.returnCode == 0){
parent.layer.close(index);
parent.refreshCode = '0';
}else{
winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
}
}});
}
return false;
});
//自定义表单验证(金额)
form.verify({
warehousing: [
/(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/ //正则表达式
,'请输入正确的金额, 可保留小数点后两位' //提示信息
],
truckage: [
/(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/ //正则表达式
,'请输入正确的金额, 可保留小数点后两位' //提示信息
],
warehousing : function(value, item){
var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/;//正则表达式
if(!isNull(value) && !reg.test(value)){
return "请输入正确的金额, 可保留小数点后两位";
}
},
truckage : function(value, item){
var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/;
if(!isNull(value) && !reg.test(value)){
return "请输入正确的金额, 可保留小数点后两位";
}
},
});
$("body").on("click", "#cancle", function(){

View file

@ -4,12 +4,11 @@ layui.config({
version: skyeyeVersion
}).extend({ //指定js别名
window: 'js/winui.window',
}).define(['window', 'table', 'jquery', 'winui', 'fileUpload', 'dtree'], function (exports) {
}).define(['window', 'table', 'jquery', 'winui'], function (exports) {
winui.renderColor();
layui.use(['form'], function (form) {
var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
var $ = layui.$,
dtree = layui.dtree;
var $ = layui.$;
showGrid({
id: "showForm",
url: reqBasePath + "storehouse003",
@ -17,25 +16,11 @@ layui.config({
pagination: false,
template: getFileContent('tpl/storehouse/storehouseeditTemplate.tpl'),
ajaxSendLoadBefore: function(hdb){
hdb.registerHelper("compare1", function(v1, options){
if(isNull(v1)){
return path + "assets/img/uploadPic.png";
}else{
return basePath + v1;
}
});
},
ajaxSendAfter:function(json){
//设置是否默认
$("#houseName").val(json.bean.houseName);
$("#address").val(json.bean.address);
$("#warehousing").val(json.bean.warehousing);
$("#truckage").val(json.bean.truckage);
$("#principal").val(json.bean.principal);
$("#remark").val(json.bean.remark);
$("input:radio[name=is_default][value=" + json.bean.is_default + "]").attr("checked", true);
form.render();
form.on('submit(formEditBean)', function (data) {
//表单验证
@ -46,37 +31,36 @@ layui.config({
}
var params = {
rowId: parent.rowId,
houseName: $.trim($("#houseName").val()),
address: $.trim($("#address").val()),
warehousing: $.trim($("#warehousing").val()),
truckage: $.trim($("#truckage").val()),
houseName: $("#houseName").val(),
address: $("#address").val(),
warehousing: $("#warehousing").val(),
truckage: $("#truckage").val(),
is_default: $("input[name='is_default']:checked").val(),
principal: $.trim($("#principal").val()),
remark: $.trim($("#remark").val()),
principal: $("#principal").val(),
remark: $("#remark").val(),
};
AjaxPostUtil.request({url:reqBasePath + "storehouse005", params:params, type:'json', callback:function(json){
if(json.returnCode == 0){
parent.layer.close(index);
parent.refreshCode = '0';
}else{
winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
}
}});
if(json.returnCode == 0){
parent.layer.close(index);
parent.refreshCode = '0';
}else{
winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
}
}});
}
return false;
});
//自定义表单验证(金额)
form.verify({
warehousing : function(value, item){
var reg = /(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/;//正则表达式
if(!reg.test(value)){
var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/;//正则表达式
if(!isNull(value) && !reg.test(value)){
return "请输入正确的金额, 可保留小数点后两位";
}
},
truckage : function(value, item){
var reg = /(^(([1-9]{1}\\d*)|(0{1}))(\\.\\d{1,2})?$)/;
if(!reg.test(value)){
var reg = /^0{1}([.]\d{1,2})?$|^[1-9]\d*([.]{1}[0-9]{1,2})?$/;
if(!isNull(value) && !reg.test(value)){
return "请输入正确的金额, 可保留小数点后两位";
}
},

View file

@ -6,15 +6,11 @@ layui.config({
}).extend({ //指定js别名
window: 'js/winui.window',
}).define(['window', 'table', 'jquery', 'winui', 'form'], function (exports) {
winui.renderColor();
authBtn('1552963122253');
var $ = layui.$,
form = layui.form,
table = layui.table;
//表格渲染
table.render({
id: 'messageTable',
@ -67,7 +63,6 @@ layui.config({
return false;
});
//编辑
function edit(data){
rowId = data.id;
@ -88,7 +83,11 @@ layui.config({
//删除仓库
function deleteHouse(data){
AjaxPostUtil.request({url:reqBasePath + "storehouse004", params:{rowId: data.id}, type:'json', callback:function(json){
var params = {
rowId: data.id,
houseName: data.houseName
};
AjaxPostUtil.request({url:reqBasePath + "storehouse004", params:params, type:'json', callback:function(json){
if(json.returnCode == 0){
winui.window.msg("该仓库已删除成功。", {icon: 1,time: 2000});
loadTable();
@ -104,7 +103,7 @@ layui.config({
url: "../../tpl/storehouse/storehouseadd.html",
title: "新增仓库",
pageId: "storehouseadd",
area: ['950px', '90vh'],
area: ['90vw', '90vh'],
callBack: function(refreshCode){
if (refreshCode == '0') {
winui.window.msg("操作成功", {icon: 1,time: 2000});
@ -115,13 +114,22 @@ layui.config({
}});
});
$("body").on("click", "#reloadTable", function(){
$("body").on("click", "#reloadTable", function() {
loadTable();
});
$("body").on("click", "#formSearch", function () {
refreshTable();
})
//刷新
function loadTable(){
table.reload("messageTable", {where:{houseName:$.trim($("#houseName").val())}});
}
//搜索
function refreshTable(){
table.reload("messageTable", {page: {curr: 1}, where:{houseName:$.trim($("#houseName").val())}})
}
exports('storehouselist', {});
});

View file

@ -10,51 +10,51 @@
<body>
<div style="padding:20px; margin:0 auto;">
<form class="layui-form" action="" id="showForm">
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">仓库名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="houseName" name="houseName" win-verify="required" placeholder="请输入仓库名称" class="layui-input" maxlength="25"/>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">仓库地址</label>
<div class="layui-input-block">
<input type="text" id="address" name="address" placeholder="请输入仓库地址" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">仓储费</label>
<div class="layui-input-block">
<input type="text" id="warehousing" name="warehousing" win-verify="required" lay-verify="warehousing" placeholder="请输入仓储费" class="layui-input"/>
<input type="text" id="warehousing" name="warehousing" lay-verify="warehousing" placeholder="请输入仓储费" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">搬运费</label>
<div class="layui-input-block">
<input type="text" id="truckage" name="truckage" win-verify="required" lay-verify="truckage" placeholder="请输入搬运费" class="layui-input"/>
<input type="text" id="truckage" name="truckage" lay-verify="truckage" placeholder="请输入搬运费" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">负责人</label>
<div class="layui-input-block">
<input type="text" id="principal" name="principal" placeholder="请输入负责人名称" class="layui-input"/>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">是否默认<i class="red">*</i></label>
<div class="layui-input-block winui-radio">
<input type="radio" name="is_default" value="1" title="是" checked="checked"/>
<input type="radio" name="is_default" value="2" title="否" />
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入备注信息" class="layui-input" maxlength="200"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle">取消</button>
<button class="winui-btn" lay-submit lay-filter="formAddBean">保存</button>

View file

@ -10,56 +10,7 @@
<body>
<div style="padding:20px; margin:0 auto;">
<form class="layui-form" action="" id="showForm">
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">仓库名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="houseName" name="houseName" win-verify="required" placeholder="请输入仓库名称" class="layui-input" maxlength="25" />
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">仓库地址</label>
<div class="layui-input-block">
<input type="text" id="address" name="address" placeholder="请输入仓库地址" class="layui-input" />
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">仓储费</label>
<div class="layui-input-block">
<input type="text" id="warehousing" name="warehousing" win-verify="required" lay-verify="warehousing" placeholder="请输入仓储费" class="layui-input" />
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">搬运费</label>
<div class="layui-input-block">
<input type="text" id="truckage" name="truckage" win-verify="required" lay-verify="truckage" placeholder="请输入搬运费" class="layui-input" />
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">负责人</label>
<div class="layui-input-block">
<input type="text" id="principal" name="principal" placeholder="请输入负责人名称" class="layui-input" />
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">是否默认<i class="red">*</i></label>
<div class="layui-input-block winui-radio">
<input type="radio" name="is_default" value="1" title="是" />
<input type="radio" name="is_default" value="2" title="否" />
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入备注信息" class="layui-input" maxlength="200" ></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-input-block">
<button class="winui-btn" id="cancle">取消</button>
<button class="winui-btn" lay-submit lay-filter="formEditBean">保存</button>
</div>
</div>
</form>
</div>
<script src="../../assets/lib/layui/layui.js"></script>

View file

@ -1,52 +1,52 @@
{{#bean}}
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">仓库名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="houseName" name="houseName" win-verify="required" placeholder="请输入仓库名称" class="layui-input" maxlength="25" value="{{houseName}}"/>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">仓库名称<i class="red">*</i></label>
<div class="layui-input-block">
<input type="text" id="houseName" name="houseName" win-verify="required" placeholder="请输入仓库名称" class="layui-input" maxlength="25" value="{{houseName}}"/>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">仓库地址</label>
<div class="layui-input-block">
<input type="text" id="address" name="address" placeholder="请输入仓库地址" class="layui-input" value="{{address}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">仓库地址</label>
<div class="layui-input-block">
<input type="text" id="address" name="address" placeholder="请输入仓库地址" class="layui-input" value="{{address}}"/>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">仓储费</label>
<div class="layui-input-block">
<input type="text" id="warehousing" name="warehousing" win-verify="required" lay-verify="warehousing" placeholder="请输入仓储费" class="layui-input" value="{{warehousing}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">仓储费</label>
<div class="layui-input-block">
<input type="text" id="warehousing" name="warehousing" lay-verify="warehousing" placeholder="请输入仓储费" class="layui-input" value="{{warehousing}}"/>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">搬运费</label>
<div class="layui-input-block">
<input type="text" id="truckage" name="truckage" win-verify="required" lay-verify="truckage" placeholder="请输入搬运费" class="layui-input" value="{{truckage}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">搬运费</label>
<div class="layui-input-block">
<input type="text" id="truckage" name="truckage" lay-verify="truckage" placeholder="请输入搬运费" class="layui-input" value="{{truckage}}"/>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">负责人</label>
<div class="layui-input-block">
<input type="text" id="principal" name="principal" placeholder="请输入负责人名称" class="layui-input" value="{{principal}}"/>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">负责人</label>
<div class="layui-input-block">
<input type="text" id="principal" name="principal" placeholder="请输入负责人名称" class="layui-input" value="{{principal}}"/>
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">是否默认<i class="red">*</i></label>
<div class="layui-input-block winui-radio">
<input type="radio" name="is_default" value="1" title="是" />
<input type="radio" name="is_default" value="2" title="否" />
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">是否默认<i class="red">*</i></label>
<div class="layui-input-block winui-radio">
<input type="radio" name="is_default" value="1" title="是" />
<input type="radio" name="is_default" value="2" title="否" />
</div>
<div class="layui-form-item layui-col-xs8">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入备注信息" class="layui-input" maxlength="200" value="{{remark}}"></textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注</label>
<div class="layui-input-block">
<textarea id="remark" name="remark" placeholder="请输入备注信息" class="layui-input" maxlength="200">{{remark}}</textarea>
</div>
</div>
<div class="layui-form-item layui-col-xs8">
<div class="layui-input-block">
<button class="winui-btn" id="cancle">取消</button>
<button class="winui-btn" lay-submit lay-filter="formEditBean">保存</button>
</div>
<div class="layui-form-item layui-col-xs12">
<div class="layui-input-block">
<button class="winui-btn" id="cancle">取消</button>
<button class="winui-btn" lay-submit lay-filter="formEditBean">保存</button>
</div>
</div>
{{/bean}}