Commit b991e8ce by zhanglt

盘盈入库

parent 66ba0a18
...@@ -5,6 +5,7 @@ package com.jeeplus.modules.sys.web; ...@@ -5,6 +5,7 @@ package com.jeeplus.modules.sys.web;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -548,7 +549,22 @@ public class UserController extends BaseController { ...@@ -548,7 +549,22 @@ public class UserController extends BaseController {
} }
return mapList; return mapList;
} }
/**
* 获取 领用机构下的 所有用户
*/
@ResponseBody
@RequestMapping(value = "getUserListByOfficeId")
public List<User> getUserListByOfficeId(String officeId) throws Exception{
/**
* 后台hibernate-validation插件校验
*/
List<User> list = new ArrayList<>();
if (StringUtils.isBlank(officeId)){
return list;
}
list = systemService.findUserByOfficeId(officeId);
return list;
}
/** /**
* web端ajax验证用户名是否可用 * web端ajax验证用户名是否可用
* @param loginName * @param loginName
......
...@@ -41,6 +41,12 @@ public class Ledger extends DataEntity<Ledger> { ...@@ -41,6 +41,12 @@ public class Ledger extends DataEntity<Ledger> {
super(id); super(id);
} }
public Ledger(String name, MaterialType type, String model) {
this.name = name;
this.type = type;
this.model = model;
}
@NotNull(message="物资名称不能为空") @NotNull(message="物资名称不能为空")
@ExcelField(title="物资名称", align=2, sort=1) @ExcelField(title="物资名称", align=2, sort=1)
public String getName() { public String getName() {
......
...@@ -228,6 +228,28 @@ public class ProfitWarehousingController extends BaseController { ...@@ -228,6 +228,28 @@ public class ProfitWarehousingController extends BaseController {
} }
return j; return j;
} }
/**
* 保存新增盘盈入库信息后,入台账
*/
@ResponseBody
@RequiresPermissions(value={"warehouse:profitwarehousing:profitWarehousing:add","warehouse:profitwarehousing:profitWarehousing:edit"},logical=Logical.OR)
@RequestMapping(value = "inLedgerInfo")
public AjaxJson inLedgerInfo(ProfitWarehousing profitWarehousing, Model model) throws Exception{
AjaxJson j = new AjaxJson();
/**
* 后台hibernate-validation插件校验
*/
String errMsg = beanValidator(profitWarehousing);
if (StringUtils.isNotBlank(errMsg)){
j.setSuccess(false);
j.setMsg(errMsg);
return j;
}
//新增或编辑表单保存
profitWarehousingService.inLedgerInfo(profitWarehousing);//保存
j.setSuccess(true);
j.setMsg("物资入帐成功");
return j;
}
} }
\ 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