From 02e236724a60611c7537ae92e3e7f270cf3b3115 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 2 Feb 2023 09:03:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthUserController.java | 16 +- .../api/controller/auth/DeptController.java | 6 +- .../auth/InvWarehouseController.java | 42 ++- .../api/controller/auth/LoginController.java | 18 +- .../basic/BasicBussinessTypeController.java | 26 +- .../inout/IoCodeTempController.java | 38 +++ .../glxp/api/dao/basic/ProductInfoDao.java | 2 +- .../com/glxp/api/dao/inout/IoCodeTempDao.java | 8 + .../com/glxp/api/entity/auth/AuthAdmin.java | 3 +- .../api/entity/inout/IoCodeTempEntity.java | 143 +++++++++ .../com/glxp/api/exception/UtilException.java | 22 ++ .../glxp/api/http/req/UdiwmsUnitRequest.java | 2 +- .../api/req/auth/AuthUserSaveRequest.java | 4 +- .../req/auth/BussinessTypeFilterRequest.java | 2 +- .../api/req/auth/FilterAuthCheckRequest.java | 2 +- .../api/req/auth/FilterAuthUserRequest.java | 2 +- .../glxp/api/req/auth/FilterDeptRequest.java | 2 +- .../api/req/auth/FilterDeptUserReqeust.java | 2 +- .../api/req/auth/FilterInvBusTypeRequest.java | 2 +- .../api/req/auth/FilterInvBusUserRequest.java | 2 +- .../req/auth/FilterInvLinkDataRequest.java | 2 +- .../api/req/auth/FilterInvSpaceRequest.java | 2 +- .../auth/FilterInvSubWarehouseRequest.java | 2 +- .../api/req/auth/FilterInvUserRequest.java | 2 +- .../req/auth/FilterInvWarehouseRequest.java | 5 +- .../glxp/api/req/auth/FilterMenuRequest.java | 2 +- .../req/auth/FilterNoSelectUserRequest.java | 2 +- .../api/req/auth/FilterRoleMenuRequest.java | 2 +- .../glxp/api/req/auth/FilterRoleRequest.java | 2 +- .../req/auth/FilterSysHisStatusRequest.java | 2 +- .../api/req/auth/FilterUserRoleRequest.java | 2 +- .../glxp/api/req/auth/SysDictDataRequest.java | 2 +- .../glxp/api/req/auth/SysDictTypeRequest.java | 2 +- .../basic/BasicUnitMaintainFilterRequest.java | 4 +- .../basic/CompanyProductRelevanceRequest.java | 2 +- .../req/basic/FilterBusTypeChangeRequest.java | 2 +- .../req/basic/FilterBusTypePreRequest.java | 2 +- .../req/basic/FilterBussinessTypeRequest.java | 2 +- .../FilterCompanyProductRelevanceRequest.java | 2 +- .../req/basic/FilterCorpExportLogRequest.java | 2 +- .../req/basic/FilterCorpImportLogRequest.java | 2 +- .../api/req/basic/FilterUdiRelRequest.java | 2 +- .../req/basic/ProductInfoFilterRequest.java | 2 +- .../glxp/api/req/basic/UdiCompanyRequest.java | 2 +- .../api/req/basic/UdiInfoExportRequest.java | 2 +- .../api/req/inout/FilterIoCodeRequest.java | 15 +- .../req/monitor/FilterLoginLogRequest.java | 2 +- .../api/req/monitor/FilterOperLogRequest.java | 2 +- .../req/system/FilterClassifyCodeRequest.java | 2 +- .../req/system/FilterDeviceKeyRequest.java | 2 +- .../req/system/FilterParamConfigRequest.java | 2 +- .../req/system/FilterPdfModuleRequest.java | 2 +- .../FilterPdfTemplateRelevanceRequest.java | 2 +- .../req/system/FilterPdfTemplateRequest.java | 2 +- .../api/req/system/FilterSysApiRequest.java | 2 +- .../api/req/system/FilterSysLogRequest.java | 2 +- .../FilterBasicThirdSysDetailRequest.java | 2 +- .../thrsys/FilterBasicThirdSysRequest.java | 2 +- .../thrsys/FilterThrBusTypeOriginRequest.java | 2 +- .../thrsys/FilterThrCorpExportLogRequest.java | 2 +- .../thrsys/FilterThrCorpImportLogRequest.java | 2 +- .../api/req/thrsys/FilterThrCorpRequest.java | 2 +- .../api/req/thrsys/FilterThrDeptRequest.java | 2 +- .../thrsys/FilterThrInvProductsRequest.java | 2 +- .../thrsys/FilterThrOrderDetailRequest.java | 2 +- .../api/req/thrsys/FilterThrOrderRequest.java | 2 +- .../FilterThrProductsExportLogRequest.java | 8 +- .../FilterThrProductsImportLogRequest.java | 2 +- .../req/thrsys/FilterThrProductsRequest.java | 2 +- .../FilterThrSubInvWarehouseRequest.java | 2 +- .../api/req/thrsys/ThrCorpExportRequest.java | 2 +- .../glxp/api/req/thrsys/ThrOnhandRequest.java | 2 +- .../thrsys/ThrUnitMaintainFilterRequest.java | 2 +- .../req/thrsys/UdiwmsWarehouseRequest.java | 2 +- .../api/res/auth/LoginUserInfoResponse.java | 4 +- .../impl/BasicBussinessTypeServiceImpl.java | 2 +- .../api/service/inout/IoCodeTempService.java | 17 ++ .../service/inout/impl/IoCodeServiceImpl.java | 2 + .../inout/impl/IoCodeTempServiceImpl.java | 39 +++ .../java/com/glxp/api/util/StringUtils.java | 271 ++++++++++++++++++ .../{req => util/page}/ListPageRequest.java | 2 +- .../com/glxp/api/util/page/PageQuery.java | 85 ++++++ .../java/com/glxp/api/util/page/SqlUtil.java | 56 ++++ .../com/glxp/api/util/page/TableDataInfo.java | 76 +++++ .../mybatis/mapper/auth/AuthAdminDao.xml | 68 +++-- .../mapper/auth/InvSubWarehouseDao.xml | 133 +++++---- .../mybatis/mapper/basic/ProductInfoDao.xml | 2 +- 87 files changed, 1046 insertions(+), 187 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java create mode 100644 src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java create mode 100644 src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java create mode 100644 src/main/java/com/glxp/api/exception/UtilException.java create mode 100644 src/main/java/com/glxp/api/service/inout/IoCodeTempService.java create mode 100644 src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java create mode 100644 src/main/java/com/glxp/api/util/StringUtils.java rename src/main/java/com/glxp/api/{req => util/page}/ListPageRequest.java (92%) create mode 100644 src/main/java/com/glxp/api/util/page/PageQuery.java create mode 100644 src/main/java/com/glxp/api/util/page/SqlUtil.java create mode 100644 src/main/java/com/glxp/api/util/page/TableDataInfo.java diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 3982aee2e..666cd5ba7 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.constant.BusinessType; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.*; import com.glxp.api.req.auth.AuthUserSaveRequest; import com.glxp.api.req.auth.FilterInvLinkDataRequest; @@ -25,13 +26,11 @@ import java.util.*; * 管理员相关 */ @RestController -public class AuthUserController { +public class AuthUserController extends BaseController { @Resource private AuthAdminService authAdminService; @Resource - private InvWarehouseService invWarehouseService; - @Resource private WarehouseUserService warehouseUserService; @@ -43,16 +42,9 @@ public class AuthUserController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - if (authUserSaveRequest.getId() == null) { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); - } - InvWarehouseEntity invWarehouseEntity = invWarehouseService.filterGroupInvSubAndcode(authUserSaveRequest.getLocSubInvCode()); - if (invWarehouseEntity != null) { - authUserSaveRequest.setLocInvCode(invWarehouseEntity.getParentId()); - } AuthAdmin authAdmin = new AuthAdmin(); BeanUtils.copyProperties(authUserSaveRequest, authAdmin); + authAdmin.setId(getUserId()); authAdmin.setLastModifyTime(new Date()); boolean b = authAdminService.updateAuthAdmin(authAdmin); if (!b) { @@ -83,7 +75,7 @@ public class AuthUserController { // 先删除之前的角色 //todo 记得删除用户关联角色表 // authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId()); - warehouseUserService.deleteByCodeAndId(authUserSaveRequest.getId(), byId.getLocSubInvCode()); + warehouseUserService.deleteByCodeAndId(authUserSaveRequest.getId(), byId.getLocInvCode()); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index e92cdda78..572baa6c3 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -73,7 +73,7 @@ public class DeptController { AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setStatus(1); - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + filterInvWarehouseRequest.setUserId(authAdmin.getId()); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(mInvWarehouseEntities); } @@ -115,7 +115,7 @@ public class DeptController { filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + filterInvWarehouseRequest.setUserId(authAdmin.getId()); filterInvWarehouseRequest.setPid(0); List mInvWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); Map invWarehouseEntityMap = new HashMap<>(); @@ -141,7 +141,7 @@ public class DeptController { public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + filterInvWarehouseRequest.setUserId(authAdmin.getId()); filterInvWarehouseRequest.setPid(0); invWarehouseEntities = deptService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(invWarehouseEntities); diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 9a7c67565..6e0507d4e 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -8,6 +8,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; @@ -38,7 +39,7 @@ import java.util.Date; import java.util.List; @RestController -public class InvWarehouseController { +public class InvWarehouseController extends BaseController { @Resource InvWarehouseService invWarehouseService; @@ -64,7 +65,40 @@ public class InvWarehouseController { pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setList(responses); return ResultVOUtils.success(pageSimpleResponse); + } + + /** + * 获取部门底下仓库列表-关联用户 + * + * @param filterInvWarehouseRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("spms/inv/warehouse/findByUser") + public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) { + AuthAdmin authAdmin = getUser(); + filterInvWarehouseRequest.setUserId(authAdmin.getId()); + if (StrUtil.isEmpty(filterInvWarehouseRequest.getDeptCode())) { + return ResultVOUtils.error(500, "部门编码不能为空"); + } + List invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); + return ResultVOUtils.success(invSubWarehouseEntities); + } + + /** + * 获取用户所有关联仓库 + * + * @param filterInvWarehouseRequest + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("spms/inv/warehouse/findByUser") + public BaseResponse findByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { + AuthAdmin authAdmin = getUser(); + filterInvWarehouseRequest.setUserId(authAdmin.getId()); + List invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); + return ResultVOUtils.success(invSubWarehouseEntities); } @@ -80,14 +114,14 @@ public class InvWarehouseController { if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1 || filterInvWarehouseRequest.getFilter() == 2) { if (authAdmin.getCustomerId() == 110) { - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + filterInvWarehouseRequest.setUserId(authAdmin.getId()); } else { filterInvWarehouseRequest.setSpUse(true); } } } else { - if (filterInvWarehouseRequest.getFilter() == 3 && filterInvWarehouseRequest.getFilter() != null) { - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + if (filterInvWarehouseRequest.getFilter() != null && filterInvWarehouseRequest.getFilter() == 3) { + filterInvWarehouseRequest.setUserId(authAdmin.getId()); } else { //走这边表示单据选择的是往来单位里面调出调入的库 //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 407c7e7b5..9367112da 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -47,18 +47,14 @@ public class LoginController extends BaseController { private AuthAdminService authAdminService; @Resource private LogininforService logininforService; - @Resource private AuthCheckService authCheckService; @Resource SysPdaKeyService sysPdaKeyService; @Resource SysPermissionService sysPermissionService; - - @Resource private CompanyService companyService; - @Resource private AuthLicenseDao authLicenseDao; @@ -119,7 +115,7 @@ public class LoginController extends BaseController { LoginResponse loginResponse = new LoginResponse(); loginResponse.setId(authAdmin.getId() + ""); loginResponse.setToken(token); - loginResponse.setDept(authAdmin.getDept()); + loginResponse.setDept(authAdmin.getLocDeptCode()); loginResponse.setDeptName(authAdmin.getDeptName()); logininforService.recordLogininfor(authAdmin.getEmployeeName(), Constant.LOGIN_SUCCESS, "登录成功！", request); @@ -205,10 +201,10 @@ public class LoginController extends BaseController { AuthAdmin authAdmin = authAdminService.findById(id); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); - DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocInvCode()); - InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocSubInvCode()); - loginUserInfoResponse.setLocInvName(deptEntity.getName()); - loginUserInfoResponse.setLocSubInvName(invWarehouseEntity.getName()); + DeptEntity deptEntity = deptService.selectByCode(authAdmin.getLocDeptCode()); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(authAdmin.getLocInvCode()); + loginUserInfoResponse.setLocDeptName(deptEntity.getName()); + loginUserInfoResponse.setLocInvName(invWarehouseEntity.getName()); return ResultVOUtils.success(loginUserInfoResponse); } @@ -225,8 +221,8 @@ public class LoginController extends BaseController { BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); CompanyEntity companyEntity = companyService.findCompany(); loginUserInfoResponse.setCompanyName(companyEntity.getName()); - loginUserInfoResponse.setLocInvName(deptService.getInvName(loginUserInfoResponse.getLocInvCode())); - loginUserInfoResponse.setLocSubInvName(invWarehouseService.getSubInvName(loginUserInfoResponse.getLocSubInvCode())); + loginUserInfoResponse.setLocDeptName(deptService.getInvName(loginUserInfoResponse.getLocDeptCode())); + loginUserInfoResponse.setLocInvName(invWarehouseService.getSubInvName(loginUserInfoResponse.getLocInvCode())); // 角色集合 Set roles = sysPermissionService.getRolePermission(authAdmin); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 81384cb16..5a2fe13b2 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -62,6 +62,31 @@ public class BasicBussinessTypeController extends BaseController { return ResultVOUtils.page(pageInfo); } + + /** + * 获取部门底下仓库信息-关联用户 + * + * @return + */ + @AuthRuleAnnotation("") + @GetMapping("/udiwms/busType/findByInvUser") + public BaseResponse findByInvUser(FilterBussinessTypeRequest bussinessTypeFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (StrUtil.isEmpty(bussinessTypeFilterRequest.getCode())) { + return ResultVOUtils.error(500, "仓库编码不能为空！"); + } + bussinessTypeFilterRequest.setUserId(getUserId()); + List bussinessTypeEntities; + bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( + bussinessTypeFilterRequest); + return ResultVOUtils.success(bussinessTypeEntities); + } + + /** * 根据当前用户查询单据类型 * @@ -107,7 +132,6 @@ public class BasicBussinessTypeController extends BaseController { /** * 更新单据类型 * - * @param bussinessTypeEntity * @param bindingResult * @return */ diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java new file mode 100644 index 000000000..560d31196 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -0,0 +1,38 @@ +package com.glxp.api.controller.inout; + +import cn.hutool.core.util.StrUtil; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.service.inout.IoCodeTempService; +import com.glxp.api.util.page.TableDataInfo; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +public class IoCodeTempController extends BaseController { + + @Resource + private IoCodeTempService codeTempService; + + + @AuthRuleAnnotation("") + @GetMapping("admin/warehouse/inout/findErrorByOrderId") + public BaseResponse findErrorByOrderId(FilterIoCodeRequest warehouseQueryRequest) { + if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) { + return ResultVOUtils.error(500, "单据号不能为空!"); + } + TableDataInfo tableDataInfo = codeTempService.findByOrderId(warehouseQueryRequest); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(tableDataInfo.getTotal()); + pageSimpleResponse.setList(tableDataInfo.getList()); + return ResultVOUtils.success(pageSimpleResponse); + } + +} diff --git a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java index cbaab4331..a79320865 100644 --- a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java +++ b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java @@ -1,7 +1,7 @@ package com.glxp.api.dao.basic; import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.req.basic.ProductInfoFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java b/src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java new file mode 100644 index 000000000..aa422f0c6 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java @@ -0,0 +1,8 @@ +package com.glxp.api.dao.inout; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeTempEntity; + +public interface IoCodeTempDao extends BaseMapperPlus { +} diff --git a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java index e6b87ec63..147874e80 100644 --- a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java @@ -29,10 +29,9 @@ public class AuthAdmin { private String comments; private String employeeName; private Long CustomerId; + private String locDeptCode; private String locInvCode; - private String locSubInvCode; - private String dept; private String deptName; diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java new file mode 100644 index 000000000..00ad4f4c7 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java @@ -0,0 +1,143 @@ +package com.glxp.api.entity.inout; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +@Data +@TableName(value = "io_code_temp") +public class IoCodeTempEntity implements Serializable { + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * UDI码 + */ + @TableField(value = "code") + private String code; + + /** + * 主单据类型（入库，出库） + */ + @TableField(value = "mainAction") + private String mainAction; + + /** + * 单据类型 + */ + @TableField(value = "`action`") + private String action; + + /** + * 订单号外键 + */ + @TableField(value = "orderId") + private String orderId; + + /** + * 手持终端订单号 + */ + @TableField(value = "corpOrderId") + private String corpOrderId; + + /** + * DI标识 + */ + @TableField(value = "nameCode") + private String nameCode; + + /** + * 批次号 + */ + @TableField(value = "batchNo") + private String batchNo; + + /** + * 生产日期 + */ + @TableField(value = "produceDate") + private String produceDate; + + /** + * 失效日期 + */ + @TableField(value = "expireDate") + private String expireDate; + + /** + * 序列号 + */ + @TableField(value = "serialNo") + private String serialNo; + + /** + * 包装级别 + */ + @TableField(value = "packageLevel") + private String packageLevel; + + /** + * 供应商ID外键 + */ + @TableField(value = "supId") + private String supId; + + /** + * 耗材字典ID外键 + */ + @TableField(value = "relId") + private Long relId; + + /** + * 扫码数量 + */ + @TableField(value = "`count`") + private Integer count; + + /** + * 实际数量 + */ + @TableField(value = "reCount") + private Integer reCount; + + /** + * 部门编码外键 + */ + @TableField(value = "deptCode") + private String deptCode; + + /** + * 仓库编码外键 + */ + @TableField(value = "invCode") + private String invCode; + + /** + * 货位编码外键 + */ + @TableField(value = "warehouseCode") + private String warehouseCode; + + /** + * 更新日期 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 创建日期 + */ + @TableField(value = "createTime") + private Date createTime; + + + private Integer status; //条码校验状态 + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/exception/UtilException.java b/src/main/java/com/glxp/api/exception/UtilException.java new file mode 100644 index 000000000..faa85a4c0 --- /dev/null +++ b/src/main/java/com/glxp/api/exception/UtilException.java @@ -0,0 +1,22 @@ +package com.cpt.common.exception; + +/** + * 工具类异常 + * + * @author ruoyi + */ +public class UtilException extends RuntimeException { + private static final long serialVersionUID = 8247610319171014183L; + + public UtilException(Throwable e) { + super(e.getMessage(), e); + } + + public UtilException(String message) { + super(message); + } + + public UtilException(String message, Throwable throwable) { + super(message, throwable); + } +} diff --git a/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java b/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java index 323bb3c72..536ba1caf 100644 --- a/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java +++ b/src/main/java/com/glxp/api/http/req/UdiwmsUnitRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.http.req; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java index 465c9cc1d..cf47565de 100644 --- a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java @@ -13,7 +13,6 @@ public class AuthUserSaveRequest { // id private Long id; // 昵称 - @NotEmpty(message = "请输入用户名") private String userName; // 登录密码 private String passWord; @@ -33,9 +32,8 @@ public class AuthUserSaveRequest { private String comments; // 角色ids private List roles; + private String locDeptCode; private String locInvCode; - private String locSubInvCode; - private String dept; private List depts; } diff --git a/src/main/java/com/glxp/api/req/auth/BussinessTypeFilterRequest.java b/src/main/java/com/glxp/api/req/auth/BussinessTypeFilterRequest.java index 58d6d6d41..75ae8520c 100644 --- a/src/main/java/com/glxp/api/req/auth/BussinessTypeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/auth/BussinessTypeFilterRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/auth/FilterAuthCheckRequest.java b/src/main/java/com/glxp/api/req/auth/FilterAuthCheckRequest.java index 3d55e2f57..19e6d3c6d 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterAuthCheckRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterAuthCheckRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java index 3bfa59011..f1d1238eb 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java b/src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java index e0ba9a5aa..72f329404 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterDeptRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java b/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java index 90eb160da..998eabc46 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java +++ b/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvBusTypeRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvBusTypeRequest.java index d8a90ce37..56c66e274 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvBusTypeRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvBusTypeRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java index abfc05ce4..3dd86ca04 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvBusUserRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java index c6a10220f..632ff3d45 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvLinkDataRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvSpaceRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvSpaceRequest.java index acd4784d7..f342cbca9 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvSpaceRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvSpaceRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java index 85463ed2d..1e2b81b6d 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java index dac9ed453..d231ad607 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvUserRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java index c13574299..e41d23542 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.Date; @@ -13,12 +13,13 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private Integer pid; private String code; private String name; + private String deptCode; private Boolean advanceType; private Boolean isDefault; private Date updateTime; private Integer level; private String pcode; - private Integer userId; + private Long userId; private String locInvCode; private Integer status; private String lastUpdateTime; diff --git a/src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java b/src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java index 616265215..d98084807 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterMenuRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java index a5cf905c3..307553b73 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterNoSelectUserRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/auth/FilterRoleMenuRequest.java b/src/main/java/com/glxp/api/req/auth/FilterRoleMenuRequest.java index fdc88a09d..050107730 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterRoleMenuRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterRoleMenuRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterRoleRequest.java b/src/main/java/com/glxp/api/req/auth/FilterRoleRequest.java index db7914f95..6ed7d13a9 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterRoleRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterRoleRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java b/src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java index 3c7bd6f4d..26545b6b7 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterSysHisStatusRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/FilterUserRoleRequest.java b/src/main/java/com/glxp/api/req/auth/FilterUserRoleRequest.java index 3fb26bcfe..324f401c6 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterUserRoleRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterUserRoleRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/SysDictDataRequest.java b/src/main/java/com/glxp/api/req/auth/SysDictDataRequest.java index 0829266ef..b6412d523 100644 --- a/src/main/java/com/glxp/api/req/auth/SysDictDataRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysDictDataRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/SysDictTypeRequest.java b/src/main/java/com/glxp/api/req/auth/SysDictTypeRequest.java index 5e3ae3c68..5bf4838b7 100644 --- a/src/main/java/com/glxp/api/req/auth/SysDictTypeRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysDictTypeRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.auth; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index 20bc4b422..1a9f08dde 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -1,9 +1,7 @@ package com.glxp.api.req.basic; -import com.glxp.api.entity.thrsys.ThrCorpEntity; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.basic.BasicErpUnitsResponse; -import com.glxp.api.res.thrsys.ThrCorpsResponse; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index f5c0852bc..ad8001d4d 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java index c74002ba6..589cec509 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBusTypeChangeRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java index b7c17855e..d8e391296 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBusTypePreRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java index 69bdaa7d4..5ccde0851 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java index 346a859b8..31467b965 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterCompanyProductRelevanceRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/basic/FilterCorpExportLogRequest.java b/src/main/java/com/glxp/api/req/basic/FilterCorpExportLogRequest.java index 47956d64f..8853c9e05 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterCorpExportLogRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterCorpExportLogRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/basic/FilterCorpImportLogRequest.java b/src/main/java/com/glxp/api/req/basic/FilterCorpImportLogRequest.java index d3fe9202b..9e9a3d6ae 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterCorpImportLogRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterCorpImportLogRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 0073e2458..94039df90 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java b/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java index 1d21c0bb2..511733145 100644 --- a/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/ProductInfoFilterRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java b/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java index 89f4e5589..8340b306d 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiCompanyRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java b/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java index 94db8a290..e58999e35 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiInfoExportRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java b/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java index 9a7abfce8..5fb0322db 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java @@ -1,8 +1,21 @@ package com.glxp.api.req.inout; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; +import java.util.List; + @Data -public class FilterIoCodeRequest { +public class FilterIoCodeRequest extends ListPageRequest { + private String corpOrderId; + private String code; + private String udi; + private String batchNo; + private String orderId; + private String nameCode; + private String supId; + private String locStorageCode; + private String relId; + List actions; } diff --git a/src/main/java/com/glxp/api/req/monitor/FilterLoginLogRequest.java b/src/main/java/com/glxp/api/req/monitor/FilterLoginLogRequest.java index e3172edb5..6a304fd57 100644 --- a/src/main/java/com/glxp/api/req/monitor/FilterLoginLogRequest.java +++ b/src/main/java/com/glxp/api/req/monitor/FilterLoginLogRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.monitor; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java b/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java index d2c0ad6c0..85e433aae 100644 --- a/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java +++ b/src/main/java/com/glxp/api/req/monitor/FilterOperLogRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.monitor; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java b/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java index 6470c243d..a139ce844 100644 --- a/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterClassifyCodeRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/system/FilterDeviceKeyRequest.java b/src/main/java/com/glxp/api/req/system/FilterDeviceKeyRequest.java index d4b55c97c..30ea03768 100644 --- a/src/main/java/com/glxp/api/req/system/FilterDeviceKeyRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterDeviceKeyRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/system/FilterParamConfigRequest.java b/src/main/java/com/glxp/api/req/system/FilterParamConfigRequest.java index fad2b145f..441766917 100644 --- a/src/main/java/com/glxp/api/req/system/FilterParamConfigRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterParamConfigRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java b/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java index 85e48787c..721015c54 100644 --- a/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterPdfModuleRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRelevanceRequest.java b/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRelevanceRequest.java index c36415ecf..62589a5eb 100644 --- a/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRelevanceRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRequest.java b/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRequest.java index 17d23d7f3..1b1e365cd 100644 --- a/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterPdfTemplateRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/glxp/api/req/system/FilterSysApiRequest.java b/src/main/java/com/glxp/api/req/system/FilterSysApiRequest.java index 75a2e2811..35f3b807d 100644 --- a/src/main/java/com/glxp/api/req/system/FilterSysApiRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterSysApiRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/system/FilterSysLogRequest.java b/src/main/java/com/glxp/api/req/system/FilterSysLogRequest.java index 33559a181..a046475f9 100644 --- a/src/main/java/com/glxp/api/req/system/FilterSysLogRequest.java +++ b/src/main/java/com/glxp/api/req/system/FilterSysLogRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.system; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysDetailRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysDetailRequest.java index 93e41b26e..48949f4c7 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysDetailRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysDetailRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java index 767b0e61c..74492f895 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterBasicThirdSysRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrBusTypeOriginRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrBusTypeOriginRequest.java index 016fc3746..c29473f1e 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrBusTypeOriginRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrBusTypeOriginRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpExportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpExportLogRequest.java index 56935b58a..e9062adf5 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpExportLogRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpExportLogRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java index 1293ac563..a57b33518 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpImportLogRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java index c2f875bb9..9847bf3a4 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrDeptRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrDeptRequest.java index 705a0f3f0..a136ecdb3 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrDeptRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrDeptRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java index 3a8b793ca..5b1c72f75 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrInvProductResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderDetailRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderDetailRequest.java index 423503768..75d10116f 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderDetailRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java index f2f6d0cb9..27543d58e 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrOrderResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java index 211b70851..5891fbd59 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsExportLogRequest.java @@ -1,14 +1,8 @@ package com.glxp.api.req.thrsys; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.Date; - @Data public class FilterThrProductsExportLogRequest extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java index d09a0be8a..477f204ea 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsImportLogRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java index 894bed953..70ddf3fab 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java @@ -2,7 +2,7 @@ package com.glxp.api.req.thrsys; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java index cf210ce03..2c9b5b51f 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrSubInvWarehouseRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java index 7b278c37f..b2b77c751 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrCorpExportRequest.java @@ -2,7 +2,7 @@ package com.glxp.api.req.thrsys; import com.glxp.api.entity.thrsys.ThrCorpEntity; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java index d427ddeb6..e60a0a7bc 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrInvProductResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java index b4b4278f7..7c950df79 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/UdiwmsWarehouseRequest.java b/src/main/java/com/glxp/api/req/thrsys/UdiwmsWarehouseRequest.java index 61f7594ea..1e9fdbb16 100644 --- a/src/main/java/com/glxp/api/req/thrsys/UdiwmsWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/UdiwmsWarehouseRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.req.ListPageRequest; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java index f50de8752..787a368dd 100644 --- a/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java +++ b/src/main/java/com/glxp/api/res/auth/LoginUserInfoResponse.java @@ -17,11 +17,11 @@ public class LoginUserInfoResponse { private String employeeName; // 权限列表 private List authRules; + private String locDeptCode; private String locInvCode; - private String locSubInvCode; + private String locDeptName; private String locInvName; - private String locSubInvName; Set roles; //用户角色 Set permissions; //用户权限 diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index 51beb0446..f2ecb3e7a 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -48,7 +48,7 @@ public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService if (null != filterBussinessTypeRequest.getPage() && null != filterBussinessTypeRequest.getLimit()) { PageHelper.offsetPage((filterBussinessTypeRequest.getPage() - 1) * filterBussinessTypeRequest.getLimit(), filterBussinessTypeRequest.getLimit()); } - return basicBussinessTypeDao.filterList(filterBussinessTypeRequest); + return basicBussinessTypeDao.filterJoinByUser(filterBussinessTypeRequest); } @Override diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java new file mode 100644 index 000000000..f2551340e --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -0,0 +1,17 @@ +package com.glxp.api.service.inout; + +import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.util.page.PageQuery; +import com.glxp.api.util.page.TableDataInfo; + +import java.util.List; + +public interface IoCodeTempService { + + + List findByOrderId(String billNo); + + TableDataInfo findByOrderId(FilterIoCodeRequest filterIoCodeRequest); +} diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java index 51f292078..e7695602f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java @@ -7,11 +7,13 @@ import com.glxp.api.entity.inout.IoCodeEnttity; import com.glxp.api.service.inout.IoCodeService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; @Service public class IoCodeServiceImpl implements IoCodeService { + @Resource IoCodeDao ioCodeDao; @Override diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java new file mode 100644 index 000000000..edc06a4ad --- /dev/null +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -0,0 +1,39 @@ +package com.glxp.api.service.inout.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.glxp.api.dao.inout.IoCodeTempDao; +import com.glxp.api.entity.auth.SysDictData; +import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.service.inout.IoCodeTempService; +import com.glxp.api.util.BeanCopyUtils; +import com.glxp.api.util.page.PageQuery; +import com.glxp.api.util.page.TableDataInfo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +@Service +public class IoCodeTempServiceImpl implements IoCodeTempService { + + @Resource + IoCodeTempDao ioCodeTempDao; + + @Override + public List findByOrderId(String billNo) { + return ioCodeTempDao.selectList(new QueryWrapper().eq("orderId", billNo)); + } + + @Override + public TableDataInfo findByOrderId(FilterIoCodeRequest filterIoCodeRequest) { + PageQuery pageQuery = new PageQuery(); + BeanCopyUtils.copy(filterIoCodeRequest, pageQuery); + Page page = ioCodeTempDao.selectPage(pageQuery.build(), new QueryWrapper().eq("orderId", filterIoCodeRequest.getOrderId())); + return TableDataInfo.build(page); + } + +} diff --git a/src/main/java/com/glxp/api/util/StringUtils.java b/src/main/java/com/glxp/api/util/StringUtils.java new file mode 100644 index 000000000..d4eeddc15 --- /dev/null +++ b/src/main/java/com/glxp/api/util/StringUtils.java @@ -0,0 +1,271 @@ +package com.glxp.api.util; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Validator; +import cn.hutool.core.util.StrUtil; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.springframework.util.AntPathMatcher; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * 字符串工具类 + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class StringUtils extends org.apache.commons.lang3.StringUtils { + + /** + * 获取参数不为空值 + * + * @param str defaultValue 要判断的value + * @return value 返回值 + */ + public static String blankToDefault(String str, String defaultValue) { + return StrUtil.blankToDefault(str, defaultValue); + } + + /** + * * 判断一个字符串是否为空串 + * + * @param str String + * @return true：为空 false：非空 + */ + public static boolean isEmpty(String str) { + return StrUtil.isEmpty(str); + } + + /** + * * 判断一个字符串是否为非空串 + * + * @param str String + * @return true：非空串 false：空串 + */ + public static boolean isNotEmpty(String str) { + return !isEmpty(str); + } + + /** + * 去空格 + */ + public static String trim(String str) { + return StrUtil.trim(str); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @return 结果 + */ + public static String substring(final String str, int start) { + return substring(str, start, str.length()); + } + + /** + * 截取字符串 + * + * @param str 字符串 + * @param start 开始 + * @param end 结束 + * @return 结果 + */ + public static String substring(final String str, int start, int end) { + return StrUtil.sub(str, start, end); + } + + /** + * 格式化文本, {} 表示占位符
+ * 此方法只是简单将占位符 {} 按照顺序替换为参数
+ * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可
+ * 例：
+ * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b
+ * 转义{}： format("this is \\{} for {}", "a", "b") -> this is {} for a
+ * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
+ * + * @param template 文本模板，被替换的部分用 {} 表示 + * @param params 参数值 + * @return 格式化后的文本 + */ + public static String format(String template, Object... params) { + return StrUtil.format(template, params); + } + + /** + * 是否为http(s)://开头 + * + * @param link 链接 + * @return 结果 + */ + public static boolean ishttp(String link) { + return Validator.isUrl(link); + } + + /** + * 字符串转set + * + * @param str 字符串 + * @param sep 分隔符 + * @return set集合 + */ + public static Set str2Set(String str, String sep) { + return new HashSet<>(str2List(str, sep, true, false)); + } + + /** + * 字符串转list + * + * @param str 字符串 + * @param sep 分隔符 + * @param filterBlank 过滤纯空白 + * @param trim 去掉首尾空白 + * @return list集合 + */ + public static List str2List(String str, String sep, boolean filterBlank, boolean trim) { + List list = new ArrayList<>(); + if (isEmpty(str)) { + return list; + } + + // 过滤空白字符串 + if (filterBlank && isBlank(str)) { + return list; + } + String[] split = str.split(sep); + for (String string : split) { + if (filterBlank && isBlank(string)) { + continue; + } + if (trim) { + string = trim(string); + } + list.add(string); + } + + return list; + } + + /** + * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写 + * + * @param cs 指定字符串 + * @param searchCharSequences 需要检查的字符串数组 + * @return 是否包含任意一个字符串 + */ + public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) { + return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences); + } + + /** + * 驼峰转下划线命名 + */ + public static String toUnderScoreCase(String str) { + return StrUtil.toUnderlineCase(str); + } + + /** + * 是否包含字符串 + * + * @param str 验证字符串 + * @param strs 字符串组 + * @return 包含返回true + */ + public static boolean inStringIgnoreCase(String str, String... strs) { + return StrUtil.equalsAnyIgnoreCase(str, strs); + } + + /** + * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld + * + * @param name 转换前的下划线大写方式命名的字符串 + * @return 转换后的驼峰式命名的字符串 + */ + public static String convertToCamelCase(String name) { + return StrUtil.upperFirst(StrUtil.toCamelCase(name)); + } + + /** + * 驼峰式命名法 例如：user_name->userName + */ + public static String toCamelCase(String s) { + return StrUtil.toCamelCase(s); + } + + /** + * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串 + * + * @param str 指定字符串 + * @param strs 需要检查的字符串数组 + * @return 是否匹配 + */ + public static boolean matches(String str, List strs) { + if (isEmpty(str) || CollUtil.isEmpty(strs)) { + return false; + } + for (String pattern : strs) { + if (isMatch(pattern, str)) { + return true; + } + } + return false; + } + + /** + * 判断url是否与规则配置: + * ? 表示单个字符; + * * 表示一层路径内的任意字符串，不可跨层级; + * ** 表示任意层路径; + * + * @param pattern 匹配规则 + * @param url 需要匹配的url + * @return + */ + public static boolean isMatch(String pattern, String url) { + AntPathMatcher matcher = new AntPathMatcher(); + return matcher.match(pattern, url); + } + + /** + * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。 + * + * @param num 数字对象 + * @param size 字符串指定长度 + * @return 返回数字的字符串格式，该字符串为指定长度。 + */ + public static final String padl(final Number num, final int size) { + return padl(num.toString(), size, '0'); + } + + /** + * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。 + * + * @param s 原始字符串 + * @param size 字符串指定长度 + * @param c 用于补齐的字符 + * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。 + */ + public static final String padl(final String s, final int size, final char c) { + final StringBuilder sb = new StringBuilder(size); + if (s != null) { + final int len = s.length(); + if (s.length() <= size) { + for (int i = size - len; i > 0; i--) { + sb.append(c); + } + sb.append(s); + } else { + return s.substring(len - size, len); + } + } else { + for (int i = size; i > 0; i--) { + sb.append(c); + } + } + return sb.toString(); + } + +} diff --git a/src/main/java/com/glxp/api/req/ListPageRequest.java b/src/main/java/com/glxp/api/util/page/ListPageRequest.java similarity index 92% rename from src/main/java/com/glxp/api/req/ListPageRequest.java rename to src/main/java/com/glxp/api/util/page/ListPageRequest.java index 11e840f74..e1ca7f07f 100644 --- a/src/main/java/com/glxp/api/req/ListPageRequest.java +++ b/src/main/java/com/glxp/api/util/page/ListPageRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req; +package com.glxp.api.util.page; import lombok.Data; diff --git a/src/main/java/com/glxp/api/util/page/PageQuery.java b/src/main/java/com/glxp/api/util/page/PageQuery.java new file mode 100644 index 000000000..e4b862f96 --- /dev/null +++ b/src/main/java/com/glxp/api/util/page/PageQuery.java @@ -0,0 +1,85 @@ +package com.glxp.api.util.page; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.api.util.StringUtils; +import lombok.Data; + +import java.io.Serializable; + +/** + * 分页查询实体类 + * + * @author Lion Li + */ + +@Data +public class PageQuery implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 分页大小 + */ + private Integer limit; + + /** + * 当前页数 + */ + private Integer page; + + /** + * 排序列 + */ + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + private String isAsc; + + /** + * 当前记录起始索引 默认值 + */ + public static final int DEFAULT_PAGE_NUM = 1; + + /** + * 每页显示记录数 默认值 默认查全部 + */ + public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE; + + public Page build() { + Integer pageNum = ObjectUtil.defaultIfNull(getPage(), DEFAULT_PAGE_NUM); + Integer pageSize = ObjectUtil.defaultIfNull(getLimit(), DEFAULT_PAGE_SIZE); + if (pageNum <= 0) { + pageNum = DEFAULT_PAGE_NUM; + } + Page page = new Page<>(pageNum, pageSize); + OrderItem orderItem = buildOrderItem(); + if (ObjectUtil.isNotNull(orderItem)) { + page.addOrder(orderItem); + } + return page; + } + + private OrderItem buildOrderItem() { + // 兼容前端排序类型 + if ("ascending".equals(isAsc)) { + isAsc = "asc"; + } else if ("descending".equals(isAsc)) { + isAsc = "desc"; + } + if (StringUtils.isNotBlank(orderByColumn)) { + String orderBy = SqlUtil.escapeOrderBySql(orderByColumn); + orderBy = StringUtils.toUnderScoreCase(orderBy); + if ("asc".equals(isAsc)) { + return OrderItem.asc(orderBy); + } else if ("desc".equals(isAsc)) { + return OrderItem.desc(orderBy); + } + } + return null; + } + +} diff --git a/src/main/java/com/glxp/api/util/page/SqlUtil.java b/src/main/java/com/glxp/api/util/page/SqlUtil.java new file mode 100644 index 000000000..5144bf72e --- /dev/null +++ b/src/main/java/com/glxp/api/util/page/SqlUtil.java @@ -0,0 +1,56 @@ +package com.glxp.api.util.page; + +import cn.hutool.core.exceptions.UtilException; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; + +/** + * sql操作工具类 + * + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class SqlUtil { + + /** + * 定义常用的 sql关键字 + */ + public static final String SQL_REGEX = "select |insert |delete |update |drop |count |exec |chr |mid |master |truncate |char |and |declare "; + + /** + * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序） + */ + public static final String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+"; + + /** + * 检查字符，防止注入绕过 + */ + public static String escapeOrderBySql(String value) { + if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) { + throw new UtilException("参数不符合规范，不能进行查询"); + } + return value; + } + + /** + * 验证 order by 语法是否符合规范 + */ + public static boolean isValidOrderBySql(String value) { + return value.matches(SQL_PATTERN); + } + + /** + * SQL关键字检查 + */ + public static void filterKeyword(String value) { + if (StringUtils.isEmpty(value)) { + return; + } + String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|"); + for (String sqlKeyword : sqlKeywords) { + if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) { + throw new UtilException("参数存在SQL注入风险"); + } + } + } +} diff --git a/src/main/java/com/glxp/api/util/page/TableDataInfo.java b/src/main/java/com/glxp/api/util/page/TableDataInfo.java new file mode 100644 index 000000000..07c1814ef --- /dev/null +++ b/src/main/java/com/glxp/api/util/page/TableDataInfo.java @@ -0,0 +1,76 @@ +package com.glxp.api.util.page; + +import cn.hutool.http.HttpStatus; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 表格分页数据对象 + */ + +@Data +@NoArgsConstructor +public class TableDataInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 总记录数 + */ + private long total; + + /** + * 列表数据 + */ + private List list; + + /** + * 消息状态码 + */ + private int code; + + /** + * 消息内容 + */ + private String msg; + + /** + * 分页 + * + * @param list 列表数据 + * @param total 总记录数 + */ + public TableDataInfo(List list, long total) { + this.list = list; + this.total = total; + } + + public static TableDataInfo build(IPage page) { + TableDataInfo rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.HTTP_OK); + rspData.setMsg("查询成功"); + rspData.setList(page.getRecords()); + rspData.setTotal(page.getTotal()); + return rspData; + } + + public static TableDataInfo build(List list) { + TableDataInfo rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.HTTP_OK); + rspData.setMsg("查询成功"); + rspData.setList(list); + rspData.setTotal(list.size()); + return rspData; + } + + public static TableDataInfo build() { + TableDataInfo rspData = new TableDataInfo<>(); + rspData.setCode(HttpStatus.HTTP_OK); + rspData.setMsg("查询成功"); + return rspData; + } + +} diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index f5f30ca17..eb60661c2 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -6,7 +6,7 @@ - INSERT INTO - auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag - ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode,dept,comments) + INSERT INTO auth_user( userName, passWord, lastLoginIp, lastLoginTime, createTime, userFlag + , employeeName, CustomerId, lastModifyTime, locDeptCode, locInvCode, comments) values (#{userName}, @@ -98,15 +97,14 @@ #{employeeName}, #{CustomerId}, #{lastModifyTime}, - #{locInvCode}, - #{locSubInvCode}, - #{dept},#{comments}) + #{locDeptCode}, + #{locInvCode}, #{comments}) replace INTO auth_user(id, userName, passWord, lastLoginIp, - lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode,dept,comments) + lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locDeptCode,locInvCode,comments) values ( #{id}, #{userName}, @@ -118,9 +116,8 @@ #{lastModifyTime}, #{employeeName}, #{CustomerId}, + #{locDeptCode}, #{locInvCode}, - #{locSubInvCode}, - #{dept}, #{comments} ) @@ -129,17 +126,36 @@ UPDATE auth_user - userName=#{userName}, - passWord=#{passWord}, - lastLoginIp=#{lastLoginIp}, - lastLoginTime=#{lastLoginTime}, - lastModifyTime=#{lastModifyTime}, - userFlag=#{userFlag}, - employeeName=#{employeeName}, - locInvCode=#{locInvCode}, - locSubInvCode=#{locSubInvCode}, - dept=#{dept}, - comments=#{comments}, + + userName=#{userName}, + + + passWord=#{passWord}, + + + lastLoginIp=#{lastLoginIp}, + + + lastLoginTime=#{lastLoginTime}, + + + lastModifyTime=#{lastModifyTime}, + + + userFlag=#{userFlag}, + + + employeeName=#{employeeName}, + + + locDeptCode=#{locDeptCode}, + + + locInvCode=#{locInvCode}, + + + comments=#{comments}, + WHERE id=#{id} @@ -177,8 +193,8 @@ resultType="com.glxp.api.entity.auth.AuthAdmin"> select u.* from auth_user u - left join auth_user_role sur on u.id = sur.user_id - left join auth_role r on r.role_id = sur.role_id + left join auth_user_role sur on u.id = sur.user_id + left join auth_role r on r.role_id = sur.role_id AND r.role_id =#{roleId} @@ -192,10 +208,10 @@ resultType="com.glxp.api.entity.auth.AuthAdmin"> select u.* from auth_user u - left join auth_user_role sur on u.id = sur.user_id - left join auth_role r on r.role_id = sur.role_id + left join auth_user_role sur on u.id = sur.user_id + left join auth_role r on r.role_id = sur.role_id - + u.id not in #{item} diff --git a/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml index 4e492d7c3..b147dcee1 100644 --- a/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvSubWarehouseDao.xml @@ -2,7 +2,6 @@ - + - select auth_warehouse.* from auth_warehouse + select auth_warehouse.* + from auth_warehouse AND auth_warehouse.code = #{code} group by auth_warehouse.id - @@ -150,27 +157,44 @@ UPDATE auth_warehouse - name=#{name}, - code=#{code}, - parentId=#{parentId}, - remark=#{remark}, - defaultInv=#{defaultInv}, - parentCode=#{parentCode}, + + name=#{name}, + + + code=#{code}, + + + parentId=#{parentId}, + + + remark=#{remark}, + + + defaultInv=#{defaultInv}, + + + parentCode=#{parentCode}, + WHERE id = #{id} - replace into auth_warehouse + replace + into auth_warehouse (id, code, `name`, parentId, remark,defaultInv,parentCode) values + ( #{item.id}, #{item.code}, #{item.name}, #{item.parentId}, - #{item.remark},#{item.defaultInv},#{item.parentCode}) + #{item.remark}, + #{item.defaultInv}, + #{item.parentCode} + ) @@ -195,11 +219,23 @@ - select auth_warehouse.*, auth_dept.`name` AS warehouseName from auth_warehouse INNER JOIN - auth_dept - on auth_warehouse.parentId = auth_dept.code + select auth_warehouse.*, auth_dept.`name` AS warehouseName + from auth_warehouse + INNER JOIN + auth_dept + on auth_warehouse.parentId = auth_dept.code AND auth_dept.pcode = #{subordinateCode} - group by auth_warehouse.id - +