consum-base/src/main/java/com/consum/base/controller/BaseWarehouseManagerController.java
@@ -1,6 +1,7 @@ package com.consum.base.controller; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.pojo.request.WarehouseManagerParam; import com.consum.base.service.BaseWarehouseManagerServiceImpl; import com.consum.model.po.BaseWarehouseManager; @@ -13,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -39,12 +39,17 @@ @ApiOperation(value = "新增", notes = "新增") @ApiImplicitParam(name = "warehouseManagerParam", value = "库管员信息", required = true, dataType = "WarehouseManagerParam", paramType = "body") @PostMapping("/save") public ResponseValue add(@RequestBody WarehouseManagerParam warehouseManagerParam) throws Exception { public ResponseValue add() throws Exception { WarehouseManagerParam param = CommonUtil.getObjFromReqBody(WarehouseManagerParam.class); WarehouseManagerParam baseWarehouseParam = new WarehouseManagerParam(); CommonUtil.copyProperties(param, baseWarehouseParam); param = baseWarehouseParam; FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { return ResponseValue.error("请先登录"); } this.baseWarehouseManagerService.add(warehouseManagerParam); this.baseWarehouseManagerService.add(param); return ResponseValue.success(); } consum-base/src/main/java/com/consum/base/controller/FinSysServerController.java
@@ -1,29 +1,32 @@ package com.consum.base.controller; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.pojo.FinSysServerSearchParam; import com.consum.base.pojo.FinSysServerVo; import com.consum.base.service.FinSysServerImpl; import com.consum.model.po.FinSysServer; import com.walker.db.page.GenericPager; import com.walker.db.page.ListPageContext; import com.walker.db.page.PageSearch; import com.walker.infrastructure.utils.DateUtils; import com.walker.infrastructure.utils.NumberGenerator; import com.walker.web.ResponseValue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/pc/fin/sys/server") public class FinSysServerController extends BaseController { private FinSysServerImpl finSysServerImpl; @Autowired public void setfinSysCategory(FinSysServerImpl finSysServerImpl){ this.finSysServerImpl= finSysServerImpl; public void setfinSysCategory(FinSysServerImpl finSysServerImpl) { this.finSysServerImpl = finSysServerImpl; } /** @@ -32,19 +35,20 @@ * @Date 2023/9/13 9:27 */ @GetMapping("/selectByDataScope") public ResponseValue selectByDataScope(Integer dataScope){ public ResponseValue selectByDataScope(Integer dataScope) { return ResponseValue.success(finSysServerImpl.getByDataScope(dataScope)); } /** * 查询左侧树 * * @return */ @GetMapping("/select/tree") public ResponseValue selectFinSysCategoryTree(){ public ResponseValue selectFinSysCategoryTree() { List<FinSysServerVo> finSysCategoryVos = finSysServerImpl.queryAllCategory(); if(finSysCategoryVos!=null){ if (finSysCategoryVos != null) { return ResponseValue.success(finSysCategoryVos); } return ResponseValue.error("未查询到数据!"); @@ -52,20 +56,25 @@ } @GetMapping("/select/detail") public ResponseValue selectById(@RequestParam(name = "id") Long Id){ FinSysServer finSysServer = this.finSysServerImpl.get(new FinSysServer(Id)); if (finSysServer == null) return ResponseValue.error("查询失败!"); return ResponseValue.success("查询成功!",finSysServer); public ResponseValue selectById(@RequestParam(name = "id") Long Id) { FinSysServer finSysServer = this.finSysServerImpl.get(new FinSysServer(Id)); if (finSysServer == null) { return ResponseValue.error("查询失败!"); } return ResponseValue.success("查询成功!", finSysServer); } /** * 分页查询 * @param param * * @return */ @RequestMapping("/select/list") public ResponseValue finSysServerList(FinSysServerSearchParam param){ PageSearch pageSearch = ListPageContext.getPageSearch(); public ResponseValue finSysServerList() { FinSysServerSearchParam param = CommonUtil.getObjFromReq(FinSysServerSearchParam.class); FinSysServerSearchParam param2 = new FinSysServerSearchParam(); CommonUtil.copyProperties(param, param2); param = param2; GenericPager<FinSysServer> pager = this.finSysServerImpl.selectServerListByPage(param); return ResponseValue.success(pager); @@ -73,30 +82,47 @@ /** * 添加 * @param finSysServer * * @return */ @PostMapping("/insert") public ResponseValue addFinSysServer(@RequestBody FinSysServer finSysServer){ if(finSysServer==null) return ResponseValue.error("参数为空"); finSysServer.setId(NumberGenerator.getLongSequenceNumber()); finSysServer.setCreatedTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); finSysServer.setCreatedBy(this.getCurrentUser().getUser_name()); finSysServer.setLv(finSysServer.getParentId()+1); int num = this.finSysServerImpl.insert(finSysServer); if(num>0) return ResponseValue.success(1); public ResponseValue addFinSysServer() { FinSysServer param = CommonUtil.getObjFromReqBody(FinSysServer.class); FinSysServer finSysServer = new FinSysServer(); CommonUtil.copyProperties(param, finSysServer); param = finSysServer; if (param == null) { return ResponseValue.error("参数为空"); } param.setId(NumberGenerator.getLongSequenceNumber()); param.setCreatedTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); param.setCreatedBy(this.getCurrentUser().getUser_name()); param.setLv(param.getParentId() + 1); int num = this.finSysServerImpl.insert(param); if (num > 0) { return ResponseValue.success(1); } return ResponseValue.error("插入失败!"); } /** * 编辑 */ @PostMapping("/edit") public ResponseValue editFinSysServer(@RequestBody FinSysServer finSysServer){ if (finSysServer==null) return ResponseValue.error("参数为空"); public ResponseValue editFinSysServer() { FinSysServer param = CommonUtil.getObjFromReqBody(FinSysServer.class); FinSysServer finSysServer = new FinSysServer(); CommonUtil.copyProperties(param, finSysServer); param = finSysServer; if (param == null) { return ResponseValue.error("参数为空"); } // if(finSysServer.getLvType()!=null) { // finSysServer.setLv(Long.valueOf(finSysServer.getLvType())); // } int num = this.finSysServerImpl.save(finSysServer); return num>0 ? ResponseValue.success(1):ResponseValue.error("编辑失败!"); int num = this.finSysServerImpl.save(param); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("编辑失败!"); } } consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -5,6 +5,7 @@ import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.exception.ExcelDataConvertException; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.core.utils.FinSysTenantUtils; import com.consum.base.pojo.FinSysTenantParam; import com.consum.base.pojo.FinSysTenantSearchParam; @@ -41,7 +42,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -133,7 +133,12 @@ * @Date 2023/7/14 13:59 */ @RequestMapping("/select/list") public ResponseValue allocatedList(FinSysTenantSearchParam param) { public ResponseValue allocatedList() { FinSysTenantSearchParam param = CommonUtil.getObjFromReq(FinSysTenantSearchParam.class); FinSysTenantSearchParam param2 = new FinSysTenantSearchParam(); CommonUtil.copyProperties(param, param2); param = param2; FinSysTenantUser sysInfo = getSysInfo(); if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); @@ -308,7 +313,12 @@ * @Description 不分页查询 */ @RequestMapping("/select/allList") public ResponseValue allList(FinSysTenantSearchParam param) { public ResponseValue allList() { FinSysTenantSearchParam param = CommonUtil.getObjFromReq(FinSysTenantSearchParam.class); FinSysTenantSearchParam param2 = new FinSysTenantSearchParam(); CommonUtil.copyProperties(param, param2); param = param2; StringBuilder whStr = new StringBuilder("where 1=1 and status = 1 and is_delete = 0 "); HashMap parameter = new HashMap<>(); if (param.getFirstZmS() != null && !param.getFirstZmS().equals("")) { @@ -332,7 +342,12 @@ * @date 2023/10/4 */ @PostMapping("/del") public ResponseValue del(@RequestBody FinSysTenantParam param) { public ResponseValue del() { FinSysTenantParam param = CommonUtil.getObjFromReqBody(FinSysTenantParam.class); FinSysTenantParam finSysTenantParam = new FinSysTenantParam(); CommonUtil.copyProperties(param, finSysTenantParam); param = finSysTenantParam; if (param.getId() == null) { return ResponseValue.error("机构id为空"); } @@ -347,7 +362,12 @@ * @date 2023/10/4 */ @PostMapping("/add") public ResponseValue add(@RequestBody FinSysTenantParam param) { public ResponseValue add() { FinSysTenantParam param = CommonUtil.getObjFromReqBody(FinSysTenantParam.class); FinSysTenantParam finSysTenantParam = new FinSysTenantParam(); CommonUtil.copyProperties(param, finSysTenantParam); param = finSysTenantParam; if (param == null) { return ResponseValue.error("参数为空"); } @@ -493,8 +513,13 @@ * @date 2023/10/6 */ @PostMapping("/edit") public ResponseValue edit(@RequestBody FinSysTenant finSysTenant) { Long id = finSysTenant.getId(); public ResponseValue edit() { FinSysTenant param = CommonUtil.getObjFromReqBody(FinSysTenant.class); FinSysTenant finSysTenant = new FinSysTenant(); CommonUtil.copyProperties(param, finSysTenant); param = finSysTenant; Long id = param.getId(); if (id == null || id.longValue() <= 0) { return ResponseValue.error("编辑的机构不存在"); } @@ -506,7 +531,7 @@ // if (finSysTenant1.getLv() != 1) { // return ResponseValue.error("暂无修改权限"); // } int num = this.finSysTenantService.updateFinSysTenant(finSysTenant, this.getSysInfo()); int num = this.finSysTenantService.updateFinSysTenant(param, this.getSysInfo()); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("编辑失败!"); } consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
@@ -1,6 +1,7 @@ package com.consum.base.controller; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.pojo.FinSysTenantDepartmentParam; import com.consum.base.service.FinSysTenantDepartmentServiceImpl; import com.consum.model.po.FinSysTenantDepartment; @@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -44,7 +44,12 @@ @ApiImplicitParam(name = "param", value = "部门信息", required = true, dataType = "FinSysTenantDepartmentParam") }) @PostMapping("/add") public ResponseValue add(@RequestBody FinSysTenantDepartmentParam param) { public ResponseValue add() { FinSysTenantDepartmentParam param = CommonUtil.getObjFromReqBody(FinSysTenantDepartmentParam.class); FinSysTenantDepartmentParam finSysTenantDepartmentParam = new FinSysTenantDepartmentParam(); CommonUtil.copyProperties(param, finSysTenantDepartmentParam); param = finSysTenantDepartmentParam; if (StringUtils.isEmpty(param.getName())) { return ResponseValue.error("部门名称为空"); } @@ -75,7 +80,12 @@ */ //如果不传机构id,默认查省级机构的部门 @GetMapping("/list") public ResponseValue queryList(FinSysTenantDepartmentParam param) { public ResponseValue queryList() { FinSysTenantDepartmentParam param = CommonUtil.getObjFromReq(FinSysTenantDepartmentParam.class); FinSysTenantDepartmentParam param2 = new FinSysTenantDepartmentParam(); CommonUtil.copyProperties(param, param2); param = param2; FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); @@ -107,26 +117,31 @@ * @Date 2023/10/26 */ @PostMapping("/edit") public ResponseValue edit(@RequestBody FinSysTenantDepartment department) { Long id = department.getId(); public ResponseValue edit() { FinSysTenantDepartment param = CommonUtil.getObjFromReqBody(FinSysTenantDepartment.class); FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment(); CommonUtil.copyProperties(param, finSysTenantDepartment); param = finSysTenantDepartment; Long id = param.getId(); if (id == null || id <= 0) { return ResponseValue.error("编辑的部门不存在"); } if (StringUtils.isEmpty(department.getName())) { if (StringUtils.isEmpty(param.getName())) { return ResponseValue.error("部门名称为空"); } if (StringUtils.isEmpty(department.getCode())) { if (StringUtils.isEmpty(param.getCode())) { return ResponseValue.error("部门编号为空"); } FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); } FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(department.getCode()); FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode()); if (tenantDepartment != null) { return ResponseValue.error("部门编号已存在"); } int num = this.departmentService.updateFinSysTenantDepartment(department, sysInfo); int num = this.departmentService.updateFinSysTenantDepartment(param, sysInfo); return num > 0 ? ResponseValue.success() : ResponseValue.error("编辑失败!"); } @@ -154,15 +169,20 @@ * @Date 2023/10/26 */ @DeleteMapping("/del") public ResponseValue updateById(@RequestBody FinSysTenantDepartment department) { if (department.getId() == null) { public ResponseValue updateById() { FinSysTenantDepartment param = CommonUtil.getObjFromReqBody(FinSysTenantDepartment.class); FinSysTenantDepartment finSysTenantDepartment = new FinSysTenantDepartment(); CommonUtil.copyProperties(param, finSysTenantDepartment); param = finSysTenantDepartment; if (param.getId() == null) { return ResponseValue.error("部门id为空"); } FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); } int num = this.departmentService.updateById(department, sysInfo); int num = this.departmentService.updateById(param, sysInfo); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("删除失败!"); } consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -1,6 +1,7 @@ package com.consum.base.controller; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.core.utils.PageUtil; import com.consum.base.pojo.query.LWhFormInventoryQry; import com.consum.base.pojo.request.FormInventoryParam; @@ -27,7 +28,6 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -57,7 +57,13 @@ @ApiImplicitParam(name = "param", value = "盘点单信息", dataType = "FormInventoryParam") }) @PostMapping("/add") public ResponseValue add(@RequestBody FormInventoryParam param) { public ResponseValue add() { FormInventoryParam param = CommonUtil.getObjFromReqBody(FormInventoryParam.class); FormInventoryParam formInventoryParam = new FormInventoryParam(); CommonUtil.copyProperties(param, formInventoryParam); param = formInventoryParam; FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); @@ -87,7 +93,12 @@ @ApiImplicitParam(name = "param", value = "盘点条件", dataType = "LWhFormInventoryParam", required = true, paramType = "query") }) @GetMapping("/list") public ResponseValue queryList(LWhFormInventoryQry param) { public ResponseValue queryList() { LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class); LWhFormInventoryQry param2 = new LWhFormInventoryQry(); CommonUtil.copyProperties(param, param2); param = param2; FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); @@ -126,7 +137,12 @@ @ApiImplicitParam(name = "param", value = "盘点单信息", dataType = "FormInventoryParam") }) @PostMapping("/edit") public ResponseValue edit(@RequestBody FormInventoryParam param) { public ResponseValue edit() { FormInventoryParam param = CommonUtil.getObjFromReqBody(FormInventoryParam.class); FormInventoryParam formInventoryParam = new FormInventoryParam(); CommonUtil.copyProperties(param, formInventoryParam); param = formInventoryParam; LWhFormInventory lWhFormInventory = lWhFormInventoryService.get(new LWhFormInventory(param.getId())); if (lWhFormInventory == null) { return ResponseValue.error("编辑失败!"); @@ -138,8 +154,18 @@ if (num == 0) { return ResponseValue.error("编辑失败!"); } ResponseValue add = this.add(param); if (add.getCode() == ResponseValue.CODE_SUCCESS) { //根据盘点人id查询盘点人 FinSysTenantUser finSysTenantUser = new FinSysTenantUser(); finSysTenantUser.setId(param.getOperatorUserId()); FinSysTenantUser operatorUser = finSysTenantUserService.get(finSysTenantUser); //根据监盘人id查询监盘人 FinSysTenantUser monitorUserInfo = new FinSysTenantUser(); monitorUserInfo.setId(param.getMonitorUserId()); FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo); int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser); if (result > 0) { return ResponseValue.success(); } @@ -185,12 +211,17 @@ @ApiImplicitParam(name = "param", value = "盘点单信息", dataType = "LWhFormInventoryDto") }) @PostMapping("/temporary/storage") public ResponseValue temporaryStorage(@RequestBody LWhFormInventoryParam dto) { if (dto == null) { public ResponseValue updateTemporaryStorage() { LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class); LWhFormInventoryParam formInventoryParam = new LWhFormInventoryParam(); CommonUtil.copyProperties(param, formInventoryParam); param = formInventoryParam; if (param == null) { return ResponseValue.error("参数错误"); } int num = this.lWhFormInventoryService.updateInventoryInfo(dto, 1, null, null); int num = this.lWhFormInventoryService.updateInventoryInfo(param, 1, null, null); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("暂存失败!"); } @@ -205,13 +236,18 @@ @ApiImplicitParam(name = "param", value = "盘点单信息", dataType = "LWhFormInventoryDto") }) @PostMapping("/finish") public ResponseValue finishPd(@RequestBody LWhFormInventoryParam dto) { if (dto == null) { public ResponseValue updateFinishPd() { LWhFormInventoryParam param = CommonUtil.getObjFromReqBody(LWhFormInventoryParam.class); LWhFormInventoryParam formInventoryParam = new LWhFormInventoryParam(); CommonUtil.copyProperties(param, formInventoryParam); param = formInventoryParam; if (param == null) { return ResponseValue.error("参数错误"); } S_user_core currentUser = this.getCurrentUser(); FinSysTenantUser sysInfo = this.getSysInfo(); int num = this.lWhFormInventoryService.updateInventoryInfo(dto, 2, currentUser, sysInfo); int num = this.lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo); return num > 0 ? ResponseValue.success(1) : ResponseValue.error("盘点失败!"); } @@ -226,7 +262,12 @@ @ApiImplicitParam(name = "param", value = "盘点条件", dataType = "LWhFormInventoryParam", paramType = "query") }) @GetMapping("/list/PdDetail") public ResponseValue queryPdDetailList(LWhFormInventoryQry param) { public ResponseValue queryPdDetailList() { LWhFormInventoryQry param = CommonUtil.getObjFromReq(LWhFormInventoryQry.class); LWhFormInventoryQry param2 = new LWhFormInventoryQry(); CommonUtil.copyProperties(param, param2); param = param2; FinSysTenantUser sysInfo = this.getSysInfo(); if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -21,6 +21,9 @@ import com.walker.infrastructure.utils.DateUtils; import com.walker.infrastructure.utils.StringUtils; import com.walker.jdbc.service.BaseServiceImpl; import java.util.HashMap; import java.util.List; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.BeanUtils; @@ -28,10 +31,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description 盘点 @@ -47,11 +46,7 @@ @Autowired private BaseWarehouseServiceImpl baseWarehouseService; @Autowired private FinSysTenantUserServiceImpl finSysTenantUserService; @Autowired private LWhFormInventoryGoodsServiceImpl inventoryGoodsService; @Autowired private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; @Autowired private LWhGoodsService lWhGoodsService; @Autowired @@ -206,8 +201,7 @@ log.error("盘点单物品为空"); return 0; } int i = this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList); System.out.println(i); this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList); //修改盘点单 if (state == 2) { //完成盘点时设置完成盘点时间